Ticket #13416: monotonic-time-avsync2-20190303.2.patch

mythtv/libs/libmythtv/mythplayer.cpp

@@ -270 +270 @@
         avsync2adjustms = 1;
     if (avsync2adjustms > 40)
         avsync2adjustms = 40;
+    m_avTimer.start();
 }
 
 MythPlayer::~MythPlayer(void)
@@ -2167 +2168 @@
     }
 }
 
-static void wait_for_time(int64_t framedue);
-
-void wait_for_time(int64_t framedue)
+void MythPlayer::WaitForTime(int64_t framedue)
 {
-    QDateTime now = QDateTime::currentDateTimeUtc();
-    int64_t unow = now.toMSecsSinceEpoch() * 1000;
+    int64_t unow = m_avTimer.nsecsElapsed() / 1000;
     int64_t delay = framedue - unow;
-    if (delay > 0)
-        QThread::usleep(delay);
+    while (delay > 0)
+    {
+        int64_t stepDelay = std::min(delay, (int64_t)2000);
+        QThread::usleep(stepDelay);
+        delay -= stepDelay;
+    }
 }
 
 #define AVSYNC_MAX_LATE 10000000
@@ -2194 +2196 @@
     bool pause_audio = false;
     int64_t framedue = 0;
     int64_t audio_adjustment = 0;
-    QDateTime now;
     int64_t unow = 0;
     int64_t lateness = 0;
     int64_t playspeed1000 = (float)1000 / play_speed;
@@ -2210 +2211 @@
                 videotimecode = maxtcval;
         }
 
-        now = QDateTime::currentDateTimeUtc();
-        unow = now.toMSecsSinceEpoch() * 1000;
+        unow = m_avTimer.nsecsElapsed() / 1000;
 
         if (!normal_speed || FlagIsSet(kMusicChoice))
         {
@@ -2350 +2350 @@
         // Don't wait for sync if this is a secondary PBP otherwise
         // the primary PBP will become out of sync
         if (!player_ctx->IsPBP() || player_ctx->IsPrimaryPBP())
-            wait_for_time(framedue);
+            WaitForTime(framedue);
         // get time codes for calculating difference next time
         prior_audiotimecode = audio.GetAudioTime();
         videoOutput->Show(ps);
@@ -2381 +2381 @@
             if (!player_ctx->IsPBP() || player_ctx->IsPrimaryPBP())
             {
                 int64_t due = framedue + frame_interval / 2;
-                wait_for_time(due);
+                WaitForTime(due);
             }
             videoOutput->Show(ps);
         }
     }
     else
-        wait_for_time(framedue);
+        WaitForTime(framedue);
 
     LOG(VB_PLAYBACK | VB_TIMESTAMP, LOG_INFO, LOC +
         QString("A/V timecodes audio=%1 video=%2 frameinterval=%3 "

mythtv/libs/libmythtv/mythplayer.h

@@ -625 +625 @@
     int64_t AVSyncGetAudiotime(void);
     void  SetFrameInterval(FrameScanType scan, double speed);
     void  FallbackDeint(void);
+    void WaitForTime(int64_t framedue);
 
     // Private LiveTV stuff
     void  SwitchToProgram(void);
@@ -711 +712 @@
     int64_t   totalDuration;
     long long rewindtime;
     int64_t   m_latestVideoTimecode;
+    QElapsedTimer m_avTimer;
 
     // -- end state stuff --