X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=5475be6122da98b51c4bb8414a837af46d0be087;hb=c658aec3ffd5009cbe7fa2540da5a0579e2f2e8c;hp=fc46d046aa042f5feb0431ce07945656d3fad0d3;hpb=f732863e89207dfefeada9fa889a8bea65702e2a;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index fc46d046a..5475be612 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
@@ -21,25 +21,22 @@
  *  @brief A decoder using FFmpeg to decode content.
  */
 
-#include <vector>
-#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 "util.h"
-#include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "subtitle_decoder.h"
 #include "ffmpeg.h"
+extern "C" {
+#include <libavcodec/avcodec.h>
+}
+#include <boost/shared_ptr.hpp>
+#include <boost/thread/mutex.hpp>
+#include <stdint.h>
 
-class Film;
+class Log;
 class FilterGraph;
-class ffmpeg_pts_offset_test;
+class FFmpegAudioStream;
+struct ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
@@ -47,42 +44,34 @@ class ffmpeg_pts_offset_test;
 class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio);
-	~FFmpegDecoder ();
-
-	void pass ();
-	void seek (VideoContent::Frame, bool);
-	bool done () const;
+	FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>, bool fast);
 
 private:
-	friend class ::ffmpeg_pts_offset_test;
-
-	static double compute_pts_offset (double, double, float);
+	friend struct ::ffmpeg_pts_offset_test;
 
+	bool pass ();
+	void seek (ContentTime time, bool);
 	void flush ();
 
-	void setup_subtitle ();
-
-	AVSampleFormat audio_sample_format () const;
-	int bytes_per_audio_sample () const;
+	AVSampleFormat audio_sample_format (boost::shared_ptr<FFmpegAudioStream> stream) const;
+	int bytes_per_audio_sample (boost::shared_ptr<FFmpegAudioStream> stream) const;
 
 	bool decode_video_packet ();
 	void decode_audio_packet ();
 	void decode_subtitle_packet ();
 
+	void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period);
+
 	void maybe_add_subtitle ();
-	boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
+	boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream, uint8_t** data, int size);
+
+	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
+
+	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
-	
 	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;
 
-	bool _decode_video;
-	bool _decode_audio;
-
-	/** Offset to add to FFmpeg frame timestamps to get our position (in seconds) */
-	double _pts_offset;
-	bool _just_sought;
+	ContentTime _pts_offset;
 };