Rename certificate -> recipient in Screen.

[dcpomatic.git] / src / lib / audio_decoder_stream.cc

diff --git a/src/lib/audio_decoder_stream.cc b/src/lib/audio_decoder_stream.cc
index 52a33c172a2cd416fd13a6908fb64af74cb1768a..4fedf9291eea8e55515a187ae688dbfb437748e0 100644 (file)
--- a/src/lib/audio_decoder_stream.cc
+++ b/src/lib/audio_decoder_stream.cc
@@ -25,6 +25,7 @@
 #include "util.h"
 #include "film.h"
 #include "log.h"
+#include "audio_content.h"
 #include "compose.hpp"
 #include <iostream>
 
@@ -43,8 +44,8 @@ AudioDecoderStream::AudioDecoderStream (shared_ptr<const AudioContent> content,
        , _stream (stream)
        , _decoder (decoder)
 {
-       if (content->resampled_audio_frame_rate() != _stream->frame_rate()) {
-               _resampler.reset (new Resampler (_stream->frame_rate(), content->resampled_audio_frame_rate(), _stream->channels ()));
+       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 (), decoder->fast ()));
        }
 
        reset_decoded ();
@@ -61,7 +62,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);
+       _content->film()->log()->log (String::compose ("-> ADS has request for %1 %2", frame, length), LogEntry::TYPE_DEBUG_DECODE);
 
        Frame const end = frame + length - 1;
 
@@ -86,7 +87,7 @@ 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)
                        )
                {}
 
@@ -94,7 +95,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate)
        } else {
                while (
                        _decoded.audio->frames() < length &&
-                       !_decoder->pass ()
+                       !_decoder->pass (Decoder::PASS_REASON_AUDIO, accurate)
                        )
                {}
 
@@ -135,7 +136,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);
+       _content->film()->log()->log (String::compose ("ADS receives %1 %2", time, data->frames ()), LogEntry::TYPE_DEBUG_DECODE);
 
        if (_resampler) {
                data = _resampler->run (data);