RenderManager - cleanup CreateRenderer

popcornmix · Sep 18, 2015 · 43bf6cb · 43bf6cb
1 parent 37f10ae
commit 43bf6cb
Showing 1 changed file with 37 additions and 32 deletions.
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp
@@ -144,7 +144,7 @@ static std::string GetRenderFormatName(ERenderFormat format)
 
 CRenderManager::CRenderManager() : m_overlays(this)
 {
-  m_pRenderer = NULL;
+  m_pRenderer = nullptr;
   m_renderState = STATE_UNCONFIGURED;
 
   m_presentstep = PRESENT_IDLE;
@@ -643,65 +643,70 @@ void CRenderManager::CreateRenderer()
 {
   if (!m_pRenderer)
   {
-    if (m_format == RENDER_FMT_MEDIACODEC)
-#if defined (TARGET_ANDROID)
+    if (m_format == RENDER_FMT_VAAPI || m_format == RENDER_FMT_VAAPINV12)
     {
-      m_pRenderer = new CRendererMediaCodec;
+#if defined(HAVE_LIBVA)
+      m_pRenderer = new CRendererVAAPI;
+#endif
     }
-#elif defined(HAS_MMAL)
-    m_pRenderer = new CMMALRenderer
-#elif HAS_GLES == 2
-    if (m_format == RENDER_FMT_CVBREF)
+    else if (m_format == RENDER_FMT_VDPAU || m_format == RENDER_FMT_VDPAU_420)
     {
-#if defined(HAVE_VIDEOTOOLBOXDECODER)
-      m_pRenderer = new CRendererVTB;
+#if defined(HAVE_LIBVDPAU)
+      m_pRenderer = new CRendererVDPAU;
 #endif
     }
-    else if (m_format == RENDER_FMT_IMXMAP)
+    else if (m_format == RENDER_FMT_CVBREF)
     {
-#if defined(HAS_IMXVPU)
-      m_pRenderer = new CRendererIMX;
+#if defined(TARGET_DARWIN_OSX)
+      m_pRenderer = new CRendererVDA;
+#elif defined(HAVE_VIDEOTOOLBOXDECODER)
+      m_pRenderer = new CRendererVTB;
 #endif
     }
-    else if (m_format == RENDER_FMT_OMXEGL)
+    else if (m_format == RENDER_FMT_MEDIACODEC)
     {
-#if defined(HAVE_LIBOPENMAX)
-      m_pRenderer = new CRendererOMX;
+#if defined(TARGET_ANDROID)
+      m_pRenderer = new CRendererMediaCodec;
 #endif
     }
-    else if (m_format != RENDER_FMT_NONE)
+    if (m_format == RENDER_FMT_MMAL)
     {
-      m_pRenderer = new CLinuxRendererGLES;
-    }
-#elif defined(HAS_DX)
-    m_pRenderer = new CWinRenderer();
+#if defined(HAS_MMAL)
+      m_pRenderer = new CMMALRenderer
 #endif
-#if defined(HAS_GL)
-    if (m_format == RENDER_FMT_VAAPI || m_format == RENDER_FMT_VAAPINV12)
+    }
+    else if (m_format == RENDER_FMT_IMXMAP)
     {
-#if defined(HAVE_LIBVA)
-      m_pRenderer = new CRendererVAAPI;
+#if defined(HAS_IMXVPU)
+      m_pRenderer = new CRendererIMX;
 #endif
     }
-    else if (m_format == RENDER_FMT_VDPAU || m_format == RENDER_FMT_VDPAU_420)
+    else if (m_format == RENDER_FMT_OMXEGL)
     {
-#if defined(HAVE_LIBVDPAU)
-      m_pRenderer = new CRendererVDPAU;
+#if defined(HAVE_LIBOPENMAX)
+      m_pRenderer = new CRendererOMX;
 #endif
     }
-    else if (m_format == RENDER_FMT_CVBREF)
+    else if (m_format != RENDER_FMT_DXVA)
     {
-#if defined(TARGET_DARWIN_OSX)
-      m_pRenderer = new CRendererVDA;
+#if defined(HAS_DX)
+      m_pRenderer = new CWinRenderer();
 #endif
     }
     else if (m_format != RENDER_FMT_NONE)
     {
+#if defined(HAS_GL)
       m_pRenderer = new CLinuxRendererGL;
-    }
+#elif HAS_GLES == 2
+      m_pRenderer = new CLinuxRendererGLES;
+#elif defined(HAS_DX)
+  m_pRenderer = new CWinRenderer();
 #endif
+    }
     if (m_pRenderer)
       m_pRenderer->PreInit();
+    else
+      CLog::Log(LOGERROR, "RenderManager::CreateRenderer: failed to create renderer");
   }
 }