X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=d19a9f703bccba457196c5ef288665e009838335;hb=39fb8198febde1937019db1c300ec363aab5aa56;hp=16a55d5589139d56c3555b2c3a3f7b1f11a8760d;hpb=8ca6fd6d97e6d42492afddb655fa85130946853c;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 16a55d558..d19a9f703 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -28,7 +28,6 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
-#include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <stdint.h>
 
@@ -45,40 +44,42 @@ struct ffmpeg_pts_offset_test;
 class FFmpegDecoder : public FFmpeg, public Decoder
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log> log, bool fast);
+	FFmpegDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const FFmpegContent>, bool fast);
 
-	bool pass ();
-	void seek (ContentTime time, bool);
+	bool pass () override;
+	void seek (dcpomatic::ContentTime time, bool) override;
 
 private:
 	friend struct ::ffmpeg_pts_offset_test;
 
-	void flush ();
+	bool flush ();
 
-	AVSampleFormat audio_sample_format (boost::shared_ptr<FFmpegAudioStream> stream) const;
-	int bytes_per_audio_sample (boost::shared_ptr<FFmpegAudioStream> stream) const;
+	AVSampleFormat audio_sample_format (std::shared_ptr<FFmpegAudioStream> stream) const;
+	int bytes_per_audio_sample (std::shared_ptr<FFmpegAudioStream> stream) const;
 
-	bool decode_video_packet ();
-	void decode_audio_packet ();
-	void decode_subtitle_packet ();
+	std::shared_ptr<FFmpegAudioStream> audio_stream_from_index (int index) const;
+	std::pair<int, bool> decode_audio_packet (std::shared_ptr<FFmpegAudioStream> stream, AVPacket* packet);
+	void process_audio_frame (std::shared_ptr<FFmpegAudioStream> stream);
 
-	void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime from);
-	void decode_ass_subtitle (std::string ass, ContentTime from);
+	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 maybe_add_subtitle ();
-	boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream) const;
+	void process_bitmap_subtitle (AVSubtitleRect const * rect, dcpomatic::ContentTime from);
+	void process_ass_subtitle (std::string ass, dcpomatic::ContentTime from);
 
-	boost::shared_ptr<Log> _log;
+	void maybe_add_subtitle ();
+	std::shared_ptr<AudioBuffers> deinterleave_audio (std::shared_ptr<FFmpegAudioStream> stream) const;
 
-	std::list<boost::shared_ptr<VideoFilterGraph> > _filter_graphs;
+	std::list<std::shared_ptr<VideoFilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;
 
-	ContentTime _pts_offset;
-	boost::optional<ContentTime> _current_subtitle_to;
+	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;
 
-	boost::shared_ptr<Image> _black_image;
+	std::shared_ptr<Image> _black_image;
 
-	std::vector<boost::optional<ContentTime> > _next_time;
+	std::map<std::shared_ptr<FFmpegAudioStream>, boost::optional<dcpomatic::ContentTime>> _next_time;
 };