X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.h;h=b3bc13e5cc222b9033472bfb43df8f3b70693fd7;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hp=c94b8d8ac22ae697db346eb33c25afedb9b83a2d;hpb=13b2b8f48f3f1a22277a760a7fada980b9f37677;p=dcpomatic.git

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index c94b8d8ac..b3bc13e5c 100644
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -20,30 +20,26 @@
 #ifndef DCPOMATIC_FFMPEG_H
 #define DCPOMATIC_FFMPEG_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
+#include "file_group.h"
+#include "ffmpeg_subtitle_period.h"
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
-#include "file_group.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/thread/mutex.hpp>
 
-struct AVFilterGraph;
-struct AVCodecContext;
-struct AVFilterContext;
 struct AVFormatContext;
 struct AVFrame;
-struct AVBufferContext;
-struct AVCodec;
-struct AVStream;
 struct AVIOContext;
 
 class FFmpegContent;
+class FFmpegAudioStream;
+class Log;
 
 class FFmpeg
 {
 public:
-	FFmpeg (boost::shared_ptr<const FFmpegContent>, bool);
+	FFmpeg (boost::shared_ptr<const FFmpegContent>);
 	virtual ~FFmpeg ();
 
 	boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
@@ -52,23 +48,28 @@ public:
 
 	int avio_read (uint8_t *, int);
 	int64_t avio_seek (int64_t, int);
-	int64_t avio_length ();
 
 protected:
 	AVCodecContext* video_codec_context () const;
-	AVCodecContext* audio_codec_context () const;
-	
+	AVCodecContext* subtitle_codec_context () const;
+	ContentTime pts_offset (
+		std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<ContentTime> first_video, double video_frame_rate
+		) const;
+
+	static FFmpegSubtitlePeriod subtitle_period (AVSubtitle const &);
+
 	boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
 
 	uint8_t* _avio_buffer;
 	int _avio_buffer_size;
 	AVIOContext* _avio_context;
 	FileGroup _file_group;
-	
+
 	AVFormatContext* _format_context;
 	AVPacket _packet;
 	AVFrame* _frame;
-	
+
+	/** Index of video stream within AVFormatContext */
 	int _video_stream;
 
 	/* It would appear (though not completely verified) that one must have
@@ -78,9 +79,11 @@ protected:
 	static boost::mutex _mutex;
 
 private:
-	void setup_general (bool);
-	void setup_video ();
-	void setup_audio ();
+	void setup_general ();
+	void setup_decoders ();
+
+	static void ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl);
+	static boost::weak_ptr<Log> _ffmpeg_log;
 };
 
 #endif