Various attempted fixes to audio sync.

[dcpomatic.git] / src / lib / player.cc

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 4fe81d4b2a9e86053fb1e5c8965cd0e4bec1a90b..3db2fe6c9eb19074be6f265f7fd4ffe6918ca61d 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -119,10 +119,10 @@ Player::pass ()
                                break;
                        }
 
-                       dec->set_dcp_times ((*i)->frc.speed_up, offset);
+                       dec->set_dcp_times (_film->video_frame_rate(), _film->audio_frame_rate(), (*i)->frc, offset);
                        DCPTime const t = dec->dcp_time - offset;
-                       if (t >= (*i)->content->full_length() - (*i)->content->trim_end ()) {
-                               /* In the end-trimmed part; decoder has nothing eles to give us */
+                       if (t >= ((*i)->content->full_length() - (*i)->content->trim_end ())) {
+                               /* In the end-trimmed part; decoder has nothing else to give us */
                                dec.reset ();
                                done = true;
                        } else if (t >= (*i)->content->trim_start ()) {
@@ -172,11 +172,6 @@ Player::pass ()
        /* Will be set to false if we shouldn't consume the peeked DecodedThing */
        bool consume = true;
 
-       /* This is the margin either side of _{video,audio}_position that we will accept
-          as a starting point for a frame consecutive to the previous.
-       */
-       DCPTime const margin = TIME_HZ / (2 * _film->video_frame_rate ());
-       
        if (dv && _video) {
 
                if (_just_did_inaccurate_seek) {
@@ -185,7 +180,7 @@ Player::pass ()
                        emit_video (earliest_piece, dv);
                        step_video_position (dv);
                        
-               } else if (dv->dcp_time - _video_position > margin) {
+               } else if (dv->dcp_time > _video_position) {
 
                        /* Too far ahead */
 
@@ -208,7 +203,7 @@ Player::pass ()
 
                        consume = false;
 
-               } else if (abs (dv->dcp_time - _video_position) < margin) {
+               } else if (dv->dcp_time == _video_position) {
                        /* We're ok */
                        emit_video (earliest_piece, dv);
                        step_video_position (dv);
@@ -222,12 +217,12 @@ Player::pass ()
 
        } else if (da && _audio) {
 
-               if (da->dcp_time - _audio_position > margin) {
+               if (da->dcp_time > _audio_position) {
                        /* Too far ahead */
                        emit_silence (da->dcp_time - _audio_position);
                        consume = false;
                        _statistics.audio.silence += (da->dcp_time - _audio_position);
-               } else if (abs (da->dcp_time - _audio_position) < margin) {
+               } else if (da->dcp_time == _audio_position) {
                        /* We're ok */
                        emit_audio (earliest_piece, da);
                        _statistics.audio.good += da->data->frames();