1 files changed, 37 insertions, 42 deletions

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 0c89b973d..f3f6b126b 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -1,3 +1,5 @@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
@@ -36,6 +38,7 @@ extern "C" {
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "film.h"
+#include "ffmpeg_content.h"
 
 struct AVFilterGraph;
 struct AVCodecContext;
@@ -50,76 +53,53 @@ class Options;
 class Image;
 class Log;
 
-class FFmpegAudioStream : public AudioStream
-{
-public:
-	FFmpegAudioStream (std::string n, int i, int s, int64_t c)
-		: AudioStream (s, c)
-		, _name (n)
-		, _id (i)
-	{}
-
-	std::string to_string () const;
-
-	std::string name () const {
-		return _name;
-	}
-
-	int id () const {
-		return _id;
-	}
-
-	static boost::shared_ptr<FFmpegAudioStream> create (std::string t, boost::optional<int> v);
-
-private:
-	friend class stream_test;
-	
-	FFmpegAudioStream (std::string t, boost::optional<int> v);
-	
-	std::string _name;
-	int _id;
-};
-
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
  */
 class FFmpegDecoder : public VideoDecoder, public AudioDecoder
 {
 public:
-	FFmpegDecoder (boost::shared_ptr<Film>, DecodeOptions);
+	FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio, bool subtitles);
 	~FFmpegDecoder ();
 
-	float frames_per_second () const;
+	float video_frame_rate () const;
 	libdcp::Size native_size () const;
-	SourceFrame length () const;
+	ContentVideoFrame video_length () const;
 	int time_base_numerator () const;
 	int time_base_denominator () const;
 	int sample_aspect_ratio_numerator () const;
 	int sample_aspect_ratio_denominator () const;
 
-	void set_audio_stream (boost::shared_ptr<AudioStream>);
-	void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
+	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
+		return _subtitle_streams;
+	}
+	
+	std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams () const {
+		return _audio_streams;
+	}
 
 	bool seek (double);
-	bool seek_to_last ();
-	void seek_forward ();
-	void seek_back ();
+	bool seek_forward ();
+	bool seek_back ();
+	bool pass ();
 
 private:
 
-	bool pass ();
-	bool do_seek (double p, bool, bool);
+	/* No copy construction */
+	FFmpegDecoder (FFmpegDecoder const &);
+	FFmpegDecoder& operator= (FFmpegDecoder const &);
+
 	PixelFormat pixel_format () const;
 	AVSampleFormat audio_sample_format () const;
 	int bytes_per_audio_sample () const;
-
-	void filter_and_emit_video ();
+	bool do_seek (double, bool, bool);
 
 	void setup_general ();
 	void setup_video ();
 	void setup_audio ();
 	void setup_subtitle ();
 
+	bool decode_video_packet ();
 	void decode_audio_packet ();
 
 	void maybe_add_subtitle ();
@@ -129,6 +109,8 @@ private:
 
 	std::string stream_name (AVStream* s) const;
 
+	boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
+
 	AVFormatContext* _format_context;
 	int _video_stream;
 	
@@ -145,4 +127,17 @@ private:
 
 	std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
 	boost::mutex _filter_graphs_mutex;
+
+        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
+        std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
+
+	bool _decode_video;
+	bool _decode_audio;
+	bool _decode_subtitles;
+
+	/* It would appear (though not completely verified) that one must have
+	   a mutex around calls to avcodec_open* and avcodec_close... and here
+	   it is.
+	*/
+	static boost::mutex _mutex;
 };