Ticket #5628: NuppelVideoPlayer.cpp.diff

NuppelVideoPlayer.cpp

@@ -173 +173 @@
       rewindtime(0),                m_recusage(inUseID),
       // Input Video Attributes
       video_disp_dim(0,0), video_dim(0,0),
-      video_frame_rate(29.97f), video_aspect(4.0f / 3.0f),
+      video_frame_rate(25.00f), video_aspect(4.0f / 3.0f),
       forced_video_aspect(-1),
       m_scan(kScan_Interlaced),     m_scan_locked(false),
       m_scan_tracker(0),
@@ -238 +238 @@
       decoder_lock(true),
       next_play_speed(1.0f),        next_normal_speed(true),
       play_speed(1.0f),             normal_speed(true),
-      frame_interval((int)(1000000.0f / 30)), ffrew_skip(1),
+      frame_interval((int)(1000000.0f / 25)), ffrew_skip(1),
       // Audio and video synchronization stuff
       videosync(NULL),              delay(0),
       vsynctol(30/4),               avsync_delay(0),
       avsync_adjustment(0),         avsync_avg(0),
       avsync_oldavg(0),             refreshrate(0),
-      lastsync(false),              m_playing_slower(false),
+      m_playing_slower(false),
       m_stored_audio_stretchfactor(1.0),
       audio_paused(false),
       // Audio warping stuff
@@ -263 +263 @@
       hidedvdbutton(true), need_change_dvd_track(0),
       dvd_stillframe_showing(false),
       // Debugging variables
-      output_jmeter(NULL)
+      output_jmeter(NULL),
+      isFixingDiverge(false)
 {
     vbimode = VBIMode::Parse(gContext->GetSetting("VbiFormat"));
 
@@ -2208 +2209 @@
 #define WARPAVLEN (video_frame_rate * 600)
 /** How much we allow the warp to deviate from 1.0 (normal speed). */
 #define WARPCLIP    0.1f
-/** Number of frames of A/V divergence allowed adjustments are made. */
-#define MAXDIVERGE  3.0f
+/** Number of frames of A/V divergence allowed before adjustments are made. */
+#define MAXDIVERGE  0.5f
+/** Number of frames of A/V divergence when adjustment stops. */
+#define MAXDIVERGELOW  0.05f
 /** A/V divergence above this amount is clipped to avoid a bad stream 
  *  causing large playback glitches. */
-#define DIVERGELIMIT 30.0f
+#define DIVERGELIMIT 500.0f
 
 float NuppelVideoPlayer::WarpFactor(void)
 {
@@ -2224 +2227 @@
 
     // Number of frames the audio is out by
     divergence = (float)avsync_avg / (float)frame_interval;
+
+    // When skipping audio is reset to 0 causing massive 
+    // divergence.  If divergence is greater than DIVERGELIMIT
+    // then ignore the divergence.  It will eventually correct
+    // itself
+    if ((divergence > DIVERGELIMIT) || (divergence < -DIVERGELIMIT)) {
+        divergence = 0;
+        return divergence;
+    }
     // Number of frames divergence is changing by per frame
     rate = (float)(avsync_avg - avsync_oldavg) / (float)frame_interval;
     avsync_oldavg = avsync_avg;
@@ -2304 +2316 @@
 void NuppelVideoPlayer::AVSync(void)
 {
     float diverge = 0.0f;
+    float maxdiverge = 0.0f;
 
     VideoFrame *buffer = videoOutput->GetLastShownFrame();
     if (!buffer)
@@ -2323 +2336 @@
     if (normal_speed)
     {
         diverge = WarpFactor();
-        // If we are WAY out of sync, we can't really adjust this much
-        // so just adjust by DIVERGELIMIT and hope lip-sync remains.
-        diverge = max(diverge, -DIVERGELIMIT);
-        diverge = min(diverge, +DIVERGELIMIT);
     }
 
+    // If we are outside MAXDIVERGE then activate correction
+    // Keep correcting until MAXDIVERGELOW is reached
+    // If A/V diverge is drifting this allows a longer 
+    // time between corrections (and thus less jitter on screen)
+    //
+    if ((diverge < -MAXDIVERGE) || (diverge > MAXDIVERGE)) {
+        isFixingDiverge=true;
+    } else if (((diverge > -MAXDIVERGELOW) && (diverge <= 0)) || ((diverge < MAXDIVERGELOW) && (diverge >= 0))) {
+        isFixingDiverge=false;
+    }
+    
+    if (isFixingDiverge) {
+        maxdiverge=MAXDIVERGELOW;
+    } else {
+        maxdiverge=MAXDIVERGE;
+    }
+    
     FrameScanType ps = m_scan;
     if (kScan_Detect == m_scan || kScan_Ignore == m_scan)
         ps = kScan_Progressive;
 
-    if (diverge < -MAXDIVERGE)
+    if (diverge < -maxdiverge)
     {
         // If video is way behind of audio, adjust for it...
         QString dbg = QString("Video is %1 frames behind audio (too slow), ")
             .arg(-diverge);
 
-        // Reset A/V Sync
-        lastsync = true;
- 
         if (buffer && !using_null_videoout &&
             (videoOutput->hasMCAcceleration()   ||
              videoOutput->hasIDCTAcceleration() ||
@@ -2428 +2451 @@
     videosync->AdvanceTrigger();
     avsync_adjustment = 0;
 
-    if (diverge > MAXDIVERGE)
+    if (diverge > maxdiverge)
     {
         // If audio is way behind of video, adjust for it...
         // by cutting the frame rate in half for the length of this frame
 
         avsync_adjustment = frame_interval;
-        lastsync = true;
         VERBOSE(VB_PLAYBACK, LOC + 
                 QString("Video is %1 frames ahead of audio,\n"
                         "\t\t\tdoubling video frame interval to slow down.").arg(diverge));
@@ -2477 +2499 @@
             // prevents major jitter when pts resets during dvd title
             if (avsync_delay > 2000000 && ringBuffer->isDVD())
                 avsync_delay = 90000;
+            if (avsync_avg = 0)
+                avsync_avg = avsync_delay;
             avsync_avg = (avsync_delay + (avsync_avg * 3)) / 4;
-            if (!usevideotimebase)
-            {
-                /* If the audio time codes and video diverge, shift
-                   the video by one interlaced field (1/2 frame) */
-
-                if (!lastsync)
-                {
-                    if (avsync_avg > frame_interval * 3 / 2)
-                    {
-                        avsync_adjustment = refreshrate;
-                        lastsync = true;
-                    }
-                    else if (avsync_avg < 0 - frame_interval * 3 / 2)
-                    {
-                        avsync_adjustment = -refreshrate;
-                        lastsync = true;
-                    }
-                }
-                else
-                    lastsync = false;
-            }
         }
         else
         {
@@ -2780 +2783 @@
     avsync_avg = 0;
     avsync_oldavg = 0;
     refreshrate = 0;
-    lastsync = false;
 
     usevideotimebase = gContext->GetNumSetting("UseVideoTimebase", 0);