X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=37223c45788eef070d5ab5780a761e40f763f663;hb=8dabe7c3d815ff95c2fb3edc3cfce62434711fc4;hp=432775651d8d08944089c34679a846873fa486bb;hpb=2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 432775651..37223c457 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -38,26 +39,27 @@ class Content;
 class VideoContentProperty
 {
 public:
+	static int const USE;
 	static int const SIZE;
-	static int const FRAME_RATE;
 	static int const FRAME_TYPE;
 	static int const CROP;
 	static int const SCALE;
 	static int const COLOUR_CONVERSION;
 	static int const FADE_IN;
 	static int const FADE_OUT;
+	static int const RANGE;
 };
 
 class VideoContent : public ContentPart, public boost::enable_shared_from_this<VideoContent>
 {
 public:
-	VideoContent (Content* parent, boost::shared_ptr<const Film>);
-	VideoContent (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
-	VideoContent (Content* parent, boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
+	explicit VideoContent (Content* parent);
+	VideoContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
 
 	void as_xml (xmlpp::Node *) const;
 	std::string technical_summary () const;
 	std::string identifier () const;
+	void take_settings_from (boost::shared_ptr<const VideoContent> c);
 
 	Frame length () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -78,18 +80,7 @@ public:
 		return _size;
 	}
 
-	double frame_rate () const;
-
-	/** @return true if this content has a specific video frame rate, false
-	 *  if it should use the DCP's rate.
-	 */
-	bool has_own_frame_rate () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return static_cast<bool>(_frame_rate);
-	}
-
 	void set_frame_type (VideoFrameType);
-	void set_frame_rate (double);
 
 	void set_left_crop (int);
 	void set_right_crop (int);
@@ -103,6 +94,9 @@ public:
 	void set_fade_in (Frame);
 	void set_fade_out (Frame);
 
+	void set_range (VideoRange);
+	void set_use (bool);
+
 	VideoFrameType frame_type () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _frame_type;
@@ -164,21 +158,36 @@ public:
 		return _fade_out;
 	}
 
+	VideoRange range () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _range;
+	}
+
+	bool use () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _use;
+	}
+
 	dcp::Size size_after_3d_split () const;
 	dcp::Size size_after_crop () const;
 
-	boost::optional<double> fade (Frame) const;
+	boost::optional<double> fade (boost::shared_ptr<const Film> film, Frame) const;
 
-	void scale_and_crop_to_fit_width ();
-	void scale_and_crop_to_fit_height ();
+	void scale_and_crop_to_fit_width (boost::shared_ptr<const Film> film);
+	void scale_and_crop_to_fit_height (boost::shared_ptr<const Film> film);
 
-	std::string processing_description () const;
+	std::string processing_description (boost::shared_ptr<const Film> film) const;
 
 	void set_length (Frame);
 
 	void take_from_examiner (boost::shared_ptr<VideoExaminer>);
 	void add_properties (std::list<UserProperty> &) const;
 
+	void modify_position (boost::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
+	void modify_trim_start (dcpomatic::ContentTime& pos) const;
+
+	static boost::shared_ptr<VideoContent> from_xml (Content* parent, cxml::ConstNodePtr, int);
+
 private:
 
 	friend struct ffmpeg_pts_offset_test;
@@ -186,11 +195,11 @@ private:
 	friend struct best_dcp_frame_rate_test_double;
 	friend struct audio_sampling_rate_test;
 
+	VideoContent (Content* parent, cxml::ConstNodePtr, int);
 	void setup_default_colour_conversion ();
 
+	bool _use;
 	Frame _length;
-	/** Video frame rate, or not set if this content should use the DCP's frame rate */
-	boost::optional<double> _frame_rate;
 	boost::optional<ColourConversion> _colour_conversion;
 	dcp::Size _size;
 	VideoFrameType _frame_type;
@@ -199,8 +208,11 @@ private:
 	/** Sample aspect ratio obtained from the content file's header, if there is one */
 	boost::optional<double> _sample_aspect_ratio;
 	bool _yuv;
+	/** fade in time in content frames */
 	Frame _fade_in;
+	/** fade out time in content frames */
 	Frame _fade_out;
+	VideoRange _range;
 };
 
 #endif