X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fvideo_content.h;h=d673d53728b6bc1d363cddc018ba11ed3bbf7713;hb=1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33;hp=44f1c28472c08cc1885a4c021a723b9a6a31bc2b;hpb=a183c1776cfd020a37d028ebb0f641352f49697b;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 44f1c2847..d673d5372 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -21,9 +21,9 @@
 #define DCPOMATIC_VIDEO_CONTENT_H
 
 #include "content.h"
-#include "util.h"
+#include "colour_conversion.h"
 
-class VideoDecoder;
+class VideoExaminer;
 class Ratio;
 
 class VideoContentProperty
@@ -31,27 +31,34 @@ class VideoContentProperty
 public:
 	static int const VIDEO_SIZE;
 	static int const VIDEO_FRAME_RATE;
+	static int const VIDEO_FRAME_TYPE;
 	static int const VIDEO_CROP;
 	static int const VIDEO_RATIO;
+	static int const COLOUR_CONVERSION;
 };
 
 class VideoContent : public virtual Content
 {
 public:
-	VideoContent (boost::shared_ptr<const Film>, Time, ContentVideoFrame);
+	typedef int Frame;
+
+	VideoContent (boost::shared_ptr<const Film>);
+	VideoContent (boost::shared_ptr<const Film>, DCPTime, ContentTime);
 	VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
 	VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
-	VideoContent (VideoContent const &);
+	VideoContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
 	void as_xml (xmlpp::Node *) const;
+	std::string technical_summary () const;
 	virtual std::string information () const;
+	virtual std::string identifier () const;
 
-	ContentVideoFrame video_length () const {
+	ContentTime video_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_length;
 	}
 
-	libdcp::Size video_size () const {
+	dcp::Size video_size () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_size;
 	}
@@ -61,34 +68,82 @@ public:
 		return _video_frame_rate;
 	}
 
-	void set_crop (Crop);
+	void set_video_frame_type (VideoFrameType);
+
 	void set_left_crop (int);
 	void set_right_crop (int);
 	void set_top_crop (int);
 	void set_bottom_crop (int);
 
+	void set_colour_conversion (ColourConversion);
+
+	VideoFrameType video_frame_type () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _video_frame_type;
+	}
+
 	Crop crop () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _crop;
 	}
 
+	int left_crop () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _crop.left;
+	}
+
+	int right_crop () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _crop.right;
+	}
+
+	int top_crop () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _crop.top;
+	}
+
+	int bottom_crop () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _crop.bottom;
+	}
+	
 	void set_ratio (Ratio const *);
 
+	/** @return ratio to scale to, or 0 if the content's own ratio should be preserved. */
 	Ratio const * ratio () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _ratio;
 	}
 
+	ColourConversion colour_conversion () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _colour_conversion;
+	}
+
+	dcp::Size video_size_after_3d_split () const;
+	dcp::Size video_size_after_crop () const;
+
+	ContentTime dcp_time_to_content_time (DCPTime) const;
+
 protected:
-	void take_from_video_decoder (boost::shared_ptr<VideoDecoder>);
+	void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
-	ContentVideoFrame _video_length;
+	ContentTime _video_length;
+	float _video_frame_rate;
 
 private:
-	libdcp::Size _video_size;
-	float _video_frame_rate;
+	friend class ffmpeg_pts_offset_test;
+	friend class best_dcp_frame_rate_test_single;
+	friend class best_dcp_frame_rate_test_double;
+	friend class audio_sampling_rate_test;
+
+	void setup_default_colour_conversion ();
+	
+	dcp::Size _video_size;
+	VideoFrameType _video_frame_type;
 	Crop _crop;
 	Ratio const * _ratio;
+	ColourConversion _colour_conversion;
 };
 
 #endif