X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.cc;h=a5e86f22b8e352d529fa39e69149ad10cca9fec4;hp=4b77a8afbe0a1f56787f110c60c227cdd849b262;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=fa4d2529d63bcfa7cf7c516b7227e20a1b6dec7e

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 4b77a8afb..a5e86f22b 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,6 +21,7 @@
 #include "audio_decoder.h"
 #include "audio_buffers.h"
 #include "audio_content.h"
+#include "dcpomatic_log.h"
 #include "log.h"
 #include "resampler.h"
 #include "compose.hpp"
@@ -29,17 +30,17 @@
 
 #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;
+using namespace dcpomatic;
 
-AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, shared_ptr<Log> log)
-	: DecoderPart (parent, log)
+AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, bool fast)
+	: DecoderPart (parent)
 	, _content (content)
+	, _fast (fast)
 {
 	/* Set up _positions so that we have one for each stream */
 	BOOST_FOREACH (AudioStreamPtr i, content->streams ()) {
@@ -48,7 +49,7 @@ AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> cont
 }
 
 void
-AudioDecoder::emit (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
+AudioDecoder::emit (shared_ptr<const Film> film, AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
 {
 	if (ignore ()) {
 		return;
@@ -60,23 +61,31 @@ AudioDecoder::emit (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data,
 		   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 ());
+		if (_content->delay() > 0) {
+			/* Insert silence to give the delay */
+			silence (_content->delay ());
+		}
+		time += ContentTime::from_seconds (_content->delay() / 1000.0);
+		_positions[stream] = time.frames_round (_content->resampled_frame_rate(film));
 	}
 
 	shared_ptr<Resampler> resampler;
-	map<AudioStreamPtr, shared_ptr<Resampler> >::iterator i = _resamplers.find(stream);
+	ResamplerMap::iterator i = _resamplers.find(stream);
 	if (i != _resamplers.end ()) {
 		resampler = i->second;
 	} else {
-		if (stream->frame_rate() != _content->resampled_frame_rate()) {
+		if (stream->frame_rate() != _content->resampled_frame_rate(film)) {
 			LOG_GENERAL (
 				"Creating new resampler from %1 to %2 with %3 channels",
 				stream->frame_rate(),
-				_content->resampled_frame_rate(),
+				_content->resampled_frame_rate(film),
 				stream->channels()
 				);
 
-			resampler.reset (new Resampler (stream->frame_rate(), _content->resampled_frame_rate(), stream->channels()));
+			resampler.reset (new Resampler (stream->frame_rate(), _content->resampled_frame_rate(film), stream->channels()));
+			if (_fast) {
+				resampler->set_fast ();
+			}
 			_resamplers[stream] = resampler;
 		}
 	}
@@ -89,33 +98,42 @@ AudioDecoder::emit (AudioStreamPtr stream, shared_ptr<const AudioBuffers> data,
 		data = ro;
 	}
 
-	Data (stream, ContentAudio (data, _positions[stream]));
+	Data(stream, ContentAudio (data, _positions[stream]));
 	_positions[stream] += data->frames();
 }
 
+/** @return Time just after the last thing that was emitted from a given stream */
 ContentTime
-AudioDecoder::position () const
+AudioDecoder::stream_position (shared_ptr<const Film> film, AudioStreamPtr stream) const
+{
+	PositionMap::const_iterator i = _positions.find (stream);
+	DCPOMATIC_ASSERT (i != _positions.end ());
+	return ContentTime::from_frames (i->second, _content->resampled_frame_rate(film));
+}
+
+boost::optional<ContentTime>
+AudioDecoder::position (shared_ptr<const Film> film) 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());
+	for (PositionMap::const_iterator i = _positions.begin(); i != _positions.end(); ++i) {
+		ContentTime const ct = stream_position (film, i->first);
 		if (!p || ct < *p) {
 			p = ct;
 		}
 	}
 
-	return p.get_value_or(ContentTime());
+	return p;
 }
 
 void
 AudioDecoder::seek ()
 {
-	for (map<AudioStreamPtr, shared_ptr<Resampler> >::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
+	for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
 		i->second->flush ();
 		i->second->reset ();
 	}
 
-	for (map<AudioStreamPtr, Frame>::iterator i = _positions.begin(); i != _positions.end(); ++i) {
+	for (PositionMap::iterator i = _positions.begin(); i != _positions.end(); ++i) {
 		i->second = 0;
 	}
 }
@@ -123,11 +141,27 @@ AudioDecoder::seek ()
 void
 AudioDecoder::flush ()
 {
-	for (map<AudioStreamPtr, shared_ptr<Resampler> >::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
+	for (ResamplerMap::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();
 		}
 	}
+
+	if (_content->delay() < 0) {
+		/* Finish off with the gap caused by the delay */
+		silence (-_content->delay ());
+	}
+}
+
+void
+AudioDecoder::silence (int milliseconds)
+{
+	BOOST_FOREACH (AudioStreamPtr i, _content->streams ()) {
+		int const samples = ContentTime::from_seconds(milliseconds / 1000.0).frames_round(i->frame_rate());
+		shared_ptr<AudioBuffers> silence (new AudioBuffers (i->channels(), samples));
+		silence->make_silent ();
+		Data (i, ContentAudio (silence, _positions[i]));
+	}
 }