Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 8d3b0e1288ea5b53627a9cfb82619b0ccc125c7e..2944357bac7fe0f279bb8da163915c1e730f65e9 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,71 +19,85 @@
 
 #include "audio_decoder.h"
 #include "audio_buffers.h"
-#include "exceptions.h"
-#include "log.h"
-#include "resampler.h"
-#include "util.h"
-#include "film.h"
+#include "audio_decoder_stream.h"
+#include "audio_content.h"
+#include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
-using std::stringstream;
-using std::list;
-using std::pair;
 using std::cout;
-using boost::optional;
+using std::map;
 using boost::shared_ptr;
 
-AudioDecoder::AudioDecoder (shared_ptr<const Film> film, shared_ptr<const AudioContent> content)
-       : Decoder (film)
-       , _audio_content (content)
+AudioDecoder::AudioDecoder (shared_ptr<const AudioContent> content, bool fast)
+       : _audio_content (content)
+       , _ignore_audio (false)
+       , _fast (fast)
 {
-       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 ()));
+       BOOST_FOREACH (AudioStreamPtr i, content->audio_streams ()) {
+               _streams[i] = shared_ptr<AudioDecoderStream> (new AudioDecoderStream (_audio_content, i, this));
        }
 }
 
-/** 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.
- */
+ContentAudio
+AudioDecoder::get_audio (AudioStreamPtr stream, Frame frame, Frame length, bool accurate)
+{
+       return _streams[stream]->get (frame, length, accurate);
+}
+
 void
-AudioDecoder::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
+AudioDecoder::audio (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-       if (_resampler) {
-               data = _resampler->run (data);
+       if (_ignore_audio) {
+               return;
        }
 
-       if (!_audio_position) {
-               shared_ptr<const Film> film = _film.lock ();
-               assert (film);
-               FrameRateChange frc = film->active_frame_rate_change (_audio_content->position ());
-               _audio_position = (double (time) / frc.speed_up) * film->audio_frame_rate() / TIME_HZ;
+       if (_streams.find (stream) == _streams.end ()) {
+
+               /* This method can be called with an unknown stream during the following sequence:
+                  - Add KDM to some DCP content.
+                  - Content gets re-examined.
+                  - SingleStreamAudioContent::take_from_audio_examiner creates a new stream.
+                  - Some content property change signal is delivered so Player::Changed is emitted.
+                  - Film viewer to re-gets the frame.
+                  - Player calls DCPDecoder pass which calls this method on the new stream.
+
+                  At this point the AudioDecoder does not know about the new stream.
+
+                  Then
+                  - Some other property change signal is delivered which marks the player's pieces invalid.
+                  - Film viewer re-gets again.
+                  - Everything is OK.
+
+                  In this situation it is fine for us to silently drop the audio.
+               */
+
+               return;
        }
 
-       _pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (data, _audio_position.get ())));
-       _audio_position = _audio_position.get() + data->frames ();
+       _streams[stream]->audio (data, time);
 }
 
 void
 AudioDecoder::flush ()
 {
-       if (!_resampler) {
-               return;
+       for (map<AudioStreamPtr, shared_ptr<AudioDecoderStream> >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
+               i->second->flush ();
        }
+}
 
-       shared_ptr<const AudioBuffers> b = _resampler->flush ();
-       if (b) {
-               _pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (b, _audio_position.get ())));
-               _audio_position = _audio_position.get() + b->frames ();
+void
+AudioDecoder::seek (ContentTime t, bool accurate)
+{
+       for (map<AudioStreamPtr, shared_ptr<AudioDecoderStream> >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
+               i->second->seek (t, accurate);
        }
 }
 
+/** Set this player never to produce any audio data */
 void
-AudioDecoder::seek (ContentTime, bool)
+AudioDecoder::set_ignore_audio ()
 {
-       _audio_position.reset ();
+       _ignore_audio = true;
 }