X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder_stream.cc;h=7037d9f47c21eb6a99bd8eb0fbbcc52df9bdaf24;hb=65b331d32c383f3a9049f29bf03ab3fe3193b31a;hp=267c542cdba60d5393361ae965aeed86a4f58558;hpb=fd0f8d0262c56bd7c2f438b51249185d86a2b12c;p=dcpomatic.git

diff --git a/src/lib/audio_decoder_stream.cc b/src/lib/audio_decoder_stream.cc
index 267c542cd..7037d9f47 100644
--- a/src/lib/audio_decoder_stream.cc
+++ b/src/lib/audio_decoder_stream.cc
@@ -39,13 +39,14 @@ using std::max;
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoderStream::AudioDecoderStream (shared_ptr<const AudioContent> content, AudioStreamPtr stream, AudioDecoder* decoder)
+AudioDecoderStream::AudioDecoderStream (shared_ptr<const AudioContent> content, AudioStreamPtr stream, AudioDecoder* decoder, shared_ptr<Log> log)
 	: _content (content)
 	, _stream (stream)
 	, _decoder (decoder)
+	, _log (log)
 {
 	if (content->resampled_audio_frame_rate() != _stream->frame_rate() && _stream->channels() > 0) {
-		_resampler.reset (new Resampler (_stream->frame_rate(), content->resampled_audio_frame_rate(), _stream->channels ()));
+		_resampler.reset (new Resampler (_stream->frame_rate(), content->resampled_audio_frame_rate(), _stream->channels (), decoder->fast ()));
 	}
 
 	reset_decoded ();
@@ -62,7 +63,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate)
 {
 	shared_ptr<ContentAudio> dec;
 
-	_content->film()->log()->log (String::compose ("-> ADS has request for %1 %2", frame, length), Log::TYPE_DEBUG_DECODE);
+	_log->log (String::compose ("-> ADS has request for %1 %2", frame, length), LogEntry::TYPE_DEBUG_DECODE);
 
 	Frame const end = frame + length - 1;
 
@@ -87,15 +88,20 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate)
 		/* Keep stuffing data into _decoded until we have enough data, or the subclass does not want to give us any more */
 		while (
 			(_decoded.frame > frame || (_decoded.frame + _decoded.audio->frames()) < end) &&
-			!_decoder->pass ()
+			!_decoder->pass (Decoder::PASS_REASON_AUDIO, accurate)
 			)
 		{}
 
 		decoded_offset = frame - _decoded.frame;
+
+		_log->log (
+			String::compose ("Accurate ADS::get has offset %1 from request %2 and available %3", decoded_offset, frame, _decoded.frame),
+			LogEntry::TYPE_DEBUG_DECODE
+			);
 	} else {
 		while (
 			_decoded.audio->frames() < length &&
-			!_decoder->pass ()
+			!_decoder->pass (Decoder::PASS_REASON_AUDIO, accurate)
 			)
 		{}
 
@@ -136,7 +142,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate)
 void
 AudioDecoderStream::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-	_content->film()->log()->log (String::compose ("ADS receives %1 %2", time, data->frames ()), Log::TYPE_DEBUG_DECODE);
+	_log->log (String::compose ("ADS receives %1 %2", time, data->frames ()), LogEntry::TYPE_DEBUG_DECODE);
 
 	if (_resampler) {
 		data = _resampler->run (data);