1 files changed, 49 insertions, 43 deletions

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 5a80dba74..9822d7763 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -19,8 +19,8 @@
 
 #include <iomanip>
 #include <libcxml/cxml.h>
-#include <libdcp/colour_matrix.h>
-#include <libdcp/raw_convert.h>
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
 #include "video_content.h"
 #include "video_examiner.h"
 #include "compose.hpp"
@@ -31,10 +31,13 @@
 #include "film.h"
 #include "exceptions.h"
 #include "frame_rate_change.h"
+#include "log.h"
 #include "safe_stringstream.h"
 
 #include "i18n.h"
 
+#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+
 int const VideoContentProperty::VIDEO_SIZE	  = 0;
 int const VideoContentProperty::VIDEO_FRAME_RATE  = 1;
 int const VideoContentProperty::VIDEO_FRAME_TYPE  = 2;
@@ -51,14 +54,13 @@ using std::max;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
-using libdcp::raw_convert;
+using dcp::raw_convert;
 
 vector<VideoContentScale> VideoContentScale::_scales;
 
 VideoContent::VideoContent (shared_ptr<const Film> f)
 	: Content (f)
 	, _video_length (0)
-	, _original_video_frame_rate (0)
 	, _video_frame_rate (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _scale (Config::instance()->default_scale ())
@@ -66,10 +68,9 @@ VideoContent::VideoContent (shared_ptr<const Film> f)
 	setup_default_colour_conversion ();
 }
 
-VideoContent::VideoContent (shared_ptr<const Film> f, Time s, VideoContent::Frame len)
+VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len)
 	: Content (f, s)
 	, _video_length (len)
-	, _original_video_frame_rate (0)
 	, _video_frame_rate (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _scale (Config::instance()->default_scale ())
@@ -80,7 +81,6 @@ VideoContent::VideoContent (shared_ptr<const Film> f, Time s, VideoContent::Fram
 VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f, p)
 	, _video_length (0)
-	, _original_video_frame_rate (0)
 	, _video_frame_rate (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _scale (Config::instance()->default_scale ())
@@ -88,14 +88,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 = node->number_child<VideoContent::Frame> ("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");
-	_original_video_frame_rate = node->optional_number_child<float> ("OriginalVideoFrameRate").get_value_or (_video_frame_rate);
+
+	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<ContentTime::Type> ("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");
@@ -152,7 +158,6 @@ VideoContent::VideoContent (shared_ptr<const Film> f, vector<shared_ptr<Content>
 	}
 
 	_video_size = ref->video_size ();
-	_original_video_frame_rate = ref->original_video_frame_rate ();
 	_video_frame_rate = ref->video_frame_rate ();
 	_video_frame_type = ref->video_frame_type ();
 	_crop = ref->crop ();
@@ -164,11 +169,10 @@ void
 VideoContent::as_xml (xmlpp::Node* node) const
 {
 	boost::mutex::scoped_lock lm (_mutex);
-	node->add_child("VideoLength")->add_child_text (raw_convert<string> (_video_length));
+	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("OriginalVideoFrameRate")->add_child_text (raw_convert<string> (_original_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"));
@@ -178,25 +182,31 @@ VideoContent::as_xml (xmlpp::Node* node) const
 void
 VideoContent::setup_default_colour_conversion ()
 {
-	_colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6).conversion;
+	_colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion;
 }
 
 void
 VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
 {
 	/* These examiner calls could call other content methods which take a lock on the mutex */
-	libdcp::Size const vs = d->video_size ();
+	dcp::Size const vs = d->video_size ();
 	float const vfr = d->video_frame_rate ();
-	
+	ContentTime vl = d->video_length ();
+
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		_video_size = vs;
 		_video_frame_rate = vfr;
-		_original_video_frame_rate = vfr;
+		_video_length = vl;
 	}
+
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+	LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length.frames (_video_frame_rate));
 	
 	signal_changed (VideoContentProperty::VIDEO_SIZE);
 	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+	signal_changed (ContentProperty::LENGTH);
 }
 
 
@@ -327,14 +337,17 @@ VideoContent::technical_summary () const
 {
 	return String::compose (
 		"video: length %1, size %2x%3, rate %4",
-		video_length_after_3d_combine(), video_size().width, video_size().height, video_frame_rate()
+		video_length_after_3d_combine().seconds(),
+		video_size().width,
+		video_size().height,
+		video_frame_rate()
 		);
 }
 
-libdcp::Size
+dcp::Size
 VideoContent::video_size_after_3d_split () const
 {
-	libdcp::Size const s = video_size ();
+	dcp::Size const s = video_size ();
 	switch (video_frame_type ()) {
 	case VIDEO_FRAME_TYPE_2D:
 	case VIDEO_FRAME_TYPE_3D_ALTERNATE:
@@ -342,9 +355,9 @@ VideoContent::video_size_after_3d_split () const
 	case VIDEO_FRAME_TYPE_3D_RIGHT:
 		return s;
 	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
-		return libdcp::Size (s.width / 2, s.height);
+		return dcp::Size (s.width / 2, s.height);
 	case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
-		return libdcp::Size (s.width, s.height / 2);
+		return dcp::Size (s.width, s.height / 2);
 	}
 
 	assert (false);
@@ -362,28 +375,21 @@ VideoContent::set_colour_conversion (ColourConversion c)
 }
 
 /** @return Video size after 3D split and crop */
-libdcp::Size
+dcp::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.
+ *  @return Corresponding time with respect to the content.
  */
-VideoContent::Frame
-VideoContent::time_to_content_video_frames (Time t) const
+ContentTime
+VideoContent::dcp_time_to_content_time (DCPTime t) const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
-	
-	FrameRateChange 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);
+	return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate()));
 }
 
 void
@@ -448,7 +454,7 @@ VideoContentScale::VideoContentScale (bool scale)
 
 }
 
-VideoContentScale::VideoContentScale (shared_ptr<cxml::Node> node)
+VideoContentScale::VideoContentScale (cxml::NodePtr node)
 	: _ratio (0)
 	, _scale (true)
 {
@@ -516,26 +522,26 @@ VideoContentScale::from_id (string id)
 /** @param display_container Size of the container that we are displaying this content in.
  *  @param film_container The size of the film's image.
  */
-libdcp::Size
-VideoContentScale::size (shared_ptr<const VideoContent> c, libdcp::Size display_container, libdcp::Size film_container) const
+dcp::Size
+VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_container, dcp::Size film_container, int round) const
 {
 	if (_ratio) {
-		return fit_ratio_within (_ratio->ratio (), display_container);
+		return fit_ratio_within (_ratio->ratio (), display_container, round);
 	}
 
-	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) {
-		return fit_ratio_within (ac.ratio (), display_container);
+		return fit_ratio_within (ac.ratio (), display_container, 1);
 	}
 
 	/* 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 (
-		c->video_size().width  * float(display_container.width)  / film_container.width,
-		c->video_size().height * float(display_container.height) / film_container.height
+	return dcp::Size (
+		round_to (c->video_size().width  * float(display_container.width)  / film_container.width, round),
+		round_to (c->video_size().height * float(display_container.height) / film_container.height, round)
 		);
 }