X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.cc;h=8c395cb89a0074aa171c3eb06b39c6bc4c00d508;hp=30bd2540a01ac361523fabc792dafe9ac1e27caa;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=ed6433a0a47fac51faec7439bfcaf856923fb304

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 30bd2540a..8c395cb89 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -1,58 +1,103 @@
 /*
-    Copyright (C) 2012 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 <iostream>
 #include "audio_decoder.h"
 #include "audio_buffers.h"
-#include "exceptions.h"
-#include "log.h"
-#include "resampler.h"
+#include "audio_decoder_stream.h"
+#include "audio_content.h"
+#include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
-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)
-	, _audio_position (0)
+AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, bool fast, shared_ptr<Log> log)
+	: _ignore (false)
+	, _fast (fast)
 {
+	BOOST_FOREACH (AudioStreamPtr i, content->streams ()) {
+		_streams[i] = shared_ptr<AudioDecoderStream> (new AudioDecoderStream (content, i, parent, fast, log));
+	}
+}
 
+ContentAudio
+AudioDecoder::get (AudioStreamPtr stream, Frame frame, Frame length, bool accurate)
+{
+	return _streams[stream]->get (frame, length, accurate);
 }
 
 void
-AudioDecoder::audio (shared_ptr<const AudioBuffers> data, AudioContent::Frame frame)
+AudioDecoder::give (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-	Audio (data, frame);
-	_audio_position = frame + data->frames ();
+	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;
+	}
+
+	_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 ();
+	}
 }
 
-/** 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 trying to
- *  pass() the decoder to get it to emit audio.
- */
-bool
-AudioDecoder::has_audio () const
+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 ()
 {
-	return _audio_content->audio_channels () > 0;
+	_ignore = true;
 }