Merge master.

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

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index d85bfaee22aaf79f0e5b512724334384a733ae11..32453cc13c974d58218cf5dae9eb4eb6da5047d2 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -23,7 +23,6 @@
 #include "log.h"
 #include "resampler.h"
 #include "util.h"
-#include "film.h"
 
 #include "i18n.h"
 
@@ -34,10 +33,8 @@ using std::cout;
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<const Film> film, shared_ptr<const AudioContent> content)
-       : Decoder (film)
-       , _audio_content (content)
-       , _audio_position (0)
+AudioDecoder::AudioDecoder (shared_ptr<const AudioContent> content)
+       : _audio_content (content)
 {
        if (content->output_audio_frame_rate() != content->content_audio_frame_rate() && content->audio_channels ()) {
                _resampler.reset (new Resampler (content->content_audio_frame_rate(), content->output_audio_frame_rate(), content->audio_channels ()));
@@ -47,16 +44,23 @@ AudioDecoder::AudioDecoder (shared_ptr<const Film> film, shared_ptr<const AudioC
 /** Audio timestamping is made hard by many factors, but the final nail in the coffin is resampling.
  *  We have to assume that we are feeding continuous data into the resampler, and so we get continuous
  *  data out.  Hence we do the timestamping here, post-resampler, just by counting samples.
+ *
+ *  The time is passed in here so that after a seek we can set up our _audio_position.  The
+ *  time is ignored once this has been done.
  */
 void
-AudioDecoder::audio (shared_ptr<const AudioBuffers> data)
+AudioDecoder::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
 {
        if (_resampler) {
                data = _resampler->run (data);
        }
-       
-       _pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (data, _audio_position)));
-       _audio_position += data->frames ();
+
+       if (!_audio_position) {
+               _audio_position = time;
+       }
+
+       _pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (_audio_position.get (), data)));
+       _audio_position = _audio_position.get() + ContentTime (data->frames (), _audio_content->output_audio_frame_rate ());
 }
 
 void
@@ -68,17 +72,13 @@ AudioDecoder::flush ()
 
        shared_ptr<const AudioBuffers> b = _resampler->flush ();
        if (b) {
-               _pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (b, _audio_position)));
-               _audio_position += b->frames ();
+               _pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (_audio_position.get (), b)));
+               _audio_position = _audio_position.get() + ContentTime (b->frames (), _audio_content->output_audio_frame_rate ());
        }
 }
 
 void
-AudioDecoder::seek (ContentTime t, bool)
+AudioDecoder::seek (ContentTime, bool)
 {
-       shared_ptr<const Film> film = _film.lock ();
-       assert (film);
-       
-       FrameRateChange frc = film->active_frame_rate_change (_audio_content->position ());
-       _audio_position = (t + first_audio()) / frc.speed_up;
+       _audio_position.reset ();
 }