X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=29e0d22e6339d6bc957c8f9a9552805c468bdd16;hp=7a1fa40d249bff6d96746d08e6f2811f2f5517e8;hb=84039db657c3cc72719706a136c90741170c765a;hpb=6c092a6abef4bf38fe62112544f7b6247cdb07d0

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 7a1fa40d2..29e0d22e6 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -46,29 +46,32 @@ class FFmpegDecoder : public FFmpeg, public Decoder
 public:
 	FFmpegDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const FFmpegContent>, bool fast);
 
-	bool pass ();
-	void seek (dcpomatic::ContentTime time, bool);
+	bool pass () override;
+	void seek (dcpomatic::ContentTime time, bool) override;
 
 private:
 	friend struct ::ffmpeg_pts_offset_test;
 
-	void flush ();
+	bool flush ();
+
+	static std::shared_ptr<AudioBuffers> deinterleave_audio (AVFrame* frame);
 
 	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);
+	void process_audio_frame (std::shared_ptr<FFmpegAudioStream> stream);
+
+	void process_video_frame ();
 
-	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;
 
 	std::list<std::shared_ptr<VideoFilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;
@@ -76,9 +79,9 @@ private:
 	dcpomatic::ContentTime _pts_offset;
 	boost::optional<dcpomatic::ContentTime> _current_subtitle_to;
 	/** true if we have a subtitle which has not had emit_stop called for it yet */
-	bool _have_current_subtitle;
+	bool _have_current_subtitle = false;
 
 	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;
 };