X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=1c85ca09088b5547f386ca1c7bb5c874ab564225;hb=59404039618db5d70a2f8fc0cb8c49ae4f8ce527;hp=75e507d4d799a7cfc24be6224bdaca26099c7eed;hpb=f861018389acd9d277fe34d7621182b9b54f977f;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 75e507d4d..1c85ca090 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -21,29 +21,33 @@
 #define DCPOMATIC_VIDEO_CONTENT_H
 
 #include "content.h"
-#include "util.h"
 
-class VideoDecoder;
+class VideoExaminer;
+class Ratio;
 
 class VideoContentProperty
 {
 public:
-	static int const VIDEO_LENGTH;
 	static int const VIDEO_SIZE;
 	static int const VIDEO_FRAME_RATE;
+	static int const VIDEO_CROP;
+	static int const VIDEO_RATIO;
 };
 
 class VideoContent : public virtual Content
 {
 public:
-	VideoContent (boost::filesystem::path);
-	VideoContent (boost::shared_ptr<const cxml::Node>);
-	VideoContent (VideoContent const &);
+	typedef int Frame;
+
+	VideoContent (boost::shared_ptr<const Film>, Time, VideoContent::Frame);
+	VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
+	VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
 
 	void as_xml (xmlpp::Node *) const;
 	virtual std::string information () const;
+	virtual std::string identifier () const;
 
-	ContentVideoFrame video_length () const {
+	VideoContent::Frame video_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_length;
 	}
@@ -58,14 +62,38 @@ public:
 		return _video_frame_rate;
 	}
 
+	void set_left_crop (int);
+	void set_right_crop (int);
+	void set_top_crop (int);
+	void set_bottom_crop (int);
+
+	Crop crop () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _crop;
+	}
+
+	void set_ratio (Ratio const *);
+
+	Ratio const * ratio () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _ratio;
+	}
+
 protected:
-	void take_from_video_decoder (boost::shared_ptr<VideoDecoder>);
+	void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
-	ContentVideoFrame _video_length;
+	VideoContent::Frame _video_length;
 
 private:
+	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;
+	
 	libdcp::Size _video_size;
 	float _video_frame_rate;
+	Crop _crop;
+	Ratio const * _ratio;
 };
 
 #endif