X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=abc9c5fa3e8db454c803b6de462eba4a809c56ef;hb=387304bc9147933b68eda2b38ba8cac0d250e87e;hp=96572bbd9adff2dbfc22c233e67bf49c48ba4b47;hpb=1629bd7df2150156109afbc7a16677cb29e82adf;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 96572bbd9..abc9c5fa3 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 
 #include "content.h"
 #include "colour_conversion.h"
+#include "video_content_scale.h"
 
 class VideoExaminer;
 class Ratio;
@@ -33,28 +34,38 @@ public:
 	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 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, VideoFrame);
+	VideoContent (boost::shared_ptr<const Film>, DCPTime, Frame);
 	VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
+	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;
 
-	VideoFrame video_length () const {
+	virtual void set_default_colour_conversion ();
+	
+	Frame video_length () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _video_length;
+	}
+
+	Frame video_length_after_3d_combine () const {
 		boost::mutex::scoped_lock lm (_mutex);
+		if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
+			return _video_length / 2;
+		}
+		
 		return _video_length;
 	}
 
@@ -69,14 +80,20 @@ public:
 	}
 
 	void set_video_frame_type (VideoFrameType);
+	void set_video_frame_rate (float);
 
 	void set_left_crop (int);
 	void set_right_crop (int);
 	void set_top_crop (int);
 	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;
@@ -106,44 +123,70 @@ public:
 		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 {
+	/** @return Description of how to scale this content (if indeed it should be scaled) */
+	VideoContentScale scale () const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return _ratio;
+		return _scale;
 	}
 
-	ColourConversion colour_conversion () const {
+	boost::optional<ColourConversion> colour_conversion () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _colour_conversion;
 	}
 
+	boost::optional<float> 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;
 
-	VideoFrame time_to_content_video_frames (DCPTime) const;
+	ContentTime dcp_time_to_content_time (DCPTime) const;
+
+	boost::optional<float> 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>);
 
-	VideoFrame _video_length;
+	Frame _video_length;
 	float _video_frame_rate;
+	boost::optional<ColourConversion> _colour_conversion;
 
 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;
+	friend struct ffmpeg_pts_offset_test;
+	friend struct best_dcp_frame_rate_test_single;
+	friend struct best_dcp_frame_rate_test_double;
+	friend struct 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;
+	VideoContentScale _scale;
+	/** Sample aspect ratio obtained from the content file's header,
+	    if there is one.
+	*/
+	boost::optional<float> _sample_aspect_ratio;
+	Frame _fade_in;
+	Frame _fade_out;
 };
 
 #endif