Fix seek with respect to video/audio frame boundary alignment.

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 56bf0767dff9c33f358fe81316a50281b9d6bf7d..d60dfb6a9b339508fd2bf1fb5fe1f9586674f036 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -351,8 +351,10 @@ Player::seek (DCPTime t, bool accurate)
                (*i)->decoder->seek (ct, accurate);
        }
 
-       _video_position = _audio_position = t;
-       _audio_merger.clear (t);
+       _video_position = time_round_up (t, TIME_HZ / _film->video_frame_rate());
+       _audio_position = time_round_up (t, TIME_HZ / _film->audio_frame_rate());
+
+       _audio_merger.clear (_audio_position);
 
        if (!accurate) {
                /* We just did an inaccurate seek, so it's likely that the next thing seen