X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=fdd27498514e5cc95af219b059db0c6b812c63d6;hb=4a4725e41bf4070969223f9c40885063c50e61d0;hp=b3c81d9c3eb807bbc3866d384141ce26f1aaff47;hpb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index b3c81d9c3..fdd274985 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -36,35 +36,36 @@ public:
 	static int const VIDEO_CROP;
 	static int const VIDEO_SCALE;
 	static int const COLOUR_CONVERSION;
+	static int const VIDEO_FADE_IN;
+	static int const VIDEO_FADE_OUT;
 };
 
 class VideoContent : public virtual Content
 {
 public:
-	typedef int Frame;
-
 	VideoContent (boost::shared_ptr<const Film>);
-	VideoContent (boost::shared_ptr<const Film>, DCPTime, ContentTime);
+	VideoContent (boost::shared_ptr<const Film>, DCPTime, Frame);
 	VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
 	VideoContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
 	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;
 
-	ContentTime video_length () const {
+	virtual void set_default_colour_conversion ();
+
+	Frame video_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_length;
 	}
 
-	ContentTime video_length_after_3d_combine () const {
+	Frame video_length_after_3d_combine () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
-			return ContentTime (_video_length.get() / 2);
+			return _video_length / 2;
 		}
-		
+
 		return _video_length;
 	}
 
@@ -72,14 +73,14 @@ public:
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_size;
 	}
-	
-	float video_frame_rate () const {
+
+	double video_frame_rate () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_frame_rate;
 	}
 
 	void set_video_frame_type (VideoFrameType);
-	void set_video_frame_rate (float);
+	void set_video_frame_rate (double);
 
 	void set_left_crop (int);
 	void set_right_crop (int);
@@ -87,8 +88,12 @@ public:
 	void set_bottom_crop (int);
 
 	void set_scale (VideoContentScale);
+	void unset_colour_conversion (bool signal = true);
 	void set_colour_conversion (ColourConversion);
-	
+
+	void set_fade_in (Frame);
+	void set_fade_out (Frame);
+
 	VideoFrameType video_frame_type () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_frame_type;
@@ -125,24 +130,45 @@ public:
 		return _scale;
 	}
 
-	ColourConversion colour_conversion () const {
+	boost::optional<ColourConversion> colour_conversion () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _colour_conversion;
 	}
 
+	boost::optional<double> sample_aspect_ratio () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _sample_aspect_ratio;
+	}
+
+	Frame fade_in () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _fade_in;
+	}
+
+	Frame fade_out () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _fade_out;
+	}
+
 	dcp::Size video_size_after_3d_split () const;
 	dcp::Size video_size_after_crop () const;
 
 	ContentTime dcp_time_to_content_time (DCPTime) const;
 
+	boost::optional<double> fade (Frame) const;
+
 	void scale_and_crop_to_fit_width ();
 	void scale_and_crop_to_fit_height ();
 
+	std::string processing_description () const;
+
 protected:
 	void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
+	void add_properties (std::list<std::pair<std::string, std::string> > &) const;
 
-	ContentTime _video_length;
-	float _video_frame_rate;
+	Frame _video_length;
+	double _video_frame_rate;
+	boost::optional<ColourConversion> _colour_conversion;
 
 private:
 	friend struct ffmpeg_pts_offset_test;
@@ -151,12 +177,17 @@ private:
 	friend struct audio_sampling_rate_test;
 
 	void setup_default_colour_conversion ();
-	
+
 	dcp::Size _video_size;
 	VideoFrameType _video_frame_type;
 	Crop _crop;
 	VideoContentScale _scale;
-	ColourConversion _colour_conversion;
+	/** Sample aspect ratio obtained from the content file's header,
+	    if there is one.
+	*/
+	boost::optional<double> _sample_aspect_ratio;
+	Frame _fade_in;
+	Frame _fade_out;
 };
 
 #endif