X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=f871f2df666438a1846d465642f8cb991e729723;hb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;hp=c3aea2b0faab8032ffcf092a773471285cf55537;hpb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index c3aea2b0f..f871f2df6 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -20,6 +20,7 @@
 #include <iomanip>
 #include <libcxml/cxml.h>
 #include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
 #include "video_content.h"
 #include "video_examiner.h"
 #include "compose.hpp"
@@ -29,6 +30,7 @@
 #include "util.h"
 #include "film.h"
 #include "exceptions.h"
+#include "frame_rate_change.h"
 
 #include "i18n.h"
 
@@ -45,9 +47,9 @@ 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;
+using dcp::raw_convert;
 
 vector<VideoContentScale> VideoContentScale::_scales;
 
@@ -81,13 +83,20 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	setup_default_colour_conversion ();
 }
 
-VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
+VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
 	: Content (f, node)
 {
-	_video_length = ContentTime (node->number_child<int64_t> ("VideoLength"));
 	_video_size.width = node->number_child<int> ("VideoWidth");
 	_video_size.height = node->number_child<int> ("VideoHeight");
 	_video_frame_rate = node->number_child<float> ("VideoFrameRate");
+
+	if (version < 32) {
+		/* DCP-o-matic 1.0 branch */
+		_video_length = ContentTime::from_frames (node->number_child<int64_t> ("VideoLength"), _video_frame_rate);
+	} else {
+		_video_length = ContentTime (node->number_child<int64_t> ("VideoLength"));
+	}
+	
 	_video_frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
 	_crop.left = node->number_child<int> ("LeftCrop");
 	_crop.right = node->number_child<int> ("RightCrop");
@@ -155,15 +164,12 @@ void
 VideoContent::as_xml (xmlpp::Node* node) const
 {
 	boost::mutex::scoped_lock lm (_mutex);
-	node->add_child("VideoLength")->add_child_text (lexical_cast<string> (_video_length.get ()));
-	node->add_child("VideoWidth")->add_child_text (lexical_cast<string> (_video_size.width));
-	node->add_child("VideoHeight")->add_child_text (lexical_cast<string> (_video_size.height));
-	node->add_child("VideoFrameRate")->add_child_text (lexical_cast<string> (_video_frame_rate));
-	node->add_child("VideoFrameType")->add_child_text (lexical_cast<string> (static_cast<int> (_video_frame_type)));
-	node->add_child("LeftCrop")->add_child_text (boost::lexical_cast<string> (_crop.left));
-	node->add_child("RightCrop")->add_child_text (boost::lexical_cast<string> (_crop.right));
-	node->add_child("TopCrop")->add_child_text (boost::lexical_cast<string> (_crop.top));
-	node->add_child("BottomCrop")->add_child_text (boost::lexical_cast<string> (_crop.bottom));
+	node->add_child("VideoLength")->add_child_text (raw_convert<string> (_video_length.get ()));
+	node->add_child("VideoWidth")->add_child_text (raw_convert<string> (_video_size.width));
+	node->add_child("VideoHeight")->add_child_text (raw_convert<string> (_video_size.height));
+	node->add_child("VideoFrameRate")->add_child_text (raw_convert<string> (_video_frame_rate));
+	node->add_child("VideoFrameType")->add_child_text (raw_convert<string> (static_cast<int> (_video_frame_type)));
+	_crop.as_xml (node);
 	_scale.as_xml (node->add_child("Scale"));
 	_colour_conversion.as_xml (node->add_child("ColourConversion"));
 }
@@ -319,7 +325,7 @@ VideoContent::technical_summary () const
 {
 	return String::compose (
 		"video: length %1, size %2x%3, rate %4",
-		video_length().seconds(),
+		video_length_after_3d_combine().seconds(),
 		video_size().width,
 		video_size().height,
 		video_frame_rate()
@@ -332,6 +338,9 @@ VideoContent::video_size_after_3d_split () const
 	dcp::Size const s = video_size ();
 	switch (video_frame_type ()) {
 	case VIDEO_FRAME_TYPE_2D:
+	case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+	case VIDEO_FRAME_TYPE_3D_LEFT:
+	case VIDEO_FRAME_TYPE_3D_RIGHT:
 		return s;
 	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
 		return dcp::Size (s.width / 2, s.height);
@@ -392,7 +401,7 @@ VideoContentScale::VideoContentScale (bool scale)
 
 }
 
-VideoContentScale::VideoContentScale (shared_ptr<cxml::Node> node)
+VideoContentScale::VideoContentScale (cxml::NodePtr node)
 	: _ratio (0)
 	, _scale (true)
 {
@@ -452,7 +461,7 @@ VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_con
 		return fit_ratio_within (_ratio->ratio (), display_container);
 	}
 
-	libdcp::Size const ac = c->video_size_after_crop ();
+	dcp::Size const ac = c->video_size_after_crop ();
 
 	/* Force scale if the film_container is smaller than the content's image */
 	if (_scale || film_container.width < ac.width || film_container.height < ac.height) {
@@ -462,7 +471,7 @@ VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_con
 	/* Scale the image so that it will be in the right place in film_container, even if display_container is a
 	   different size.
 	*/
-	return libdcp::Size (
+	return dcp::Size (
 		c->video_size().width  * float(display_container.width)  / film_container.width,
 		c->video_size().height * float(display_container.height) / film_container.height
 		);