X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=ce2476fb03b5bf6e1903ffe0de43c6cc33394b8e;hb=59209af1e2d73334ff7dfe6c7da465293dc24c0b;hp=65f36a00461b9115ca67fea8e7ee60c60a944ef8;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 65f36a004..ce2476fb0 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -18,65 +18,75 @@
 
 */
 
+
 /** @file  src/ffmpeg_decoder.h
  *  @brief A decoder using FFmpeg to decode content.
  */
 
-#include "util.h"
+
+#include "bitmap_text.h"
 #include "decoder.h"
 #include "ffmpeg.h"
+#include "util.h"
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
-#include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <stdint.h>
 
-class Log;
-class VideoFilterGraph;
-class FFmpegAudioStream;
+
 class AudioBuffers;
+class FFmpegAudioStream;
 class Image;
+class Log;
+class VideoFilterGraph;
 struct ffmpeg_pts_offset_test;
 
+
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
  */
 class FFmpegDecoder : public FFmpeg, public Decoder
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const FFmpegContent>, bool fast);
+	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);
 
-	AVSampleFormat audio_sample_format (boost::shared_ptr<FFmpegAudioStream> stream) const;
-	int bytes_per_audio_sample (boost::shared_ptr<FFmpegAudioStream> stream) const;
+	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);
+	BitmapText process_bitmap_subtitle (AVSubtitleRect const * rect);
+	void process_ass_subtitle (std::string ass, dcpomatic::ContentTime from);
 
 	void maybe_add_subtitle ();
-	boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::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;
 
 	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<dcpomatic::ContentTime> > _next_time;
+	std::map<std::shared_ptr<FFmpegAudioStream>, boost::optional<dcpomatic::ContentTime>> _next_time;
 };