X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=775cb92205c9f2b9a1660a3713d08c14ab5871f9;hb=9e1343fb30df204811e80bfd1387574b9d383a09;hp=c56dc0a61ecfdfb7cfe89cd854f97d1e637c2fc7;hpb=fff7a8232b18ce6191e60ba911c29b64b9063d4d;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index c56dc0a61..775cb9220 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -17,35 +17,49 @@
 
 */
 
-#ifndef DVDOMATIC_FFMPEG_CONTENT_H
-#define DVDOMATIC_FFMPEG_CONTENT_H
+#ifndef DCPOMATIC_FFMPEG_CONTENT_H
+#define DCPOMATIC_FFMPEG_CONTENT_H
 
 #include <boost/enable_shared_from_this.hpp>
 #include "video_content.h"
 #include "audio_content.h"
+#include "subtitle_content.h"
+#include "audio_mapping.h"
+
+class Filter;
+class ffmpeg_pts_offset_test;
 
 class FFmpegAudioStream
 {
 public:
-        FFmpegAudioStream (std::string n, int i, int f, int64_t c)
-                : name (n)
-                , id (i)
-                , frame_rate (f)
-                , channel_layout (c)
-        {}
+	FFmpegAudioStream (std::string n, int i, int f, int c)
+		: name (n)
+		, id (i)
+		, frame_rate (f)
+		, channels (c)
+		, mapping (c)
+	{
+		mapping.make_default ();
+	}
 
 	FFmpegAudioStream (boost::shared_ptr<const cxml::Node>);
 
 	void as_xml (xmlpp::Node *) const;
 	
-        int channels () const {
-                return av_get_channel_layout_nb_channels (channel_layout);
-        }
-        
-        std::string name;
-        int id;
-        int frame_rate;
-        int64_t channel_layout;
+	std::string name;
+	int id;
+	int frame_rate;
+	int channels;
+	AudioMapping mapping;
+	boost::optional<double> first_audio;
+
+private:
+	friend class ffmpeg_pts_offset_test;
+
+	/* Constructor for tests */
+	FFmpegAudioStream ()
+		: mapping (1)
+	{}
 };
 
 extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b);
@@ -53,17 +67,17 @@ extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b
 class FFmpegSubtitleStream
 {
 public:
-        FFmpegSubtitleStream (std::string n, int i)
-                : name (n)
-                , id (i)
-        {}
-        
+	FFmpegSubtitleStream (std::string n, int i)
+		: name (n)
+		, id (i)
+	{}
+	
 	FFmpegSubtitleStream (boost::shared_ptr<const cxml::Node>);
 
 	void as_xml (xmlpp::Node *) const;
 	
-        std::string name;
-        int id;
+	std::string name;
+	int id;
 };
 
 extern bool operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b);
@@ -71,56 +85,85 @@ extern bool operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream con
 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 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, public boost::enable_shared_from_this<FFmpegContent>
+class FFmpegContent : public VideoContent, public AudioContent, public SubtitleContent
 {
 public:
-	FFmpegContent (boost::filesystem::path);
-	FFmpegContent (boost::shared_ptr<const cxml::Node>);
+	FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
+	FFmpegContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
+
+	boost::shared_ptr<FFmpegContent> shared_from_this () {
+		return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
+	}
 	
-	void examine (boost::shared_ptr<Film>, boost::shared_ptr<Job>, bool);
+	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;
+	Time full_length () const;
 
-        /* AudioContent */
-        int audio_channels () const;
-        ContentAudioFrame audio_length () const;
-        int audio_frame_rate () const;
-        int64_t audio_channel_layout () 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<FFmpegSubtitleStream> subtitle_streams () const {
-                boost::mutex::scoped_lock lm (_mutex);
-                return _subtitle_streams;
-        }
-
-        boost::optional<FFmpegSubtitleStream> subtitle_stream () const {
-                boost::mutex::scoped_lock lm (_mutex);
-                return _subtitle_stream;
-        }
-
-        std::vector<FFmpegAudioStream> audio_streams () const {
-                boost::mutex::scoped_lock lm (_mutex);
-                return _audio_streams;
-        }
-        
-        boost::optional<FFmpegAudioStream> audio_stream () const {
-                boost::mutex::scoped_lock lm (_mutex);
-                return _audio_stream;
-        }
-
-        void set_subtitle_stream (FFmpegSubtitleStream);
-        void set_audio_stream (FFmpegAudioStream);
+	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>);
+
+	boost::optional<double> first_video () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _first_video;
+	}
 	
 private:
-	std::vector<FFmpegSubtitleStream> _subtitle_streams;
-	boost::optional<FFmpegSubtitleStream> _subtitle_stream;
-	std::vector<FFmpegAudioStream> _audio_streams;
-	boost::optional<FFmpegAudioStream> _audio_stream;
+	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<double> _first_video;
+	/** Video filters that should be used when generating DCPs */
+	std::vector<Filter const *> _filters;
 };
 
 #endif