Some more decode logging.

[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 a254356ef0b790ead98aea5d7b67105bad940bf1..ef67b94f17e606144230d35a417911fdacee87b1 100644 (file)
--- a/src/lib/audio_decoder_stream.cc
+++ b/src/lib/audio_decoder_stream.cc
@@ -40,11 +40,18 @@ using std::max;
 using boost::optional;
 using boost::shared_ptr;
 
-AudioDecoderStream::AudioDecoderStream (shared_ptr<const AudioContent> content, AudioStreamPtr stream, Decoder* decoder, shared_ptr<Log> log)
+AudioDecoderStream::AudioDecoderStream (
+       shared_ptr<const AudioContent> content, AudioStreamPtr stream, Decoder* decoder, AudioDecoder* audio_decoder, shared_ptr<Log> log
+       )
        : _content (content)
        , _stream (stream)
        , _decoder (decoder)
+       , _audio_decoder (audio_decoder)
        , _log (log)
+         /* We effectively start having done a seek to zero; this allows silence-padding of the first
+            data that comes out of our decoder.
+         */
+       , _seek_reference (ContentTime ())
 {
        if (content->resampled_frame_rate() != _stream->frame_rate() && _stream->channels() > 0) {
                _resampler.reset (new Resampler (_stream->frame_rate(), content->resampled_frame_rate(), _stream->channels ()));
@@ -64,13 +71,26 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate)
 {
        shared_ptr<ContentAudio> dec;
 
-       _log->log (String::compose ("-> ADS has request for %1 %2", frame, length), LogEntry::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;
+       Frame const from = frame;
+       Frame const to = from + length;
+       Frame const have_from = _decoded.frame;
+       Frame const have_to = _decoded.frame + _decoded.audio->frames();
 
-       if (frame < _decoded.frame || end > (_decoded.frame + length * 4)) {
-               /* Either we have no decoded data, or what we do have is a long way from what we want: seek */
-               _decoder->seek (ContentTime::from_frames (frame, _content->resampled_frame_rate()), accurate);
+       optional<Frame> missing;
+       if (have_from > from || have_to < to) {
+               /* We need something */
+               if (have_from < from && from < have_to) {
+                       missing = have_to;
+               } else {
+                       missing = from;
+               }
+       }
+
+       if (missing) {
+               _log->log (String::compose ("ADS suggests seek to %1", *missing), LogEntry::TYPE_DEBUG_DECODE);
+               _audio_decoder->maybe_seek (ContentTime::from_frames (*missing, _content->resampled_frame_rate()), accurate);
        }
 
        /* Offset of the data that we want from the start of _decoded.audio
@@ -88,7 +108,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate)
        if (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) &&
+                       (_decoded.frame > frame || (_decoded.frame + _decoded.audio->frames()) <= to) &&
                        !_decoder->pass (Decoder::PASS_REASON_AUDIO, accurate)
                        )
                {}
@@ -96,7 +116,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool 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),
+                       String::compose ("Accurate ADS::get has offset %1 from request %2 and available %3", decoded_offset, frame, have_from),
                        LogEntry::TYPE_DEBUG_DECODE
                        );
        } else {
@@ -143,7 +163,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate)
 void
 AudioDecoderStream::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-       _log->log (String::compose ("ADS receives %1 %2", time, data->frames ()), LogEntry::TYPE_DEBUG_DECODE);
+       _log->log (String::compose ("ADS receives %1 %2", to_string(time), data->frames ()), LogEntry::TYPE_DEBUG_DECODE);
 
        if (_resampler) {
                data = _resampler->run (data);
@@ -162,20 +182,6 @@ AudioDecoderStream::audio (shared_ptr<const AudioBuffers> data, ContentTime time
                        padded->copy_from (data.get(), data->frames(), 0, delta_frames);
                        data = padded;
                        time -= delta;
-               } else if (delta_frames < 0) {
-                       /* This data comes before the seek time.  Throw some data away */
-                       Frame const to_discard = min (-delta_frames, static_cast<Frame> (data->frames()));
-                       Frame const to_keep = data->frames() - to_discard;
-                       if (to_keep == 0) {
-                               /* We have to throw all this data away, so keep _seek_reference and
-                                  try again next time some data arrives.
-                               */
-                               return;
-                       }
-                       shared_ptr<AudioBuffers> trimmed (new AudioBuffers (data->channels(), to_keep));
-                       trimmed->copy_from (data.get(), to_keep, to_discard, 0);
-                       data = trimmed;
-                       time += ContentTime::from_frames (to_discard, frame_rate);
                }
                _seek_reference = optional<ContentTime> ();
        }