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 2944357bac7fe0f279bb8da163915c1e730f65e9..5a33716f4fe775622e2864a7ce97192c281ed84a 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -1,26 +1,28 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #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>
 
@@ -29,75 +31,49 @@
 using std::cout;
 using std::map;
 using boost::shared_ptr;
+using boost::optional;
 
-AudioDecoder::AudioDecoder (shared_ptr<const AudioContent> content, bool fast)
-       : _audio_content (content)
-       , _ignore_audio (false)
-       , _fast (fast)
+AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<AudioContent> content, shared_ptr<Log> log)
+       : DecoderPart (parent, log)
 {
-       BOOST_FOREACH (AudioStreamPtr i, content->audio_streams ()) {
-               _streams[i] = shared_ptr<AudioDecoderStream> (new AudioDecoderStream (_audio_content, i, this));
+       BOOST_FOREACH (AudioStreamPtr i, content->streams ()) {
+               _positions[i] = 0;
        }
 }
 
-ContentAudio
-AudioDecoder::get_audio (AudioStreamPtr stream, Frame frame, Frame length, bool accurate)
-{
-       return _streams[stream]->get (frame, length, accurate);
-}
-
 void
-AudioDecoder::audio (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
+AudioDecoder::emit (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-       if (_ignore_audio) {
+       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);
-       }
+       return p.get_value_or(ContentTime());
 }
 
-/** Set this player never to produce any audio data */
 void
-AudioDecoder::set_ignore_audio ()
+AudioDecoder::seek ()
 {
-       _ignore_audio = true;
+       for (map<AudioStreamPtr, Frame>::iterator i = _positions.begin(); i != _positions.end(); ++i) {
+               i->second = 0;
+       }
 }