More warnings related to glTF rendering

Use avmedia.opengl to be more explicit.

Change-Id: I07878c3648de2e4786bf8a5144ef0c1fbb5530f1

3 files changed, 39 insertions, 18 deletions

diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
index c625fbae88be..6dff44bd1a92 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -40,7 +40,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed:
         ::osl::FileBase::createTempFile(0, 0, &sTempFileURL);
     if (::osl::FileBase::E_None != aErr)
     {
-        SAL_WARN("avmedia.model", "cannot create temp file");
+        SAL_WARN("avmedia.opengl", "Cannot create temp file");
         return;
     }
     try
@@ -53,7 +53,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed:
     }
     catch (uno::Exception const& e)
     {
-        SAL_WARN("avmedia.model", "exception: '" << e.Message << "'");
+        SAL_WARN("avmedia.opengl", "Exception: '" << e.Message << "'");
         return;
     }
 
@@ -96,7 +96,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed:
     }
     catch ( boost::exception const& )
     {
-        SAL_WARN("avmedia.model", "failed to parse json file");
+        SAL_WARN("avmedia.opengl", "Exception while parsing *.json file");
         return;
     }
 
@@ -121,7 +121,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed:
 
         if (!aContent.openStream(xOutStream))
         {
-            SAL_WARN("avmedia.model", "openStream to storage failed");
+            SAL_WARN("avmedia.opengl", "openStream to storage failed");
             return;
         }
     }
@@ -164,7 +164,7 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
 
         if (!aSourceContent.openStream(xOutStream))
         {
-            SAL_INFO("avmedia.model", "openStream to storage failed");
+            SAL_WARN("avmedia.opengl", "openStream to storage failed");
             return false;
         }
 
@@ -189,7 +189,7 @@ bool Embed3DModel( const uno::Reference<frame::XModel>& xModel,
     }
     catch (uno::Exception const&)
     {
-        SAL_WARN("avmedia.model", "Exception while trying to embed model");
+        SAL_WARN("avmedia.opengl", "Exception while trying to embed model");
     }
     return false;
 }
diff --git a/avmedia/source/opengl/oglmanager.cxx b/avmedia/source/opengl/oglmanager.cxx
index f55553f653f2..afd55cad6ed4 100644
--- a/avmedia/source/opengl/oglmanager.cxx
+++ b/avmedia/source/opengl/oglmanager.cxx
@@ -36,6 +36,7 @@ uno::Reference< media::XPlayer > SAL_CALL OGLManager::createPlayer( const OUStri
     else
     {
         delete pPlayer;
+        SAL_WARN("avmedia.opengl", "Can't creat player for OpenGL model: " + rURL);
         return uno::Reference< media::XPlayer >();
     }
 }
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index 0bed52c9f182..f74162bbc5e3 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -61,12 +61,18 @@ bool OGLPlayer::create( const OUString& rURL )
     OString sFileName = OUStringToOString(INetURLObject(m_sURL).GetLastName(),RTL_TEXTENCODING_UTF8);
     aJsonFile.filename = (char*)sFileName.getStr();
     if( !lcl_LoadFile(&aJsonFile, m_sURL) )
+    {
+        SAL_WARN("avmedia.opengl", "Can't load *.json file: " + sFileName);
         return false;
+    }
 
     m_pHandle = gltf_renderer_init(&aJsonFile);
 
     if( !m_pHandle || !m_pHandle->files )
+    {
+        SAL_WARN("avmedia.opengl", "gltf_renderer_init returned an invalid glTFHandle");
         return false;
+    }
 
     // Load external resources
     for( size_t i = 0; i < m_pHandle->size; ++i )
@@ -90,7 +96,10 @@ bool OGLPlayer::create( const OUString& rURL )
             else if( pFile->type == GLTF_BINARY || pFile->type == GLTF_GLSL )
             {
                 if( !lcl_LoadFile(pFile, sFilesURL) )
+                {
+                    SAL_WARN("avmedia.opengl", "Can't load glTF file: " + sFilesURL);
                     return false;
+                }
             }
         }
     }
@@ -184,19 +193,24 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c
 {
     osl::MutexGuard aGuard( m_aMutex );
 
-    if( rArguments.getLength() > 2 )
+    assert( rArguments.getLength() >= 3 );
+
+    sal_IntPtr pIntPtr = 0;
+    rArguments[ 2 ] >>= pIntPtr;
+    SystemChildWindow *pChildWindow = reinterpret_cast< SystemChildWindow* >( pIntPtr );
+
+    if( !m_aContext.init(pChildWindow) )
     {
-        sal_IntPtr pIntPtr = 0;
-        rArguments[ 2 ] >>= pIntPtr;
-        SystemChildWindow *pChildWindow = reinterpret_cast< SystemChildWindow* >( pIntPtr );
-        m_aContext.init(pChildWindow);
-        Size aSize = pChildWindow->GetSizePixel();
-        m_aContext.setWinSize(aSize);
-        m_pHandle->viewport.x = 0;
-        m_pHandle->viewport.y = 0;
-        m_pHandle->viewport.width = aSize.Width();
-        m_pHandle->viewport.height = aSize.Height();
+        SAL_WARN("avmedia.opengl", "Context initialization failed");
+        return uno::Reference< media::XPlayerWindow >();
     }
+
+    Size aSize = pChildWindow->GetSizePixel();
+    m_aContext.setWinSize(aSize);
+    m_pHandle->viewport.x = 0;
+    m_pHandle->viewport.y = 0;
+    m_pHandle->viewport.width = aSize.Width();
+    m_pHandle->viewport.height = aSize.Height();
     OGLWindow* pWindow = new OGLWindow(m_pHandle, &m_aContext);
     return uno::Reference< media::XPlayerWindow >( pWindow );
 }
@@ -205,7 +219,13 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber()
      throw ( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard(m_aMutex);
-    m_aContext.init();
+
+    if( !m_aContext.init() )
+    {
+        SAL_WARN("avmedia.opengl", "Offscreen context initialization failed");
+        return uno::Reference< media::XFrameGrabber >();
+    }
+
     m_pHandle->viewport.x = 0;
     m_pHandle->viewport.y = 0;
     m_pHandle->viewport.width = getPreferredPlayerWindowSize().Width;