X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=174cc39954b9fccc92153ea249cfc421e4458e80;hb=8102046b2f29e0c7b234c29bf204b056cb30e64f;hp=59ec7573d1691b2d524f872f76e99ff557d8a6f1;hpb=b5828ccf20a0e0c4365854ac19a05d5a4783e254;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 59ec7573d..6006fc08d 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,77 +25,59 @@
 #include <string>
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp>
+#include <boost/thread/mutex.hpp>
 extern "C" {
 #include <libavcodec/avcodec.h>
-#include <libpostproc/postprocess.h>
 }
 #include "util.h"
 #include "decoder.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "subtitle_decoder.h"
+#include "ffmpeg.h"
 
-struct AVFilterGraph;
-struct AVCodecContext;
-struct AVFilterContext;
-struct AVFormatContext;
-struct AVFrame;
-struct AVBufferContext;
-struct AVCodec;
-class Job;
-class FilmState;
-class Options;
-class Image;
 class Log;
+class FilterGraph;
+class ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
  */
-class FFmpegDecoder : public Decoder
+class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
+	FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
 	~FFmpegDecoder ();
 
-	/* Methods to query our input video */
-	int length_in_frames () const;
-	int decoding_frames () const;
-	float frames_per_second () const;
-	Size native_size () const;
-	int audio_channels () const;
-	int audio_sample_rate () const;
-	AVSampleFormat audio_sample_format () const;
-	int64_t audio_channel_layout () const;
-	bool has_subtitles () const;
-
 private:
+	friend class ::ffmpeg_pts_offset_test;
 
-	bool do_pass ();
-	PixelFormat pixel_format () const;
-	int time_base_numerator () const;
-	int time_base_denominator () const;
-	int sample_aspect_ratio_numerator () const;
-	int sample_aspect_ratio_denominator () const;
-	void overlay (boost::shared_ptr<Image> image) const;
+	void seek (ContentTime time, bool);
+	bool pass ();
+	void flush ();
+
+	AVSampleFormat audio_sample_format () const;
+	int bytes_per_audio_sample () const;
 
-	void setup_general ();
-	void setup_video ();
-	void setup_audio ();
-	void setup_subtitle ();
+	bool decode_video_packet ();
+	void decode_audio_packet ();
+	void decode_subtitle_packet ();
 
 	void maybe_add_subtitle ();
+	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-	AVFormatContext* _format_context;
-	int _video_stream;
-	int _audio_stream; ///< may be < 0 if there is no audio
-	int _subtitle_stream; ///< may be < 0 if there is no subtitle
-	AVFrame* _frame;
-	
-	AVCodecContext* _video_codec_context;
-	AVCodec* _video_codec;
-	AVCodecContext* _audio_codec_context;    ///< may be 0 if there is no audio
-	AVCodec* _audio_codec;                   ///< may be 0 if there is no audio
+	bool seek_overrun_finished (ContentTime, boost::optional<ContentTime>, boost::optional<ContentTime>) const;
+	bool seek_final_finished (int, int) const;
+	int minimal_run (boost::function<bool (boost::optional<ContentTime>, boost::optional<ContentTime>, int)>);
+	void seek_and_flush (ContentTime);
+
+	boost::shared_ptr<Log> _log;
 	AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
-	AVCodec* _subtitle_codec;                ///< may be 0 if there is no subtitle
+	AVCodec* _subtitle_codec;		 ///< may be 0 if there is no subtitle
+	
+	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
+	boost::mutex _filter_graphs_mutex;
 
-	AVPacket _packet;
-	AVSubtitle _subtitle;
-	bool _have_subtitle;
+	ContentTime _pts_offset;
 };