X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=def824feb042d73f78282bf0466fafe67a86b9e7;hb=67ff55886b1ee86d99c2ea27d10c73b85b0504b7;hp=dfe1f26940c59d6477f96bfb217dd0db01d3681c;hpb=97d39f46795af78b84d5f7bc9118a188f2864781;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index dfe1f2694..def824feb 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>
 
@@ -36,6 +35,7 @@ class Log;
 class VideoFilterGraph;
 class FFmpegAudioStream;
 class AudioBuffers;
+class Image;
 struct ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
@@ -44,36 +44,45 @@ struct ffmpeg_pts_offset_test;
 class FFmpegDecoder : public FFmpeg, public Decoder
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
+	FFmpegDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const FFmpegContent>, bool fast);
+
+	bool pass () override;
+	void seek (dcpomatic::ContentTime time, bool) override;
 
 private:
 	friend struct ::ffmpeg_pts_offset_test;
 
-	bool pass (PassReason, bool accurate);
-	void seek (ContentTime time, bool);
-	void flush ();
-	void update_position (ContentTime p);
+	bool flush ();
 
-	AVSampleFormat audio_sample_format (boost::shared_ptr<FFmpegAudioStream> stream) const;
-	int bytes_per_audio_sample (boost::shared_ptr<FFmpegAudioStream> stream) const;
+	static std::shared_ptr<AudioBuffers> deinterleave_audio (AVFrame* frame);
 
-	bool decode_video_packet ();
-	void decode_audio_packet ();
-	void decode_subtitle_packet ();
+	AVSampleFormat audio_sample_format (std::shared_ptr<FFmpegAudioStream> stream) const;
+	int bytes_per_audio_sample (std::shared_ptr<FFmpegAudioStream> stream) const;
 
-	void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period);
-	void decode_ass_subtitle (std::string ass, ContentTimePeriod period);
+	std::shared_ptr<FFmpegAudioStream> audio_stream_from_index (int index) const;
+	void process_audio_frame (std::shared_ptr<FFmpegAudioStream> stream);
 
-	void maybe_add_subtitle ();
-	boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream) const;
+	bool decode_and_process_video_packet (AVPacket* packet);
+	void decode_and_process_audio_packet (AVPacket* packet);
+	void decode_and_process_subtitle_packet (AVPacket* packet);
 
-	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
-	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) 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::list<boost::shared_ptr<VideoFilterGraph> > _filter_graphs;
+	std::list<std::shared_ptr<VideoFilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;
 
-	ContentTime _pts_offset;
+	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 = false;
+
+	/** number of errors from avcodec_send_packet to ignore */
+	int _errors_to_ignore = 0;
+
+	std::shared_ptr<Image> _black_image;
+
+	std::map<std::shared_ptr<FFmpegAudioStream>, boost::optional<dcpomatic::ContentTime>> _next_time;
 };