X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=075f7b7015b623a7be591210aff0efd1af90ccfb;hb=78664f8073256de51355c9162f61a4ae4fa560d7;hp=792929419c42f36e091efe40ef583df3eb20b7d3;hpb=35466aa2bf59544d436a5f576e81856c5e0d0311;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 792929419..075f7b701 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 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
@@ -20,12 +20,20 @@
 #ifndef DCPOMATIC_VIDEO_CONTENT_H
 #define DCPOMATIC_VIDEO_CONTENT_H
 
-#include "content.h"
 #include "colour_conversion.h"
 #include "video_content_scale.h"
+#include "dcpomatic_time.h"
+#include "user_property.h"
+#include "types.h"
+#include "content_part.h"
+#include <boost/thread/mutex.hpp>
+#include <boost/weak_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
 
 class VideoExaminer;
 class Ratio;
+class Film;
+class Content;
 
 class VideoContentProperty
 {
@@ -40,30 +48,30 @@ public:
 	static int const VIDEO_FADE_OUT;
 };
 
-class VideoContent : public virtual Content
+class VideoContent : public ContentPart, public boost::enable_shared_from_this<VideoContent>
 {
 public:
-	VideoContent (boost::shared_ptr<const Film>);
-	VideoContent (boost::shared_ptr<const Film>, DCPTime, ContentTime);
-	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> >);
+	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> >);
 
 	void as_xml (xmlpp::Node *) const;
 	std::string technical_summary () const;
-	virtual std::string identifier () const;
+	std::string identifier () const;
 
-	ContentTime video_length () const {
+	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;
 	}
 
@@ -71,14 +79,19 @@ public:
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_size;
 	}
-	
-	float video_frame_rate () const {
+
+	double video_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_video_frame_rate () const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return _video_frame_rate;
+		return static_cast<bool>(_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);
@@ -86,13 +99,12 @@ public:
 	void set_bottom_crop (int);
 
 	void set_scale (VideoContentScale);
-	void unset_colour_conversion (bool signal = true);
+	void unset_colour_conversion ();
 	void set_colour_conversion (ColourConversion);
-	void set_default_colour_conversion (bool signal = true);
 
-	void set_fade_in (ContentTime);
-	void set_fade_out (ContentTime);
-	
+	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;
@@ -134,58 +146,68 @@ public:
 		return _colour_conversion;
 	}
 
-	boost::optional<float> sample_aspect_ratio () const {
+	boost::optional<double> sample_aspect_ratio () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _sample_aspect_ratio;
 	}
 
-	ContentTime fade_in () const {
+	bool yuv () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _yuv;
+	}
+
+	Frame fade_in () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _fade_in;
 	}
 
-	ContentTime fade_out () const {
+	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<float> fade (VideoFrame) 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 set_video_length (Frame);
 
-	ContentTime _video_length;
-	float _video_frame_rate;
+	void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
+	void add_properties (std::list<UserProperty> &) const;
 
 private:
+
+	Frame _video_length;
+	/** Video frame rate, or not set if this content should use the DCP's frame rate */
+	boost::optional<double> _video_frame_rate;
+	boost::optional<ColourConversion> _colour_conversion;
+
 	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;
 	VideoContentScale _scale;
-	boost::optional<ColourConversion> _colour_conversion;
 	/** Sample aspect ratio obtained from the content file's header,
 	    if there is one.
 	*/
-	boost::optional<float> _sample_aspect_ratio;
-	ContentTime _fade_in;
-	ContentTime _fade_out;
+	boost::optional<double> _sample_aspect_ratio;
+	bool _yuv;
+	Frame _fade_in;
+	Frame _fade_out;
 };
 
 #endif