Ticket #11246: diff-dump2.txt

File diff-dump2.txt, 2.1 KB (added by blm-ubunet@…, 11 years ago)

jitter mythplayer

Line 
1diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
2index 62dcfea..81e8976 100644
3--- a/mythtv/libs/libmythtv/mythplayer.cpp
4+++ b/mythtv/libs/libmythtv/mythplayer.cpp
5@@ -1885,7 +1885,7 @@ void MythPlayer::AVSync(VideoFrame *buffer, bool limit_delay)
6             videoOutput->Show(ps);
7         }
8 
9-        repeat_delay = frame_interval * repeat_pict * 0.5;
10+        repeat_delay = refreshrate * repeat_pict *0.5; //frame_interval * repeat_pict * 0.5;
11 
12         if (repeat_delay)
13             LOG(VB_TIMESTAMP, LOG_INFO, LOC +
14@@ -1911,7 +1911,7 @@ void MythPlayer::AVSync(VideoFrame *buffer, bool limit_delay)
15     {
16         // If audio is way behind of video, adjust for it...
17         // by cutting the frame rate in half for the length of this frame
18-        avsync_adjustment = frame_interval;
19+        avsync_adjustment = refreshrate;  //frame_interval;
20         lastsync = true;
21         LOG(VB_PLAYBACK, LOG_INFO, LOC +
22             QString("Video is %1 frames ahead of audio,\n"
23@@ -1944,16 +1944,16 @@ void MythPlayer::AVSync(VideoFrame *buffer, bool limit_delay)
24             if (prevtc != 0)
25             {
26                 int delta = (int)((timecode - prevtc)/play_speed) -
27-                                  (frame_interval / 1000);
28+                                  (refreshrate / 1000); //frame_interval / 1000);
29                 // If timecode is off by a frame (dropped frame) wait to sync
30-                if (delta > (int) frame_interval / 1200 &&
31-                    delta < (int) frame_interval / 1000 * 3 &&
32+                if (delta > (int) refreshrate / 1200 && //frame_interval / 1200 &&
33+                    delta < (int) refreshrate / 1000 *3 &&  //frame_interval / 1000 * 3 &&
34                     prevrp == 0)
35                 {
36                     // wait an extra frame interval
37                     LOG(VB_PLAYBACK | VB_TIMESTAMP, LOG_INFO, LOC +
38                         QString("A/V delay %1").arg(delta));
39-                    avsync_adjustment += frame_interval;
40+                    avsync_adjustment += refreshrate ; //frame_interval;
41                 }
42             }
43             prevtc = timecode;