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 dc49a1846e74ada429e20603d213666d858ecd52..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,57 +19,85 @@
 
 #include "audio_decoder.h"
 #include "audio_buffers.h"
-#include "exceptions.h"
-#include "log.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> f)
-       : Decoder (f)
-       , _audio_position (0)
+AudioDecoder::AudioDecoder (shared_ptr<const AudioContent> content, bool fast)
+       : _audio_content (content)
+       , _ignore_audio (false)
+       , _fast (fast)
 {
+       BOOST_FOREACH (AudioStreamPtr i, content->audio_streams ()) {
+               _streams[i] = shared_ptr<AudioDecoderStream> (new AudioDecoderStream (_audio_content, i, this));
+       }
+}
+
+ContentAudio
+AudioDecoder::get_audio (AudioStreamPtr stream, Frame frame, Frame length, bool accurate)
+{
+       return _streams[stream]->get (frame, length, accurate);
 }
 
-#if 0
 void
-AudioDecoder::process_end ()
+AudioDecoder::audio (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-       if (_swr_context) {
+       if (_ignore_audio) {
+               return;
+       }
 
-               shared_ptr<const Film> film = _film.lock ();
-               assert (film);
-               
-               shared_ptr<AudioBuffers> out (new AudioBuffers (film->audio_mapping().dcp_channels(), 256));
-                       
-               while (1) {
-                       int const frames = swr_convert (_swr_context, (uint8_t **) out->data(), 256, 0, 0);
+       if (_streams.find (stream) == _streams.end ()) {
 
-                       if (frames < 0) {
-                               throw EncodeError (_("could not run sample-rate converter"));
-                       }
+               /* 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.
 
-                       if (frames == 0) {
-                               break;
-                       }
+                  At this point the AudioDecoder does not know about the new stream.
 
-                       out->set_frames (frames);
-                       _writer->write (out);
-               }
+                  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;
+       }
+
+       _streams[stream]->audio (data, time);
+}
+
+void
+AudioDecoder::flush ()
+{
+       for (map<AudioStreamPtr, shared_ptr<AudioDecoderStream> >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
+               i->second->flush ();
+       }
+}
+
+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);
        }
 }
-#endif
 
+/** Set this player never to produce any audio data */
 void
-AudioDecoder::audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame)
+AudioDecoder::set_ignore_audio ()
 {
-       Audio (data, frame);
-       _audio_position = frame + data->frames ();
+       _ignore_audio = true;
 }