Ticket #904: nobob-fallback.diff

libs/libmythtv/NuppelVideoPlayer.h

@@ -341 +341 @@
     void  InitAVSync(void);
     void  AVSync(void);
     void  ShutdownAVSync(void);
+    void  FallbackDeint(void); // Fallback to non-bob deinterlacing
 
     // Private closed caption and teletext stuff
     int   tbuffer_numvalid(void); // number of valid slots in the text buffer

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -621 +621 @@
         {
             VERBOSE(VB_IMPORTANT, "Video sync method can't support double "
                     "framerate (refresh rate too low for bob deint)");
-            m_scan = kScan_Ignore;
-            m_double_framerate = false;
-            m_can_double = false;
-            if (videoOutput)
-                videoOutput->SetupDeinterlace(false);
+            FallbackDeint();
         }
     }
 
@@ -1606 +1602 @@
     }
 }
 
+void NuppelVideoPlayer::FallbackDeint(void)
+{
+     m_double_framerate = false;
+     if (videosync)
+         videosync->SetFrameInterval(frame_interval, false);
+     if (videoOutput) {
+         videoOutput->SetupDeinterlace(false);
+         videoOutput->SetupDeinterlace(true, "onefield");
+     }
+}
+
 void NuppelVideoPlayer::DisplayPauseFrame(void)
 {
     if (!video_actually_paused)
@@ -1771 +1778 @@
             videosync->SetFrameInterval(frame_interval, m_double_framerate);
             if (videosync->UsesFrameInterval())
             {
-                m_scan = kScan_Ignore;
-                m_double_framerate = false;
-                m_can_double = false;
-                if (videoOutput)
-                    videoOutput->SetupDeinterlace(false);
+                VERBOSE(VB_IMPORTANT, "Video sync method can't support double "
+                        "framerate (refresh rate too low for bob deint)");
+                FallbackDeint();
             }
         }
     }
@@ -2767 +2772 @@
         {
             if (!normal_speed || play_speed < 0.99 || play_speed > 1.01)
             {
-                m_double_framerate = false;
-                videosync->SetFrameInterval(frame_interval, false);
-                videoOutput->SetupDeinterlace(false);
-                videoOutput->SetupDeinterlace(true, "onefield");
+                FallbackDeint();
             }
         }
         else if (m_can_double && !m_double_framerate)