Ticket #7067: patch2.3.txt

File patch2.3.txt, 1.1 KB (added by Davin McCall <davmac@…>, 2 years ago)

Fix for #7067 incorporating additional fixes to prevent liveTV problems

Line 
1Index: mythtv/libs/libmythtv/NuppelVideoPlayer.cpp
2===================================================================
3--- mythtv/libs/libmythtv/NuppelVideoPlayer.cpp (revision 22934)
4+++ mythtv/libs/libmythtv/NuppelVideoPlayer.cpp (working copy)
5@@ -1071,14 +1071,12 @@
6 
7     m_scan_locked = (scan != kScan_Detect);
8 
9-    if (scan == m_scan)
10-        return;
11-
12     bool interlaced = is_interlaced(scan);
13 
14     if (interlaced && !m_deint_possible)
15     {
16         m_scan = scan;
17+        videosync->SetFrameInterval(frame_interval, false);
18         return;
19     }
20 
21@@ -1112,11 +1110,8 @@
22         if (kScan_Progressive == scan)
23         {
24             m_double_process = false;
25-            if (m_double_framerate)
26-            {
27-                m_double_framerate = false;
28-                videosync->SetFrameInterval(frame_interval, false);
29-            }
30+            m_double_framerate = false;
31+            videosync->SetFrameInterval(frame_interval, false);
32             videoOutput->SetDeinterlacingEnabled(false);
33             VERBOSE(VB_PLAYBACK, "Disabled deinterlacing");
34         }