X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=7ff159b852b4cb69df4004b1f6a813ad2131e182;hb=8bef34f672815c3c9b4236d06fdee8dfd0bffbc2;hp=36c24c2b3353629614ada8999c0c1cb970b56674;hpb=46cd0fe7b5b514f0d9456b25f670679cc584a218;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 36c24c2b3..7ff159b85 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -23,68 +23,107 @@
 #include <boost/enable_shared_from_this.hpp>
 #include "video_content.h"
 #include "audio_content.h"
+#include "subtitle_content.h"
+#include "audio_mapping.h"
+
+struct AVFormatContext;
+struct AVStream;
 
 class Filter;
+class ffmpeg_pts_offset_test;
 
-class FFmpegAudioStream
+class FFmpegStream
 {
 public:
-        FFmpegAudioStream (std::string n, int i, int f, int c)
-                : name (n)
-                , id (i)
-                , frame_rate (f)
+	FFmpegStream (std::string n, int i)
+		: name (n)
+		, id (i)
+		, _legacy_id (false)
+	{}
+				
+	FFmpegStream (boost::shared_ptr<const cxml::Node>, int);
+
+	void as_xml (xmlpp::Node *) const;
+
+	/** @param c An AVFormatContext.
+	 *  @return Stream index within the AVFormatContext.
+	 */
+	int index (AVFormatContext const * c) const;
+	AVStream* stream (AVFormatContext const * c) const;
+
+	std::string name;
+	int id;
+	
+private:
+	/** If this is true, id is in fact the index */
+	bool _legacy_id;
+};
+
+class FFmpegAudioStream : public FFmpegStream
+{
+public:
+	FFmpegAudioStream (std::string n, int i, int f, int c)
+		: FFmpegStream (n, i)
+		, frame_rate (f)
 		, channels (c)
 		, mapping (c)
-        {}
+	{
+		mapping.make_default ();
+	}
 
-	FFmpegAudioStream (boost::shared_ptr<const cxml::Node>);
+	FFmpegAudioStream (boost::shared_ptr<const cxml::Node>, int);
 
 	void as_xml (xmlpp::Node *) const;
-	
-        std::string name;
-        int id;
-        int frame_rate;
+
+	int frame_rate;
 	int channels;
 	AudioMapping mapping;
-	boost::optional<Time> start;
+	boost::optional<double> first_audio;
+
+private:
+	friend class ffmpeg_pts_offset_test;
+
+	/* Constructor for tests */
+	FFmpegAudioStream ()
+		: FFmpegStream ("", 0)
+		, mapping (1)
+	{}
 };
 
 extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
+extern bool operator!= (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
 
-class FFmpegSubtitleStream
+class FFmpegSubtitleStream : public FFmpegStream
 {
 public:
-        FFmpegSubtitleStream (std::string n, int i)
-                : name (n)
-                , id (i)
-        {}
-        
-	FFmpegSubtitleStream (boost::shared_ptr<const cxml::Node>);
+	FFmpegSubtitleStream (std::string n, int i)
+		: FFmpegStream (n, i)
+	{}
+	
+	FFmpegSubtitleStream (boost::shared_ptr<const cxml::Node>, int);
 
 	void as_xml (xmlpp::Node *) const;
-	
-        std::string name;
-        int id;
 };
 
 extern bool operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b);
+extern bool operator!= (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b);
 
 class FFmpegContentProperty : public VideoContentProperty
 {
 public:
-        static int const SUBTITLE_STREAMS;
-        static int const SUBTITLE_STREAM;
-        static int const AUDIO_STREAMS;
-        static int const AUDIO_STREAM;
-        static int const FILTERS;
+	static int const SUBTITLE_STREAMS;
+	static int const SUBTITLE_STREAM;
+	static int const AUDIO_STREAMS;
+	static int const AUDIO_STREAM;
+	static int const FILTERS;
 };
 
-class FFmpegContent : public VideoContent, public AudioContent
+class FFmpegContent : public VideoContent, public AudioContent, public SubtitleContent
 {
 public:
 	FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	FFmpegContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
-	FFmpegContent (FFmpegContent const &);
+	FFmpegContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int version);
+	FFmpegContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
 	boost::shared_ptr<FFmpegContent> shared_from_this () {
 		return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
@@ -92,55 +131,64 @@ public:
 	
 	void examine (boost::shared_ptr<Job>);
 	std::string summary () const;
+	std::string technical_summary () const;
 	std::string information () const;
 	void as_xml (xmlpp::Node *) const;
-	boost::shared_ptr<Content> clone () const;
-	Time length () const;
-
-        /* AudioContent */
-        int audio_channels () const;
-        ContentAudioFrame audio_length () const;
-        int content_audio_frame_rate () const;
-        int output_audio_frame_rate () const;
+	Time full_length () const;
+
+	std::string identifier () const;
+	
+	/* AudioContent */
+	int audio_channels () const;
+	AudioContent::Frame audio_length () const;
+	int content_audio_frame_rate () const;
+	int output_audio_frame_rate () const;
 	AudioMapping audio_mapping () const;
 	void set_audio_mapping (AudioMapping);
 
 	void set_filters (std::vector<Filter const *> const &);
 	
-        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
-                boost::mutex::scoped_lock lm (_mutex);
-                return _subtitle_streams;
-        }
-
-        boost::shared_ptr<FFmpegSubtitleStream> subtitle_stream () const {
-                boost::mutex::scoped_lock lm (_mutex);
-                return _subtitle_stream;
-        }
-
-        std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams () const {
-                boost::mutex::scoped_lock lm (_mutex);
-                return _audio_streams;
-        }
-        
-        boost::shared_ptr<FFmpegAudioStream> audio_stream () const {
-                boost::mutex::scoped_lock lm (_mutex);
-                return _audio_stream;
-        }
+	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _subtitle_streams;
+	}
+
+	boost::shared_ptr<FFmpegSubtitleStream> subtitle_stream () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _subtitle_stream;
+	}
+
+	std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _audio_streams;
+	}
+	
+	boost::shared_ptr<FFmpegAudioStream> audio_stream () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _audio_stream;
+	}
 
 	std::vector<Filter const *> filters () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _filters;
 	}
 
-        void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
-        void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>);
-	
+	void set_subtitle_stream (boost::shared_ptr<FFmpegSubtitleStream>);
+	void set_audio_stream (boost::shared_ptr<FFmpegAudioStream>);
+
+	boost::optional<double> first_video () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _first_video;
+	}
+
 private:
+	friend class ffmpeg_pts_offset_test;
+	
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
 	boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
 	std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
 	boost::shared_ptr<FFmpegAudioStream> _audio_stream;
-	boost::optional<Time> _first_video;
+	boost::optional<double> _first_video;
 	/** Video filters that should be used when generating DCPs */
 	std::vector<Filter const *> _filters;
 };