Ticket #13349: 20181119_1607_transition_fix.patch

mythtv/libs/libmythtv/mythplayer.cpp

@@ -151 +151 @@
       fftime(0),
       // Playback misc.
       videobuf_retries(0),          framesPlayed(0),
-      prebufferFramesPlayed(0),
       framesPlayedExtra(0),
       totalFrames(0),               totalLength(0),
       totalDuration(0),
@@ -2241 +2240 @@
         if (lateness > 30000)
             dropframe = !FlagIsSet(kMusicChoice) && numdroppedframes < 10;
 
-        if (lateness <= 30000 && audiotimecode > 0 && normal_speed)
+        if (lateness <= 30000 && audiotimecode > 0 && normal_speed && !FlagIsSet(kMusicChoice))
         {
             // Get video in sync with audio
             audio_adjustment = audiotimecode - videotimecode;
@@ -2257 +2256 @@
                 pause_audio = true;
         }
         // sanity check - reset rtcbase if time codes have gone crazy.
-        if (lateness > AVSYNC_MAX_LATE || lateness < - AVSYNC_MAX_LATE)
+        if ((lateness > AVSYNC_MAX_LATE || lateness < - AVSYNC_MAX_LATE)
+            && !FlagIsSet(kMusicChoice))
         {
             framedue = 0;
             rtcbase = 0;
@@ -2447 +2447 @@
     if (!videoOutput)
         return false;
 
+    bool paused_now = false;
     if (!(min_buffers ? (videoOutput->ValidVideoFrames() >= min_buffers) :
                         (GetEof() != kEofStateNone) ||
                         (videoOutput->hasHWAcceleration() ?
@@ -2454 +2455 @@
                             videoOutput->EnoughDecodedFrames())))
     {
         SetBuffering(true);
+
         // This piece of code is to address the problem, when starting
         // Live TV, of jerking and stuttering. Without this code
         // that could go on forever, but is cured by a pause and play.
         // This code inserts a brief pause and play when the potential
         // for the jerking is detected.
-        if (prebufferFramesPlayed != framesPlayed)
+
+        bool watchingTV = IsWatchingInprogress();
+        if (!paused_now && (livetv || watchingTV) && !FlagIsSet(kMusicChoice))
         {
-            float current   = ComputeSecs(framesPlayed, true);
-            float length    = ComputeSecs(totalFrames, true);
-            if (length > current && length - current < 1.5
-                && !FlagIsSet(kMusicChoice))
+            uint64_t frameCount = GetCurrentFrameCount();
+            uint64_t framesLeft = frameCount - framesPlayed;
+            uint64_t margin = (uint64_t) (video_frame_rate * 3);
+            if (framesLeft < margin)
             {
                 LOG(VB_PLAYBACK, LOG_NOTICE, LOC +
                     QString("Pause to allow live tv catch up. Position in sec. Current: %2, Total: %3")
-                    .arg(current).arg(length));
+                    .arg(framesPlayed).arg(frameCount));
                 audio.Pause(true);
                 avsync_audiopaused = true;
-                prebufferFramesPlayed = framesPlayed;
+                paused_now = true;
             }
         }
         usleep(frame_interval >> 3);
@@ -2497 +2501 @@
                 playerFlags = (PlayerFlags)(playerFlags | kMusicChoice);
                 LOG(VB_GENERAL, LOG_NOTICE, LOC +
                     "Music Choice program detected - disabling AV Sync.");
+                avsync_audiopaused = false;
+                audio.Pause(false);
             }
             if (waited_for > 7000 && audio.IsBufferAlmostFull()
                 && !FlagIsSet(kMusicChoice))

mythtv/libs/libmythtv/mythplayer.h

@@ -699 +699 @@
     /// How often we have tried to wait for a video output buffer and failed
     int       videobuf_retries;
     uint64_t  framesPlayed;
-    uint64_t  prebufferFramesPlayed;
     // "Fake" frame counter for when the container frame rate doesn't
     // match the stream frame rate.
     uint64_t  framesPlayedExtra;