X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=0a19ffd692463ac4f2923cd106ea54ddfccd4de1;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=af0c3e12c08022fed68969c97f817ada684f3cc4;hpb=3aa2d90dfea24d7dca4ebea7f06b97d1a57fa2a5;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index af0c3e12c..0a19ffd69 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -26,6 +26,9 @@
 #include "compose.hpp"
 #include "config.h"
 #include "colour_conversion.h"
+#include "util.h"
+#include "film.h"
+#include "exceptions.h"
 
 #include "i18n.h"
 
@@ -40,9 +43,21 @@ using std::string;
 using std::stringstream;
 using std::setprecision;
 using std::cout;
+using std::vector;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::optional;
+using boost::dynamic_pointer_cast;
+
+VideoContent::VideoContent (shared_ptr<const Film> f)
+	: Content (f)
+	, _video_length (0)
+	, _video_frame_rate (0)
+	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
+	, _ratio (Ratio::from_id ("185"))
+{
+	setup_default_colour_conversion ();
+}
 
 VideoContent::VideoContent (shared_ptr<const Film> f, Time s, VideoContent::Frame len)
 	: Content (f, s)
@@ -66,6 +81,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 
 VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
 	: Content (f, node)
+	, _ratio (0)
 {
 	_video_length = node->number_child<VideoContent::Frame> ("VideoLength");
 	_video_size.width = node->number_child<int> ("VideoWidth");
@@ -83,6 +99,51 @@ VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Nod
 	_colour_conversion = ColourConversion (node->node_child ("ColourConversion"));
 }
 
+VideoContent::VideoContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
+	: Content (f, c)
+	, _video_length (0)
+{
+	shared_ptr<VideoContent> ref = dynamic_pointer_cast<VideoContent> (c[0]);
+	assert (ref);
+
+	for (size_t i = 0; i < c.size(); ++i) {
+		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c[i]);
+
+		if (vc->video_size() != ref->video_size()) {
+			throw JoinError (_("Content to be joined must have the same picture size."));
+		}
+
+		if (vc->video_frame_rate() != ref->video_frame_rate()) {
+			throw JoinError (_("Content to be joined must have the same video frame rate."));
+		}
+
+		if (vc->video_frame_type() != ref->video_frame_type()) {
+			throw JoinError (_("Content to be joined must have the same video frame type."));
+		}
+
+		if (vc->crop() != ref->crop()) {
+			throw JoinError (_("Content to be joined must have the same crop."));
+		}
+
+		if (vc->ratio() != ref->ratio()) {
+			throw JoinError (_("Content to be joined must have the same ratio."));
+		}
+
+		if (vc->colour_conversion() != ref->colour_conversion()) {
+			throw JoinError (_("Content to be joined must have the same colour conversion."));
+		}
+
+		_video_length += vc->video_length ();
+	}
+
+	_video_size = ref->video_size ();
+	_video_frame_rate = ref->video_frame_rate ();
+	_video_frame_type = ref->video_frame_type ();
+	_crop = ref->crop ();
+	_ratio = ref->ratio ();
+	_colour_conversion = ref->colour_conversion ();
+}
+
 void
 VideoContent::as_xml (xmlpp::Node* node) const
 {
@@ -139,7 +200,7 @@ VideoContent::information () const
 		_("%1x%2 pixels (%3:1)"),
 		video_size().width,
 		video_size().height,
-		setprecision (3), float (video_size().width) / video_size().height
+		setprecision (3), video_size().ratio ()
 		);
 	
 	return s.str ();
@@ -226,7 +287,7 @@ string
 VideoContent::identifier () const
 {
 	stringstream s;
-	s << Content::digest()
+	s << Content::identifier()
 	  << "_" << crop().left
 	  << "_" << crop().right
 	  << "_" << crop().top
@@ -281,3 +342,28 @@ VideoContent::set_colour_conversion (ColourConversion c)
 
 	signal_changed (VideoContentProperty::COLOUR_CONVERSION);
 }
+
+/** @return Video size after 3D split and crop */
+libdcp::Size
+VideoContent::video_size_after_crop () const
+{
+	return crop().apply (video_size_after_3d_split ());
+}
+
+/** @param t A time offset from the start of this piece of content.
+ *  @return Corresponding frame index.
+ */
+VideoContent::Frame
+VideoContent::time_to_content_video_frames (Time t) const
+{
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+	
+	FrameRateConversion frc (video_frame_rate(), film->video_frame_rate());
+
+	/* Here we are converting from time (in the DCP) to a frame number in the content.
+	   Hence we need to use the DCP's frame rate and the double/skip correction, not
+	   the source's rate.
+	*/
+	return t * film->video_frame_rate() / (frc.factor() * TIME_HZ);
+}