Remove uses of boost::system::error_code::message(), which seem to cause the pure...

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

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index c9fbddda1c4b120033ec1c3d630f7956966e405c..d85bfaee22aaf79f0e5b512724334384a733ae11 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -22,6 +22,8 @@
 #include "exceptions.h"
 #include "log.h"
 #include "resampler.h"
+#include "util.h"
+#include "film.h"
 
 #include "i18n.h"
 
@@ -37,21 +39,46 @@ AudioDecoder::AudioDecoder (shared_ptr<const Film> film, shared_ptr<const AudioC
        , _audio_content (content)
        , _audio_position (0)
 {
+       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 ()));
+       }
+}
 
+/** 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.
+ */
+void
+AudioDecoder::audio (shared_ptr<const AudioBuffers> data)
+{
+       if (_resampler) {
+               data = _resampler->run (data);
+       }
+       
+       _pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (data, _audio_position)));
+       _audio_position += data->frames ();
 }
 
 void
-AudioDecoder::audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame)
+AudioDecoder::flush ()
 {
-       Audio (data, frame);
-       _audio_position = frame + data->frames ();
+       if (!_resampler) {
+               return;
+       }
+
+       shared_ptr<const AudioBuffers> b = _resampler->flush ();
+       if (b) {
+               _pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (b, _audio_position)));
+               _audio_position += b->frames ();
+       }
 }
 
-/** This is a bit odd, but necessary when we have (e.g.) FFmpegDecoders with no audio.
- *  The player needs to know that there is no audio otherwise it will keep prompting the XXX
- */
-bool
-AudioDecoder::has_audio () const
+void
+AudioDecoder::seek (ContentTime t, bool)
 {
-       return _audio_content->channels () > 0;
+       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;
 }