X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.cc;h=4b77a8afbe0a1f56787f110c60c227cdd849b262;hb=c180f317d5a8b27dd191c1f2228ceb6fc4039393;hp=f26c676b200038c54673871ef2b80c42ee8d8adb;hpb=878e19aabf2278828a3c9b518e0804b2cef0c01e;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index f26c676b2..4b77a8afb 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,84 +20,114 @@
 
 #include "audio_decoder.h"
 #include "audio_buffers.h"
-#include "audio_decoder_stream.h"
 #include "audio_content.h"
+#include "log.h"
+#include "resampler.h"
+#include "compose.hpp"
 #include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
+#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
+
 using std::cout;
 using std::map;
+using std::pair;
 using boost::shared_ptr;
+using boost::optional;
 
 AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, shared_ptr<Log> log)
 	: DecoderPart (parent, log)
+	, _content (content)
 {
+	/* Set up _positions so that we have one for each stream */
 	BOOST_FOREACH (AudioStreamPtr i, content->streams ()) {
-		_streams[i] = shared_ptr<AudioDecoderStream> (new AudioDecoderStream (content, i, parent, this, 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 ()) {
 		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.
+	if (_positions[stream] == 0) {
+		/* This is the first data we have received since initialisation or seek.  Set
+		   the position based on the ContentTime that was given.  After this first time
+		   we just count samples, as it seems that ContentTimes are unreliable from
+		   FFmpegDecoder (not quite continuous; perhaps due to some rounding error).
+		*/
+		_positions[stream] = time.frames_round (stream->frame_rate ());
+	}
 
-		   At this point the AudioDecoder does not know about the new stream.
+	shared_ptr<Resampler> resampler;
+	map<AudioStreamPtr, shared_ptr<Resampler> >::iterator i = _resamplers.find(stream);
+	if (i != _resamplers.end ()) {
+		resampler = i->second;
+	} else {
+		if (stream->frame_rate() != _content->resampled_frame_rate()) {
+			LOG_GENERAL (
+				"Creating new resampler from %1 to %2 with %3 channels",
+				stream->frame_rate(),
+				_content->resampled_frame_rate(),
+				stream->channels()
+				);
+
+			resampler.reset (new Resampler (stream->frame_rate(), _content->resampled_frame_rate(), stream->channels()));
+			_resamplers[stream] = resampler;
+		}
+	}
 
-		   Then
-		   - Some other property change signal is delivered which marks the player's pieces invalid.
-		   - Film viewer re-gets again.
-		   - Everything is OK.
+	if (resampler) {
+		shared_ptr<const AudioBuffers> ro = resampler->run (data);
+		if (ro->frames() == 0) {
+			return;
+		}
+		data = ro;
+	}
 
-		   In this situation it is fine for us to silently drop the audio.
-		*/
+	Data (stream, ContentAudio (data, _positions[stream]));
+	_positions[stream] += data->frames();
+}
 
-		return;
+ContentTime
+AudioDecoder::position () const
+{
+	optional<ContentTime> p;
+	for (map<AudioStreamPtr, Frame>::const_iterator i = _positions.begin(); i != _positions.end(); ++i) {
+		ContentTime const ct = ContentTime::from_frames (i->second, _content->resampled_frame_rate());
+		if (!p || ct < *p) {
+			p = ct;
+		}
 	}
 
-	_streams[stream]->audio (data, time);
+	return p.get_value_or(ContentTime());
 }
 
 void
-AudioDecoder::flush ()
+AudioDecoder::seek ()
 {
-	for (map<AudioStreamPtr, shared_ptr<AudioDecoderStream> >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
+	for (map<AudioStreamPtr, shared_ptr<Resampler> >::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
 		i->second->flush ();
+		i->second->reset ();
 	}
-}
 
-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);
+	for (map<AudioStreamPtr, Frame>::iterator i = _positions.begin(); i != _positions.end(); ++i) {
+		i->second = 0;
 	}
 }
 
 void
-AudioDecoder::set_fast ()
+AudioDecoder::flush ()
 {
-	for (map<AudioStreamPtr, shared_ptr<AudioDecoderStream> >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) {
-		i->second->set_fast ();
+	for (map<AudioStreamPtr, shared_ptr<Resampler> >::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
+		shared_ptr<const AudioBuffers> ro = i->second->flush ();
+		if (ro->frames() > 0) {
+			Data (i->first, ContentAudio (ro, _positions[i->first]));
+			_positions[i->first] += ro->frames();
+		}
 	}
 }