Kaydet (Commit) 0e54f126 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

OGLPlayer: handle json parsing error

Change-Id: I86aea12318d4e21ccadd97ad2820e31bd4580c99
üst 228c5099
...@@ -234,7 +234,15 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c ...@@ -234,7 +234,15 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c
m_pHandle->viewport.y = 0; m_pHandle->viewport.y = 0;
m_pHandle->viewport.width = aSize.Width(); m_pHandle->viewport.width = aSize.Width();
m_pHandle->viewport.height = aSize.Height(); 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); m_pOGLWindow = new OGLWindow(m_pHandle, &m_aContext, pChildWindow);
return uno::Reference< media::XPlayerWindow >( m_pOGLWindow ); return uno::Reference< media::XPlayerWindow >( m_pOGLWindow );
} }
...@@ -254,7 +262,13 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber() ...@@ -254,7 +262,13 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber()
m_pHandle->viewport.y = 0; m_pHandle->viewport.y = 0;
m_pHandle->viewport.width = getPreferredPlayerWindowSize().Width; m_pHandle->viewport.width = getPreferredPlayerWindowSize().Width;
m_pHandle->viewport.height = getPreferredPlayerWindowSize().Height; 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 ); OGLFrameGrabber *pFrameGrabber = new OGLFrameGrabber( m_pHandle );
return uno::Reference< media::XFrameGrabber >( pFrameGrabber ); return uno::Reference< media::XFrameGrabber >( pFrameGrabber );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment