Various fixes to push audio vaguely in the right direction.

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

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 4b89dc62053fe543e3527efbb1a5f78e4bc9b161..5a33716f4fe775622e2864a7ce97192c281ed84a 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -20,8 +20,9 @@
 
 #include "audio_decoder.h"
 #include "audio_buffers.h"
-#include "audio_decoder_stream.h"
 #include "audio_content.h"
+#include "log.h"
+#include "compose.hpp"
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -30,82 +31,49 @@
 using std::cout;
 using std::map;
 using boost::shared_ptr;
+using boost::optional;
 
-AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, shared_ptr<Log> log)
-       : _ignore (false)
-       , _fast (false)
+AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<AudioContent> content, shared_ptr<Log> log)
+       : DecoderPart (parent, log)
 {
        BOOST_FOREACH (AudioStreamPtr i, content->streams ()) {
-               _streams[i] = shared_ptr<AudioDecoderStream> (new AudioDecoderStream (content, i, parent, log));
+               _positions[i] = 0;
        }
 }
 
-ContentAudio
-AudioDecoder::get (AudioStreamPtr stream, Frame frame, Frame length, bool accurate)
-{
-       return _streams[stream]->get (frame, length, accurate);
-}
-
 void
-AudioDecoder::give (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
+AudioDecoder::emit (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-       if (_ignore) {
+       if (ignore ()) {
                return;
        }
 
-       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;
+       if (_positions[stream] == 0) {
+               _positions[stream] = time.frames_round (stream->frame_rate ());
        }
 
-       _streams[stream]->audio (data, time);
+       Data (stream, ContentAudio (data, _positions[stream]));
+       _positions[stream] += data->frames();
 }
 
-void
-AudioDecoder::flush ()
+ContentTime
+AudioDecoder::position () const
 {
-       for (map<AudioStreamPtr, shared_ptr<AudioDecoderStream> >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
-               i->second->flush ();
+       optional<ContentTime> p;
+       for (map<AudioStreamPtr, Frame>::const_iterator i = _positions.begin(); i != _positions.end(); ++i) {
+               ContentTime const ct = ContentTime::from_frames (i->second, i->first->frame_rate ());
+               if (!p || ct < *p) {
+                       p = ct;
+               }
        }
-}
 
-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 decoder never to produce any data */
-void
-AudioDecoder::set_ignore ()
-{
-       _ignore = true;
+       return p.get_value_or(ContentTime());
 }
 
 void
-AudioDecoder::set_fast ()
+AudioDecoder::seek ()
 {
-       for (map<AudioStreamPtr, shared_ptr<AudioDecoderStream> >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
-               i->second->set_fast ();
+       for (map<AudioStreamPtr, Frame>::iterator i = _positions.begin(); i != _positions.end(); ++i) {
+               i->second = 0;
        }
 }