diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp index cbbb395..dff1550 100644 --- a/mythtv/libs/libmythtv/mythplayer.cpp +++ b/mythtv/libs/libmythtv/mythplayer.cpp @@ -212,7 +212,7 @@ MythPlayer::MythPlayer(PlayerFlags flags) decoder_lock(QMutex::Recursive), next_play_speed(1.0f), next_normal_speed(true), play_speed(1.0f), normal_speed(true), - frame_interval((int)(1000000.0f / 30)), m_frame_interval(0), + frame_interval((int)(1000000.0f / 25)), m_frame_interval(0), ffrew_skip(1),ffrew_adjust(0), // Audio and video synchronization stuff videosync(NULL), avsync_delay(0), @@ -1928,7 +1928,7 @@ void MythPlayer::AVSync(VideoFrame *buffer, bool limit_delay) videoOutput->Show(ps); } - repeat_delay = frame_interval * repeat_pict * 0.5; + repeat_delay = refreshrate * repeat_pict * 0.5; if (repeat_delay) LOG(VB_TIMESTAMP, LOG_INFO, LOC + @@ -1954,7 +1954,7 @@ void MythPlayer::AVSync(VideoFrame *buffer, bool limit_delay) { // 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; + avsync_adjustment = refreshrate; lastsync = true; LOG(VB_PLAYBACK, LOG_INFO, LOC + QString("Video is %1 frames ahead of audio,\n" @@ -1987,16 +1987,16 @@ void MythPlayer::AVSync(VideoFrame *buffer, bool limit_delay) if (prevtc != 0) { int delta = (int)((timecode - prevtc)/play_speed) - - (frame_interval / 1000); + (refreshrate / 1000); // If timecode is off by a frame (dropped frame) wait to sync - if (delta > (int) frame_interval / 1200 && - delta < (int) frame_interval / 1000 * 3 && + if (delta > (int) refreshrate / 1200 && + delta < (int) refreshrate / 1000 * 3 && prevrp == 0) { // wait an extra frame interval LOG(VB_PLAYBACK | VB_TIMESTAMP, LOG_INFO, LOC + QString("A/V delay %1").arg(delta)); - avsync_adjustment += frame_interval; + avsync_adjustment += refreshrate; // If we're duplicating a frame, it may be because // the container frame rate doesn't match the // stream frame rate. In this case, we increment