X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=b3c81d9c3eb807bbc3866d384141ce26f1aaff47;hb=946dbad9821e676f1d8fdc5abba459da54b8e84c;hp=f008143fa2a7460aa6b37abc09e1b7fd9269b1e6;hpb=097a1fb413bbbb89182161d4c1a31daa5419ec96;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index f008143fa..b3c81d9c3 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,7 +34,7 @@ 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;
 };
 
@@ -43,9 +44,9 @@ public:
 	typedef int Frame;
 
 	VideoContent (boost::shared_ptr<const Film>);
-	VideoContent (boost::shared_ptr<const Film>, DCPTime, VideoContent::Frame);
+	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 (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;
@@ -53,12 +54,21 @@ public:
 	virtual std::string information () const;
 	virtual std::string identifier () const;
 
-	VideoContent::Frame video_length () const {
+	ContentTime video_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_length;
 	}
 
-	libdcp::Size video_size () const {
+	ContentTime 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;
+	}
+
+	dcp::Size video_size () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_size;
 	}
@@ -69,14 +79,16 @@ 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 set_colour_conversion (ColourConversion);
-
+	
 	VideoFrameType video_frame_type () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_frame_type;
@@ -106,13 +118,11 @@ 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 {
@@ -120,29 +130,32 @@ public:
 		return _colour_conversion;
 	}
 
-	libdcp::Size video_size_after_3d_split () const;
-	libdcp::Size video_size_after_crop () const;
+	dcp::Size video_size_after_3d_split () const;
+	dcp::Size video_size_after_crop () const;
+
+	ContentTime dcp_time_to_content_time (DCPTime) const;
 
-	VideoContent::Frame time_to_content_video_frames (DCPTime) const;
+	void scale_and_crop_to_fit_width ();
+	void scale_and_crop_to_fit_height ();
 
 protected:
 	void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
-	VideoContent::Frame _video_length;
+	ContentTime _video_length;
+	float _video_frame_rate;
 
 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 ();
 	
-	libdcp::Size _video_size;
-	float _video_frame_rate;
+	dcp::Size _video_size;
 	VideoFrameType _video_frame_type;
 	Crop _crop;
-	Ratio const * _ratio;
+	VideoContentScale _scale;
 	ColourConversion _colour_conversion;
 };