Ticket #4685: ticket_4685_potential_fix_#2.diff

libs/libmythtv/avformatdecoder.cpp

@@ -3003 +3003 @@
                 int numVidFrames = 0;
                 if (GetNVP() && GetNVP()->getVideoOutput())
                     numVidFrames = GetNVP()->getVideoOutput()->ValidVideoFrames();
-             
-                if (numVidFrames == 0 && lastDVDStillFrame &&
+            
+                if (numVidFrames > 20 && abs(lastapts - lastvpts) > 1000)
+                {
+                    // discard video frames if dvd changes pts in the middle
+                    // of a title
+                    VERBOSE(VB_PLAYBACK, LOC + 
+                            QString("DVD: discard video frames. "
+                            "audio & video pts have diverged alot. "
+                            "audio pts %1 video pts %2")
+                            .arg(lastapts).arg(lastvpts));
+                    GetNVP()->DiscardVideoFrames(true);
+                }
+                else if (numVidFrames == 0 && lastDVDStillFrame &&
                     ringBuffer->DVD()->InStillFrame())
                 {
                     VERBOSE(VB_PLAYBACK, LOC + "DVD: in still frame but "
@@ -3653 +3664 @@
 
                     long long temppts = pts;
 
-                    // Validate the video pts against the last pts. If it's
-                    // a little bit smaller or equal, compute it from the last.
-                    // Otherwise assume a wraparound.
-                    if (temppts <= lastvpts && temppts + 10000 > lastvpts)
+                    if (!ringBuffer->isDVD())
                     {
-                        temppts = lastvpts;
-                        temppts += (long long)(1000 * av_q2d(context->time_base));
-                        // MPEG2 frames can be repeated, update pts accordingly
-                        temppts += (long long)(mpa_pic.repeat_pict * 500
-                                      * av_q2d(curstream->codec->time_base));
+                        // Validate the video pts against the last pts. If it's
+                        // a little bit smaller or equal, compute it from the last.
+                        // Otherwise assume a wraparound.
+                        if (temppts <= lastvpts && temppts + 10000 > lastvpts)
+                        {
+                            temppts = lastvpts;
+                            temppts += (long long)(1000 * av_q2d(context->time_base));
+                            // MPEG2 frames can be repeated, update pts accordingly
+                            temppts += (long long)(mpa_pic.repeat_pict * 500
+                                        * av_q2d(curstream->codec->time_base));
+                        }
                     }
 
                     VERBOSE(VB_PLAYBACK|VB_TIMESTAMP, LOC +