VideoPlayer: Help demuxer that might not yet know about interlacing

xbmc · Sep 30, 2016 · ede269b · ede269b
1 parent f2985ed
commit ede269b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp
@@ -3702,7 +3702,7 @@ bool CVideoPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset)
   else if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER))
   {
     // set framerate if not set by demuxer
-    if (hint.fpsrate == 0 || hint.fpsscale == 0)
+    if (hint.fpsrate == 0 || hint.fpsscale == 0 || hint.fpsrate < 50000)
     {
       int fpsidx = CSettings::GetInstance().GetInt(CSettings::SETTING_PVRPLAYBACK_FPS);
       if (fpsidx == 1)
@@ -3715,6 +3715,8 @@ bool CVideoPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset)
         hint.fpsscale = 1001;
         hint.fpsrate = 60000;
       }
+      else if (hint.fpsrate > 0) // demuxer might not know yet that it is interlaced
+        hint.fpsscale *= 2;
     }
   }