Tidy up and do flushing more correctly.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 7a1fa40d249bff6d96746d08e6f2811f2f5517e8..e18d5e8eb34b650e39af633af79aa8da850227f4 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -52,20 +52,21 @@ public:
 private:
        friend struct ::ffmpeg_pts_offset_test;
 
-       void flush ();
+       bool flush ();
 
        AVSampleFormat audio_sample_format (std::shared_ptr<FFmpegAudioStream> stream) const;
        int bytes_per_audio_sample (std::shared_ptr<FFmpegAudioStream> stream) const;
 
        std::shared_ptr<FFmpegAudioStream> audio_stream_from_index (int index) const;
-       void process_audio_frame (std::shared_ptr<FFmpegAudioStream> stream, int stream_index, int64_t packet_pts);
+       std::pair<int, bool> decode_audio_packet (std::shared_ptr<FFmpegAudioStream> stream, AVPacket* packet);
+       void process_audio_frame (std::shared_ptr<FFmpegAudioStream> stream);
 
-       bool decode_video_packet ();
-       void decode_audio_packet ();
-       void decode_subtitle_packet ();
+       bool decode_and_process_video_packet (AVPacket* packet);
+       void decode_and_process_audio_packet (AVPacket* packet);
+       void decode_and_process_subtitle_packet (AVPacket* packet);
 
-       void decode_bitmap_subtitle (AVSubtitleRect const * rect, dcpomatic::ContentTime from);
-       void decode_ass_subtitle (std::string ass, dcpomatic::ContentTime from);
+       void process_bitmap_subtitle (AVSubtitleRect const * rect, dcpomatic::ContentTime from);
+       void process_ass_subtitle (std::string ass, dcpomatic::ContentTime from);
 
        void maybe_add_subtitle ();
        std::shared_ptr<AudioBuffers> deinterleave_audio (std::shared_ptr<FFmpegAudioStream> stream) const;
@@ -80,5 +81,5 @@ private:
 
        std::shared_ptr<Image> _black_image;
 
-       std::vector<boost::optional<dcpomatic::ContentTime> > _next_time;
+       std::map<std::shared_ptr<FFmpegAudioStream>, boost::optional<dcpomatic::ContentTime>> _next_time;
 };