VideoPlayerVideo: Hack to allow dvd menus to work when no decoded pic…

…ture
popcornmix · Dec 10, 2018 · edbecac · edbecac
1 parent 670519c
commit edbecac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp
@@ -341,8 +341,8 @@ void CVideoPlayerVideo::Process()
     }
     else if (ret == MSGQ_TIMEOUT)
     {
-      if (m_outputSate == OUTPUT_AGAIN &&
-          m_picture.videoBuffer)
+      if (m_outputSate == OUTPUT_AGAIN /*&&
+          m_picture.videoBuffer*/)
       {
         m_outputSate = OutputPicture(&m_picture);
         if (m_outputSate == OUTPUT_AGAIN)
@@ -384,7 +384,7 @@ void CVideoPlayerVideo::Process()
       }
 
       // Waiting timed out, output last picture
-      if (m_picture.videoBuffer)
+      if (1/*m_picture.videoBuffer*/)
       {
         m_picture.pts = pts;
         m_outputSate = OutputPicture(&m_picture);

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp
@@ -928,7 +928,8 @@ void CMMALRenderer::UpdateFramerateStats(double pts)
 void CMMALRenderer::AddVideoPicture(const VideoPicture& pic, int id)
 {
   CMMALBuffer *buffer = dynamic_cast<CMMALBuffer*>(pic.videoBuffer);
-  assert(buffer);
+  if (!buffer)
+    return;
   if (VERBOSE && CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->CanLogComponent(LOGVIDEO))
   {
     CLog::Log(LOGDEBUG, "%s::%s MMAL - %p (%p) %i", CLASSNAME, __func__, static_cast<void*>(buffer),