diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-05-29 05:48:54 +0200 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-11 19:27:32 +0200 |
commit | 48513910e7abd2ebe1e7c5f5489fcb8e2daa28dc (patch) | |
tree | 4f22d75fd6ff134a3507b8a37bd1e7de5b33b781 /avmedia | |
parent | a4f1efc434d6c5952ba0cfcf94e6c39356ce0f85 (diff) |
OGLPlayer: handle json parsing error
Change-Id: I86aea12318d4e21ccadd97ad2820e31bd4580c99
Diffstat (limited to 'avmedia')
-rw-r--r-- | avmedia/source/opengl/oglplayer.cxx | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 3bb4a160074f..5aa87bd89ff8 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -243,7 +243,15 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c m_pHandle->viewport.y = 0; m_pHandle->viewport.width = aSize.Width(); m_pHandle->viewport.height = aSize.Height(); - gltf_renderer_set_content(m_pHandle); + + // TODO: In libgltf different return values are defined (for different errors) + // but these error codes are not part of the library interface + int nRet = gltf_renderer_set_content(m_pHandle); + if( nRet != 0 ) + { + SAL_WARN("avmedia.opengl", "Error occured while parsing *.json file! Error code: " << nRet); + return uno::Reference< media::XPlayerWindow >(); + } m_pOGLWindow = new OGLWindow(m_pHandle, &m_aContext, pChildWindow); return uno::Reference< media::XPlayerWindow >( m_pOGLWindow ); } @@ -263,7 +271,13 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber() m_pHandle->viewport.y = 0; m_pHandle->viewport.width = getPreferredPlayerWindowSize().Width; m_pHandle->viewport.height = getPreferredPlayerWindowSize().Height; - gltf_renderer_set_content(m_pHandle); + + int nRet = gltf_renderer_set_content(m_pHandle); + if( nRet != 0 ) + { + SAL_WARN("avmedia.opengl", "Error occured while parsing *.json file! Error code: " << nRet); + return uno::Reference< media::XFrameGrabber >(); + } OGLFrameGrabber *pFrameGrabber = new OGLFrameGrabber( m_pHandle ); return uno::Reference< media::XFrameGrabber >( pFrameGrabber ); } |