X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=b4ad30f70d1c77ad523b57ad4edc65ff00a93faa;hp=ca0c687a791d9a1b15996cb0cf2f488b64d05a48;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hpb=c008066160d85b9ec9e5485375d7baaa5d27bda2

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index ca0c687a7..b4ad30f70 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -1,27 +1,25 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 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/>.
 
 */
 
-#include <iomanip>
-#include <libcxml/cxml.h>
-#include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
 #include "video_content.h"
+#include "content.h"
 #include "video_examiner.h"
 #include "compose.hpp"
 #include "ratio.h"
@@ -32,20 +30,26 @@
 #include "exceptions.h"
 #include "frame_rate_change.h"
 #include "log.h"
-#include "safe_stringstream.h"
+#include "dcpomatic_log.h"
+#include <dcp/raw_convert.h>
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <iomanip>
+#include <iostream>
 
 #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;
-int const VideoContentProperty::VIDEO_CROP	  = 3;
-int const VideoContentProperty::VIDEO_SCALE	  = 4;
+int const VideoContentProperty::USE               = 0;
+int const VideoContentProperty::SIZE              = 1;
+int const VideoContentProperty::FRAME_TYPE        = 2;
+int const VideoContentProperty::CROP              = 3;
+int const VideoContentProperty::SCALE	          = 4;
 int const VideoContentProperty::COLOUR_CONVERSION = 5;
-int const VideoContentProperty::VIDEO_FADE_IN     = 6;
-int const VideoContentProperty::VIDEO_FADE_OUT    = 7;
+int const VideoContentProperty::FADE_IN           = 6;
+int const VideoContentProperty::FADE_OUT          = 7;
+int const VideoContentProperty::RANGE             = 8;
+int const VideoContentProperty::CUSTOM_RATIO      = 9;
+int const VideoContentProperty::CUSTOM_SIZE       = 10;
 
 using std::string;
 using std::setprecision;
@@ -53,60 +57,81 @@ using std::cout;
 using std::vector;
 using std::min;
 using std::max;
-using std::stringstream;
 using std::fixed;
 using std::setprecision;
+using std::list;
+using std::pair;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 using dcp::raw_convert;
-
-VideoContent::VideoContent (shared_ptr<const Film> f)
-	: Content (f)
-	, _video_length (0)
-	, _video_frame_rate (0)
-	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
-	, _scale (VideoContentScale (Ratio::from_id ("178")))
+using namespace dcpomatic;
+
+VideoContent::VideoContent (Content* parent)
+	: ContentPart (parent)
+	, _use (true)
+	, _length (0)
+	, _frame_type (VIDEO_FRAME_TYPE_2D)
+	, _yuv (true)
+	, _fade_in (0)
+	, _fade_out (0)
+	, _range (VIDEO_RANGE_FULL)
 {
-	set_default_colour_conversion (false);
-}
 
-VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len)
-	: Content (f, s)
-	, _video_length (len)
-	, _video_frame_rate (0)
-	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
-	, _scale (VideoContentScale (Ratio::from_id ("178")))
-{
-	set_default_colour_conversion (false);
 }
 
-VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
-	: Content (f, p)
-	, _video_length (0)
-	, _video_frame_rate (0)
-	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
-	, _scale (VideoContentScale (Ratio::from_id ("178")))
+shared_ptr<VideoContent>
+VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version)
 {
-	set_default_colour_conversion (false);
+	if (!node->optional_number_child<int> ("VideoWidth")) {
+		return shared_ptr<VideoContent> ();
+	}
+
+	return shared_ptr<VideoContent> (new VideoContent (parent, node, version));
 }
 
-VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
-	: Content (f, node)
+VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int version)
+	: ContentPart (parent)
 {
-	_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);
+	_size.width = node->number_child<int> ("VideoWidth");
+	_size.height = node->number_child<int> ("VideoHeight");
+
+	/* Backwards compatibility */
+	optional<double> r = node->optional_number_child<double>("VideoFrameRate");
+	if (r) {
+		_parent->set_video_frame_rate (r.get ());
+	}
+
+	_use = node->optional_bool_child("Use").get_value_or(true);
+	_length = node->number_child<Frame> ("VideoLength");
+
+	if (version <= 34) {
+		/* Snapshot of the VideoFrameType enum at version 34 */
+		switch (node->number_child<int> ("VideoFrameType")) {
+		case 0:
+			_frame_type = VIDEO_FRAME_TYPE_2D;
+			break;
+		case 1:
+			_frame_type = VIDEO_FRAME_TYPE_3D_LEFT_RIGHT;
+			break;
+		case 2:
+			_frame_type = VIDEO_FRAME_TYPE_3D_TOP_BOTTOM;
+			break;
+		case 3:
+			_frame_type = VIDEO_FRAME_TYPE_3D_ALTERNATE;
+			break;
+		case 4:
+			_frame_type = VIDEO_FRAME_TYPE_3D_LEFT;
+			break;
+		case 5:
+			_frame_type = VIDEO_FRAME_TYPE_3D_RIGHT;
+			break;
+		}
 	} else {
-		_video_length = ContentTime (node->number_child<ContentTime::Type> ("VideoLength"));
+		_frame_type = string_to_video_frame_type (node->string_child ("VideoFrameType"));
 	}
-	
-	_video_frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
-	_sample_aspect_ratio = node->optional_number_child<float> ("SampleAspectRatio");
+
+	_sample_aspect_ratio = node->optional_number_child<double> ("SampleAspectRatio");
 	_crop.left = node->number_child<int> ("LeftCrop");
 	_crop.right = node->number_child<int> ("RightCrop");
 	_crop.top = node->number_child<int> ("TopCrop");
@@ -115,483 +140,496 @@ VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, i
 	if (version <= 7) {
 		optional<string> r = node->optional_string_child ("Ratio");
 		if (r) {
-			_scale = VideoContentScale (Ratio::from_id (r.get ()));
+			_legacy_ratio = Ratio::from_id(r.get())->ratio();
+		}
+	} else if (version <= 37) {
+		optional<string> ratio = node->node_child("Scale")->optional_string_child("Ratio");
+		if (ratio) {
+			_legacy_ratio = Ratio::from_id(ratio.get())->ratio();
 		}
+		optional<bool> scale = node->node_child("Scale")->optional_bool_child("Scale");
+		if (scale) {
+			if (*scale) {
+				/* This is what we used to call "no stretch" */
+				_legacy_ratio = _size.ratio();
+			} else {
+				/* This is what we used to call "no scale" */
+				_custom_size = _size;
+			}
+		}
+
 	} else {
-		_scale = VideoContentScale (node->node_child ("Scale"));
+		_custom_ratio = node->optional_number_child<float>("CustomRatio");
+		if (node->optional_number_child<int>("CustomWidth")) {
+			_custom_size = dcp::Size (node->number_child<int>("CustomWidth"), node->number_child<int>("CustomHeight"));
+		}
 	}
 
-	
 	if (node->optional_node_child ("ColourConversion")) {
-		_colour_conversion = ColourConversion (node->node_child ("ColourConversion"));
+		_colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version);
 	}
+
+	_yuv = node->optional_bool_child("YUV").get_value_or (true);
+
 	if (version >= 32) {
-		_fade_in = ContentTime (node->number_child<int64_t> ("FadeIn"));
-		_fade_out = ContentTime (node->number_child<int64_t> ("FadeOut"));
+		_fade_in = node->number_child<Frame> ("FadeIn");
+		_fade_out = node->number_child<Frame> ("FadeOut");
+	} else {
+		_fade_in = _fade_out = 0;
+	}
+
+	_range = VIDEO_RANGE_FULL;
+	if (node->optional_string_child("Range").get_value_or("full") == "video") {
+		_range = VIDEO_RANGE_VIDEO;
 	}
 }
 
-VideoContent::VideoContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
-	: Content (f, c)
-	, _video_length (0)
+VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
+	: ContentPart (parent)
+	, _length (0)
+	, _yuv (false)
 {
-	shared_ptr<VideoContent> ref = dynamic_pointer_cast<VideoContent> (c[0]);
-	assert (ref);
+	shared_ptr<VideoContent> ref = c[0]->video;
+	DCPOMATIC_ASSERT (ref);
 
-	for (size_t i = 0; i < c.size(); ++i) {
-		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c[i]);
+	for (size_t i = 1; i < c.size(); ++i) {
 
-		if (vc->video_size() != ref->video_size()) {
-			throw JoinError (_("Content to be joined must have the same picture size."));
+		if (c[i]->video->use() != ref->use()) {
+			throw JoinError (_("Content to be joined must have all its video used or not used."));
 		}
 
-		if (vc->video_frame_rate() != ref->video_frame_rate()) {
-			throw JoinError (_("Content to be joined must have the same video frame rate."));
+		if (c[i]->video->size() != ref->size()) {
+			throw JoinError (_("Content to be joined must have the same picture size."));
 		}
 
-		if (vc->video_frame_type() != ref->video_frame_type()) {
+		if (c[i]->video->frame_type() != ref->frame_type()) {
 			throw JoinError (_("Content to be joined must have the same video frame type."));
 		}
 
-		if (vc->crop() != ref->crop()) {
+		if (c[i]->video->crop() != ref->crop()) {
 			throw JoinError (_("Content to be joined must have the same crop."));
 		}
 
-		if (vc->scale() != ref->scale()) {
-			throw JoinError (_("Content to be joined must have the same scale setting."));
+		if (c[i]->video->custom_ratio() != ref->custom_ratio()) {
+			throw JoinError (_("Content to be joined must have the same custom ratio setting."));
 		}
 
-		if (vc->colour_conversion() != ref->colour_conversion()) {
+		if (c[i]->video->custom_size() != ref->custom_size()) {
+			throw JoinError (_("Content to be joined must have the same custom size setting."));
+		}
+
+		if (c[i]->video->colour_conversion() != ref->colour_conversion()) {
 			throw JoinError (_("Content to be joined must have the same colour conversion."));
 		}
 
-		if (vc->fade_in() != ref->fade_in() || vc->fade_out() != ref->fade_out()) {
+		if (c[i]->video->fade_in() != ref->fade_in() || c[i]->video->fade_out() != ref->fade_out()) {
 			throw JoinError (_("Content to be joined must have the same fades."));
 		}
-		
-		_video_length += vc->video_length ();
+
+		_length += c[i]->video->length ();
+
+		if (c[i]->video->yuv ()) {
+			_yuv = true;
+		}
 	}
 
-	_video_size = ref->video_size ();
-	_video_frame_rate = ref->video_frame_rate ();
-	_video_frame_type = ref->video_frame_type ();
+	_use = ref->use ();
+	_size = ref->size ();
+	_frame_type = ref->frame_type ();
 	_crop = ref->crop ();
-	_scale = ref->scale ();
+	_custom_ratio = ref->custom_ratio ();
 	_colour_conversion = ref->colour_conversion ();
 	_fade_in = ref->fade_in ();
 	_fade_out = ref->fade_out ();
+	_range = ref->range ();
 }
 
 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.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)));
+	node->add_child("Use")->add_child_text (_use ? "1" : "0");
+	node->add_child("VideoLength")->add_child_text (raw_convert<string> (_length));
+	node->add_child("VideoWidth")->add_child_text (raw_convert<string> (_size.width));
+	node->add_child("VideoHeight")->add_child_text (raw_convert<string> (_size.height));
+	node->add_child("VideoFrameType")->add_child_text (video_frame_type_to_string (_frame_type));
 	if (_sample_aspect_ratio) {
 		node->add_child("SampleAspectRatio")->add_child_text (raw_convert<string> (_sample_aspect_ratio.get ()));
 	}
 	_crop.as_xml (node);
-	_scale.as_xml (node->add_child("Scale"));
+	if (_custom_ratio) {
+		node->add_child("CustomRatio")->add_child_text(raw_convert<string>(*_custom_ratio));
+	}
+	if (_custom_size) {
+		node->add_child("CustomWidth")->add_child_text(raw_convert<string>(_custom_size->width));
+		node->add_child("CustomHeight")->add_child_text(raw_convert<string>(_custom_size->height));
+	}
 	if (_colour_conversion) {
 		_colour_conversion.get().as_xml (node->add_child("ColourConversion"));
 	}
-	node->add_child("FadeIn")->add_child_text (raw_convert<string> (_fade_in.get ()));
-	node->add_child("FadeOut")->add_child_text (raw_convert<string> (_fade_out.get ()));
+	node->add_child("YUV")->add_child_text (_yuv ? "1" : "0");
+	node->add_child("FadeIn")->add_child_text (raw_convert<string> (_fade_in));
+	node->add_child("FadeOut")->add_child_text (raw_convert<string> (_fade_out));
+	node->add_child("Range")->add_child_text(_range == VIDEO_RANGE_FULL ? "full" : "video");
 }
 
 void
-VideoContent::set_default_colour_conversion (bool signal)
+VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
 {
+	/* These examiner calls could call other content methods which take a lock on the mutex */
+	dcp::Size const vs = d->video_size ();
+	Frame vl = d->video_length ();
+	optional<double> const ar = d->sample_aspect_ratio ();
+	bool const yuv = d->yuv ();
+	VideoRange const range = d->range ();
+
+	ChangeSignaller<Content> cc1 (_parent, VideoContentProperty::SIZE);
+	ChangeSignaller<Content> cc2 (_parent, VideoContentProperty::SCALE);
+	ChangeSignaller<Content> cc3 (_parent, ContentProperty::LENGTH);
+	ChangeSignaller<Content> cc4 (_parent, VideoContentProperty::RANGE);
+
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		_colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion;
+		_size = vs;
+		_length = vl;
+		_sample_aspect_ratio = ar;
+		_yuv = yuv;
+		_range = range;
 	}
 
-	if (signal) {
-		signal_changed (VideoContentProperty::COLOUR_CONVERSION);
+	LOG_GENERAL ("Video length obtained from header as %1 frames", _length);
+
+	if (d->video_frame_rate()) {
+		_parent->set_video_frame_rate (d->video_frame_rate().get());
 	}
 }
 
-void
-VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
+/** @return string which includes everything about how this content looks */
+string
+VideoContent::identifier () const
 {
-	/* These examiner calls could call other content methods which take a lock on the mutex */
-	dcp::Size const vs = d->video_size ();
-	optional<float> const vfr = d->video_frame_rate ();
-	ContentTime vl = d->video_length ();
-	optional<float> const ar = d->sample_aspect_ratio ();
+	char buffer[256];
+	snprintf (
+		buffer, sizeof(buffer), "%d_%d_%d_%d_%d_%f_%d_%d%" PRId64 "_%" PRId64 "_%d",
+		(_use ? 1 : 0),
+		crop().left,
+		crop().right,
+		crop().top,
+		crop().bottom,
+		_custom_ratio.get_value_or(0),
+		_custom_size ? _custom_size->width : 0,
+		_custom_size ? _custom_size->height : 0,
+		_fade_in,
+		_fade_out,
+		_range == VIDEO_RANGE_FULL ? 0 : 1
+		);
 
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_video_size = vs;
-		if (vfr) {
-			_video_frame_rate = vfr.get ();
-		}
-		_video_length = vl;
-		_sample_aspect_ratio = ar;
+	string s (buffer);
 
-		/* Guess correct scale from size and sample aspect ratio */
-		_scale = VideoContentScale (
-			Ratio::nearest_from_ratio (float (_video_size.width) * ar.get_value_or (1) / _video_size.height)
-			);
+	if (colour_conversion()) {
+		s += "_" + colour_conversion().get().identifier ();
 	}
 
-	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 (VideoContentProperty::VIDEO_SCALE);
-	signal_changed (ContentProperty::LENGTH);
+	return s;
 }
 
-
 string
-VideoContent::information () const
+VideoContent::technical_summary () const
 {
-	if (video_size().width == 0 || video_size().height == 0) {
-		return "";
-	}
-	
-	SafeStringStream s;
-
-	s << String::compose (
-		_("%1x%2 pixels (%3:1)"),
-		video_size().width,
-		video_size().height,
-		setprecision (3), video_size().ratio ()
+	string s = String::compose (
+		N_("video: length %1 frames, size %2x%3"),
+		length_after_3d_combine(),
+		size().width,
+		size().height
 		);
 
 	if (sample_aspect_ratio ()) {
-		s << String::compose (_(" sample aspect ratio %1:1"), sample_aspect_ratio().get ());
+		s += String::compose (N_(", sample aspect ratio %1"), (sample_aspect_ratio().get ()));
 	}
-	
-	return s.str ();
-}
 
-void
-VideoContent::set_left_crop (int c)
-{
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		
-		if (_crop.left == c) {
-			return;
-		}
-		
-		_crop.left = c;
-	}
-	
-	signal_changed (VideoContentProperty::VIDEO_CROP);
+	return s;
 }
 
-void
-VideoContent::set_right_crop (int c)
+dcp::Size
+VideoContent::size_after_3d_split () const
 {
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		if (_crop.right == c) {
-			return;
-		}
-		
-		_crop.right = c;
+	dcp::Size const s = size ();
+	switch (frame_type ()) {
+	case VIDEO_FRAME_TYPE_2D:
+	case VIDEO_FRAME_TYPE_3D:
+	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);
+	case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+		return dcp::Size (s.width, s.height / 2);
 	}
-	
-	signal_changed (VideoContentProperty::VIDEO_CROP);
+
+	DCPOMATIC_ASSERT (false);
 }
 
-void
-VideoContent::set_top_crop (int c)
+/** @return Video size after 3D split and crop */
+dcp::Size
+VideoContent::size_after_crop () const
 {
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		if (_crop.top == c) {
-			return;
-		}
-		
-		_crop.top = c;
-	}
-	
-	signal_changed (VideoContentProperty::VIDEO_CROP);
+	return crop().apply (size_after_3d_split ());
 }
 
-void
-VideoContent::set_bottom_crop (int c)
+
+/** @param f Frame index within the whole (untrimmed) content.
+ *  @return Fade factor (between 0 and 1) or unset if there is no fade.
+ */
+optional<double>
+VideoContent::fade (shared_ptr<const Film> film, Frame f) const
 {
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		if (_crop.bottom == c) {
-			return;
-		}
-		
-		_crop.bottom = c;
-	}
+	DCPOMATIC_ASSERT (f >= 0);
 
-	signal_changed (VideoContentProperty::VIDEO_CROP);
-}
+	double const vfr = _parent->active_video_frame_rate(film);
 
-void
-VideoContent::set_scale (VideoContentScale s)
-{
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		if (_scale == s) {
-			return;
-		}
+	Frame const ts = _parent->trim_start().frames_round(vfr);
+	if ((f - ts) < fade_in()) {
+		return double (f - ts) / fade_in();
+	}
 
-		_scale = s;
+	Frame fade_out_start = length() - _parent->trim_end().frames_round(vfr) - fade_out();
+	if (f >= fade_out_start) {
+		return 1 - double (f - fade_out_start) / fade_out();
 	}
 
-	signal_changed (VideoContentProperty::VIDEO_SCALE);
+	return optional<double> ();
 }
 
-/** @return string which includes everything about how this content looks */
 string
-VideoContent::identifier () const
+VideoContent::processing_description (shared_ptr<const Film> film)
 {
-	SafeStringStream s;
-	s << Content::identifier()
-	  << "_" << crop().left
-	  << "_" << crop().right
-	  << "_" << crop().top
-	  << "_" << crop().bottom
-	  << "_" << scale().id();
+	string d;
+	char buffer[256];
 
-	if (colour_conversion()) {
-		s << "_" << colour_conversion().get().identifier ();
+	if (size().width && size().height) {
+		d += String::compose (
+			_("Content video is %1x%2"),
+			size_after_3d_split().width,
+			size_after_3d_split().height
+			);
+
+
+		double ratio = size_after_3d_split().ratio ();
+
+		if (sample_aspect_ratio ()) {
+			snprintf (buffer, sizeof(buffer), _(", pixel aspect ratio %.2f:1"), sample_aspect_ratio().get());
+			d += buffer;
+			ratio *= sample_aspect_ratio().get ();
+		}
+
+		snprintf (buffer, sizeof(buffer), _("\nDisplay aspect ratio %.2f:1"), ratio);
+		d += buffer;
 	}
 
-	return s.str ();
-}
+	if ((crop().left || crop().right || crop().top || crop().bottom) && size() != dcp::Size (0, 0)) {
+		dcp::Size cropped = size_after_crop ();
+		d += String::compose (
+			_("\nCropped to %1x%2"),
+			cropped.width, cropped.height
+			);
 
-void
-VideoContent::set_video_frame_type (VideoFrameType t)
-{
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_video_frame_type = t;
+		snprintf (buffer, sizeof(buffer), " (%.2f:1)", cropped.ratio());
+		d += buffer;
 	}
 
-	signal_changed (VideoContentProperty::VIDEO_FRAME_TYPE);
-}
+	dcp::Size const container_size = film->frame_size ();
+	dcp::Size const scaled = scaled_size (container_size);
 
-string
-VideoContent::technical_summary () const
-{
-	string s = String::compose (
-		"video: length %1, size %2x%3, rate %4",
-		video_length_after_3d_combine().seconds(),
-		video_size().width,
-		video_size().height,
-		video_frame_rate()
-		);
+	if (scaled != size_after_crop ()) {
+		d += String::compose (
+			_("\nScaled to %1x%2"),
+			scaled.width, scaled.height
+			);
 
-	if (sample_aspect_ratio ()) {
-		s += String::compose (_(", sample aspect ratio %1"), (sample_aspect_ratio().get ()));
+		snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), scaled.ratio());
+		d += buffer;
 	}
 
-	return s;
-}
+	if (scaled != container_size) {
+		d += String::compose (
+			_("\nPadded with black to fit container %1 (%2x%3)"),
+			film->container()->container_nickname (),
+			container_size.width, container_size.height
+			);
 
-dcp::Size
-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);
-	case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
-		return dcp::Size (s.width, s.height / 2);
+		snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), container_size.ratio());
+		d += buffer;
 	}
 
-	assert (false);
-}
+	if (_parent->video_frame_rate()) {
+		double const vfr = _parent->video_frame_rate().get ();
 
-void
-VideoContent::unset_colour_conversion ()
-{
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_colour_conversion = boost::optional<ColourConversion> ();
+		snprintf (buffer, sizeof(buffer), _("\nContent frame rate %.4f\n"), vfr);
+		d += buffer;
+
+		FrameRateChange frc (vfr, film->video_frame_rate ());
+		d += frc.description ();
 	}
 
-	signal_changed (VideoContentProperty::COLOUR_CONVERSION);
+	return d;
 }
 
 void
-VideoContent::set_colour_conversion (ColourConversion c)
+VideoContent::add_properties (list<UserProperty>& p) const
 {
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_colour_conversion = c;
-	}
-
-	signal_changed (VideoContentProperty::COLOUR_CONVERSION);
+	p.push_back (UserProperty (UserProperty::VIDEO, _("Length"), length (), _("video frames")));
+	p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), String::compose ("%1x%2", size().width, size().height)));
 }
 
 void
-VideoContent::set_fade_in (ContentTime t)
+VideoContent::set_length (Frame len)
 {
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_fade_in = t;
-	}
-
-	signal_changed (VideoContentProperty::VIDEO_FADE_IN);
+	maybe_set (_length, len, ContentProperty::LENGTH);
 }
 
 void
-VideoContent::set_fade_out (ContentTime t)
+VideoContent::set_left_crop (int c)
 {
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_fade_out = t;
-	}
-
-	signal_changed (VideoContentProperty::VIDEO_FADE_OUT);
+	maybe_set (_crop.left, c, VideoContentProperty::CROP);
 }
 
-/** @return Video size after 3D split and crop */
-dcp::Size
-VideoContent::video_size_after_crop () const
+void
+VideoContent::set_right_crop (int c)
 {
-	return crop().apply (video_size_after_3d_split ());
+	maybe_set (_crop.right, c, VideoContentProperty::CROP);
 }
 
-/** @param t A time offset from the start of this piece of content.
- *  @return Corresponding time with respect to the content.
- */
-ContentTime
-VideoContent::dcp_time_to_content_time (DCPTime t) const
+void
+VideoContent::set_top_crop (int c)
 {
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate()));
+	maybe_set (_crop.top, c, VideoContentProperty::CROP);
 }
 
 void
-VideoContent::scale_and_crop_to_fit_width ()
+VideoContent::set_bottom_crop (int c)
 {
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
+	maybe_set (_crop.bottom, c, VideoContentProperty::CROP);
+}
 
-	set_scale (VideoContentScale (film->container ()));
 
-	int const crop = max (0, int (video_size().height - double (film->frame_size().height) * video_size().width / film->frame_size().width));
-	set_top_crop (crop / 2);
-	set_bottom_crop (crop / 2);
+void
+VideoContent::set_frame_type (VideoFrameType t)
+{
+	maybe_set (_frame_type, t, VideoContentProperty::FRAME_TYPE);
 }
 
 void
-VideoContent::scale_and_crop_to_fit_height ()
+VideoContent::unset_colour_conversion ()
 {
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-
-	set_scale (VideoContentScale (film->container ()));
+	maybe_set (_colour_conversion, boost::optional<ColourConversion> (), VideoContentProperty::COLOUR_CONVERSION);
+}
 
-	int const crop = max (0, int (video_size().width - double (film->frame_size().width) * video_size().height / film->frame_size().height));
-	set_left_crop (crop / 2);
-	set_right_crop (crop / 2);
+void
+VideoContent::set_colour_conversion (ColourConversion c)
+{
+	maybe_set (_colour_conversion, c, VideoContentProperty::COLOUR_CONVERSION);
 }
 
 void
-VideoContent::set_video_frame_rate (float r)
+VideoContent::set_fade_in (Frame t)
 {
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		if (_video_frame_rate == r) {
-			return;
-		}
-		
-		_video_frame_rate = r;
-	}
-	
-	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+	maybe_set (_fade_in, t, VideoContentProperty::FADE_IN);
 }
 
-optional<float>
-VideoContent::fade (VideoFrame f) const
+void
+VideoContent::set_fade_out (Frame t)
 {
-	assert (f >= 0);
-	
-	if (f < fade_in().frames (video_frame_rate ())) {
-		return float (f) / _fade_in.frames (video_frame_rate ());
-	}
+	maybe_set (_fade_out, t, VideoContentProperty::FADE_OUT);
+}
 
-	VideoFrame fade_out_start = ContentTime (video_length() - fade_out()).frames (video_frame_rate ());
-	if (f >= fade_out_start) {
-		return 1 - float (f - fade_out_start) / fade_out().frames (video_frame_rate ());
-	}
+void
+VideoContent::set_range (VideoRange r)
+{
+	maybe_set (_range, r, VideoContentProperty::RANGE);
+}
 
-	return optional<float> ();
+void
+VideoContent::set_use (bool u)
+{
+	maybe_set (_use, u, VideoContentProperty::USE);
 }
 
-string
-VideoContent::processing_description () const
+void
+VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
 {
-	/* stringstream is OK here as this string is just for presentation to the user */
-	stringstream d;
+	if (c->_colour_conversion) {
+		set_colour_conversion (c->_colour_conversion.get());
+	} else {
+		unset_colour_conversion ();
+	}
+	set_use (c->_use);
+	set_frame_type (c->_frame_type);
+	set_left_crop (c->_crop.left);
+	set_right_crop (c->_crop.right);
+	set_top_crop (c->_crop.top);
+	set_bottom_crop (c->_crop.bottom);
+	set_custom_ratio (c->_custom_ratio);
+	set_custom_size (c->_custom_size);
+	set_fade_in (c->_fade_in);
+	set_fade_out (c->_fade_out);
+}
 
-	if (video_size().width && video_size().height) {
-		d << String::compose (
-			_("Content video is %1x%2"),
-			video_size_after_3d_split().width,
-			video_size_after_3d_split().height
-			);
+void
+VideoContent::modify_position (shared_ptr<const Film> film, DCPTime& pos) const
+{
+	pos = pos.round (film->video_frame_rate());
+}
 
-		d << " (" << fixed << setprecision(2) << video_size_after_3d_split().ratio() << ":1)\n";
+void
+VideoContent::modify_trim_start (ContentTime& trim) const
+{
+	if (_parent->video_frame_rate()) {
+		trim = trim.round (_parent->video_frame_rate().get());
 	}
+}
 
-	if ((crop().left || crop().right || crop().top || crop().bottom) && video_size() != dcp::Size (0, 0)) {
-		dcp::Size cropped = video_size_after_crop ();
-		d << String::compose (
-			_("Cropped to %1x%2"),
-			cropped.width, cropped.height
-			);
 
-		d << " (" << fixed << setprecision(2) << cropped.ratio () << ":1)\n";
+/** @param film_container The size of the container for the DCP that we are working on */
+dcp::Size
+VideoContent::scaled_size (dcp::Size film_container)
+{
+	if (_custom_ratio) {
+		return fit_ratio_within(*_custom_ratio, film_container);
 	}
 
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
+	if (_custom_size) {
+		return *_custom_size;
+	}
 
-	dcp::Size const container_size = film->frame_size ();
-	dcp::Size const scaled = scale().size (dynamic_pointer_cast<const VideoContent> (shared_from_this ()), container_size, container_size, 1);
+	dcp::Size size = size_after_crop ();
+	size.width *= _sample_aspect_ratio.get_value_or(1);
 
-	if (scaled != video_size_after_crop ()) {
-		d << String::compose (
-			_("Scaled to %1x%2"),
-			scaled.width, scaled.height
-			);
+	/* This is what we will return unless there is any legacy stuff to take into account */
+	dcp::Size auto_size = fit_ratio_within (size.ratio(), film_container);
 
-		d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n";
+	if (_legacy_ratio) {
+		if (fit_ratio_within(*_legacy_ratio, film_container) != auto_size) {
+			_custom_ratio = *_legacy_ratio;
+			_legacy_ratio = optional<float>();
+			return fit_ratio_within(*_custom_ratio, film_container);
+		}
+		_legacy_ratio = 0;
 	}
-	
-	if (scaled != container_size) {
-		d << String::compose (
-			_("Padded with black to %1x%2"),
-			container_size.width, container_size.height
-			);
 
-		d << " (" << fixed << setprecision(2) << container_size.ratio () << ":1)\n";
-	}
+	return auto_size;
+}
 
-	d << _("Content frame rate");
-	d << " " << fixed << setprecision(4) << video_frame_rate() << "\n";
-	
-	FrameRateChange frc (video_frame_rate(), film->video_frame_rate ());
-	d << frc.description () << "\n";
 
-	return d.str ();
+void
+VideoContent::set_custom_ratio (optional<float> ratio)
+{
+	maybe_set (_custom_ratio, ratio, VideoContentProperty::CUSTOM_RATIO);
+}
+
+
+void
+VideoContent::set_custom_size (optional<dcp::Size> size)
+{
+	maybe_set (_custom_size, size, VideoContentProperty::CUSTOM_SIZE);
 }