Do resampling in AudioDecoder rather than Player.

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

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 604864a148ffa88fa9875381948a3309b49c5595..baec57f3d24e19473df2dd74788caa7a411e1841 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -81,6 +81,7 @@ using dcp::Size;
 FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log)
        : FFmpeg (c)
        , _log (log)
+       , _have_current_subtitle (false)
 {
        if (c->video) {
                video.reset (new VideoDecoder (this, c, log));
@@ -112,6 +113,7 @@ FFmpegDecoder::flush ()
 
        if (audio) {
                decode_audio_packet ();
+               audio->flush ();
        }
 }
 
@@ -339,11 +341,15 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
                avcodec_flush_buffers (video_codec_context());
        }
 
-       /* XXX: should be flushing audio buffers? */
+       BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, ffmpeg_content()->ffmpeg_audio_streams()) {
+               avcodec_flush_buffers (i->stream(_format_context)->codec);
+       }
 
        if (subtitle_codec_context ()) {
                avcodec_flush_buffers (subtitle_codec_context ());
        }
+
+       _have_current_subtitle = false;
 }
 
 void
@@ -475,10 +481,18 @@ FFmpegDecoder::decode_subtitle_packet ()
                return;
        }
 
+       /* Stop any current subtitle, either at the time it was supposed to stop, or now if now is sooner */
+       if (_have_current_subtitle) {
+               if (_current_subtitle_to) {
+                       subtitle->emit_stop (min(*_current_subtitle_to, subtitle_period(sub).from + _pts_offset));
+               } else {
+                       subtitle->emit_stop (subtitle_period(sub).from + _pts_offset);
+               }
+               _have_current_subtitle = false;
+       }
+
        if (sub.num_rects <= 0) {
-               /* Sometimes we get an empty AVSubtitle, which is used by some codecs to
-                  indicate that the previous subtitle should stop.  We can ignore it here.
-               */
+               /* Nothing new in this subtitle */
                return;
        }
 
@@ -486,13 +500,12 @@ FFmpegDecoder::decode_subtitle_packet ()
           source that we may have chopped off for the DCP).
        */
        FFmpegSubtitlePeriod sub_period = subtitle_period (sub);
-       ContentTimePeriod period;
-       period.from = sub_period.from + _pts_offset;
-       /* We can't trust the `to' time from sub_period as there are some decoders which
-          give a sub_period time for `to' which is subsequently overridden by a `stop' subtitle;
-          see also FFmpegExaminer.
-       */
-       period.to = ffmpeg_content()->subtitle_stream()->find_subtitle_to (subtitle_id (sub));
+       ContentTime from;
+       from = sub_period.from + _pts_offset;
+       _have_current_subtitle = true;
+       if (sub_period.to) {
+               _current_subtitle_to = *sub_period.to + _pts_offset;
+       }
 
        for (unsigned int i = 0; i < sub.num_rects; ++i) {
                AVSubtitleRect const * rect = sub.rects[i];
@@ -501,13 +514,13 @@ FFmpegDecoder::decode_subtitle_packet ()
                case SUBTITLE_NONE:
                        break;
                case SUBTITLE_BITMAP:
-                       decode_bitmap_subtitle (rect, period);
+                       decode_bitmap_subtitle (rect, from);
                        break;
                case SUBTITLE_TEXT:
                        cout << "XXX: SUBTITLE_TEXT " << rect->text << "\n";
                        break;
                case SUBTITLE_ASS:
-                       decode_ass_subtitle (rect->ass, period);
+                       decode_ass_subtitle (rect->ass, from);
                        break;
                }
        }
@@ -516,7 +529,7 @@ FFmpegDecoder::decode_subtitle_packet ()
 }
 
 void
-FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period)
+FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime from)
 {
        /* Note RGBA is expressed little-endian, so the first byte in the word is R, second
           G, third B, fourth A.
@@ -585,11 +598,11 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP
                static_cast<double> (rect->h) / target_height
                );
 
-       subtitle->emit_image (period, image, scaled_rect);
+       subtitle->emit_image_start (from, image, scaled_rect);
 }
 
 void
-FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period)
+FFmpegDecoder::decode_ass_subtitle (string ass, ContentTime from)
 {
        /* We have no styles and no Format: line, so I'm assuming that FFmpeg
           produces a single format of Dialogue: lines...
@@ -605,6 +618,6 @@ FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period)
        list<sub::RawSubtitle> raw = sub::SSAReader::parse_line (base, bits[9]);
 
        BOOST_FOREACH (sub::Subtitle const & i, sub::collect<list<sub::Subtitle> > (raw)) {
-               subtitle->emit_text (period, i);
+               subtitle->emit_text_start (from, i);
        }
 }