X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=708edee76a031e4ea8fe90624388564b173d77a0;hb=6f344b876689a1234a5eb75041882f06f5d9fe5c;hp=5a80dba7455cab235aaa34f1d7855b681a9f4620;hpb=4956be4e16570fa6b6985b11d4d689308343ffbb;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 5a80dba74..708edee76 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -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
@@ -17,11 +17,8 @@
 
 */
 
-#include <iomanip>
-#include <libcxml/cxml.h>
-#include <libdcp/colour_matrix.h>
-#include <libdcp/raw_convert.h>
 #include "video_content.h"
+#include "content.h"
 #include "video_examiner.h"
 #include "compose.hpp"
 #include "ratio.h"
@@ -31,16 +28,27 @@
 #include "film.h"
 #include "exceptions.h"
 #include "frame_rate_change.h"
+#include "log.h"
 #include "safe_stringstream.h"
+#include "raw_convert.h"
+#include <libcxml/cxml.h>
+#include <dcp/colour_matrix.h>
+#include <libxml++/libxml++.h>
+#include <iomanip>
+#include <iostream>
 
 #include "i18n.h"
 
+#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), LogEntry::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::COLOUR_CONVERSION = 5;
+int const VideoContentProperty::VIDEO_FADE_IN     = 6;
+int const VideoContentProperty::VIDEO_FADE_OUT    = 7;
 
 using std::string;
 using std::setprecision;
@@ -48,55 +56,37 @@ using std::cout;
 using std::vector;
 using std::min;
 using std::max;
+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 libdcp::raw_convert;
-
-vector<VideoContentScale> VideoContentScale::_scales;
 
-VideoContent::VideoContent (shared_ptr<const Film> f)
-	: Content (f)
+VideoContent::VideoContent (Content* parent, shared_ptr<const Film> film)
+	: _parent (parent)
+	, _film (film)
 	, _video_length (0)
-	, _original_video_frame_rate (0)
-	, _video_frame_rate (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
-	, _scale (Config::instance()->default_scale ())
+	, _scale (VideoContentScale (Ratio::from_id ("178")))
+	, _yuv (true)
+	, _fade_in (0)
+	, _fade_out (0)
 {
-	setup_default_colour_conversion ();
-}
 
-VideoContent::VideoContent (shared_ptr<const Film> f, Time s, VideoContent::Frame 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 ())
-{
-	setup_default_colour_conversion ();
-}
-
-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 ())
-{
-	setup_default_colour_conversion ();
 }
 
-VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
-	: Content (f, node)
+VideoContent::VideoContent (Content* parent, shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
+	: _parent (parent)
+	, _film (film)
 {
-	_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);
+	_video_frame_rate = node->optional_number_child<double> ("VideoFrameRate");
+	_video_length = node->number_child<Frame> ("VideoLength");
 	_video_frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
+	_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");
@@ -110,16 +100,30 @@ VideoContent::VideoContent (shared_ptr<const Film> f, shared_ptr<const cxml::Nod
 	} else {
 		_scale = VideoContentScale (node->node_child ("Scale"));
 	}
-	
-	_colour_conversion = ColourConversion (node->node_child ("ColourConversion"));
+
+
+	if (node->optional_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 = node->number_child<Frame> ("FadeIn");
+		_fade_out = node->number_child<Frame> ("FadeOut");
+	} else {
+		_fade_in = _fade_out = 0;
+	}
 }
 
-VideoContent::VideoContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
-	: Content (f, c)
+VideoContent::VideoContent (Content* parent, shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
+	: _parent (parent)
+	, _film (film)
 	, _video_length (0)
+	, _yuv (false)
 {
 	shared_ptr<VideoContent> ref = dynamic_pointer_cast<VideoContent> (c[0]);
-	assert (ref);
+	DCPOMATIC_ASSERT (ref);
 
 	for (size_t i = 0; i < c.size(); ++i) {
 		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c[i]);
@@ -148,16 +152,25 @@ VideoContent::VideoContent (shared_ptr<const Film> f, vector<shared_ptr<Content>
 			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()) {
+			throw JoinError (_("Content to be joined must have the same fades."));
+		}
+
 		_video_length += vc->video_length ();
+
+		if (vc->yuv ()) {
+			_yuv = true;
+		}
 	}
 
 	_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 ();
 	_scale = ref->scale ();
 	_colour_conversion = ref->colour_conversion ();
+	_fade_in = ref->fade_in ();
+	_fade_out = ref->fade_out ();
 }
 
 void
@@ -167,56 +180,63 @@ VideoContent::as_xml (xmlpp::Node* node) const
 	node->add_child("VideoLength")->add_child_text (raw_convert<string> (_video_length));
 	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));
+	if (_video_frame_rate) {
+		node->add_child("VideoFrameRate")->add_child_text (raw_convert<string> (_video_frame_rate.get()));
+	}
 	node->add_child("VideoFrameType")->add_child_text (raw_convert<string> (static_cast<int> (_video_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"));
-	_colour_conversion.as_xml (node->add_child("ColourConversion"));
+	if (_colour_conversion) {
+		_colour_conversion.get().as_xml (node->add_child("ColourConversion"));
+	}
+	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));
 }
 
 void
-VideoContent::setup_default_colour_conversion ()
+VideoContent::set_default_colour_conversion ()
 {
-	_colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6).conversion;
+	/* If there's no better offer we'll use Rec. 709 */
+	boost::mutex::scoped_lock lm (_mutex);
+	_colour_conversion = PresetColourConversion::from_id ("rec709").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 ();
-	float const vfr = d->video_frame_rate ();
-	
+	dcp::Size const vs = d->video_size ();
+	optional<double> const vfr = d->video_frame_rate ();
+	Frame vl = d->video_length ();
+	optional<double> const ar = d->sample_aspect_ratio ();
+	bool const yuv = d->yuv ();
+
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		_video_size = vs;
 		_video_frame_rate = vfr;
-		_original_video_frame_rate = vfr;
+		_video_length = vl;
+		_sample_aspect_ratio = ar;
+		_yuv = yuv;
+
+		/* Guess correct scale from size and sample aspect ratio */
+		_scale = VideoContentScale (
+			Ratio::nearest_from_ratio (double (_video_size.width) * ar.get_value_or (1) / _video_size.height)
+			);
 	}
-	
-	signal_changed (VideoContentProperty::VIDEO_SIZE);
-	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
-}
 
+	shared_ptr<const Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length);
 
-string
-VideoContent::information () 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 ()
-		);
-	
-	return s.str ();
+	_parent->signal_changed (VideoContentProperty::VIDEO_SIZE);
+	_parent->signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+	_parent->signal_changed (VideoContentProperty::VIDEO_SCALE);
+	_parent->signal_changed (ContentProperty::LENGTH);
 }
 
 void
@@ -224,15 +244,15 @@ 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);
+
+	_parent->signal_changed (VideoContentProperty::VIDEO_CROP);
 }
 
 void
@@ -243,11 +263,11 @@ VideoContent::set_right_crop (int c)
 		if (_crop.right == c) {
 			return;
 		}
-		
+
 		_crop.right = c;
 	}
-	
-	signal_changed (VideoContentProperty::VIDEO_CROP);
+
+	_parent->signal_changed (VideoContentProperty::VIDEO_CROP);
 }
 
 void
@@ -258,11 +278,11 @@ VideoContent::set_top_crop (int c)
 		if (_crop.top == c) {
 			return;
 		}
-		
+
 		_crop.top = c;
 	}
-	
-	signal_changed (VideoContentProperty::VIDEO_CROP);
+
+	_parent->signal_changed (VideoContentProperty::VIDEO_CROP);
 }
 
 void
@@ -273,11 +293,11 @@ VideoContent::set_bottom_crop (int c)
 		if (_crop.bottom == c) {
 			return;
 		}
-		
+
 		_crop.bottom = c;
 	}
 
-	signal_changed (VideoContentProperty::VIDEO_CROP);
+	_parent->signal_changed (VideoContentProperty::VIDEO_CROP);
 }
 
 void
@@ -292,7 +312,7 @@ VideoContent::set_scale (VideoContentScale s)
 		_scale = s;
 	}
 
-	signal_changed (VideoContentProperty::VIDEO_SCALE);
+	_parent->signal_changed (VideoContentProperty::VIDEO_SCALE);
 }
 
 /** @return string which includes everything about how this content looks */
@@ -300,13 +320,17 @@ string
 VideoContent::identifier () const
 {
 	SafeStringStream s;
-	s << Content::identifier()
-	  << "_" << crop().left
+	s << crop().left
 	  << "_" << crop().right
 	  << "_" << crop().top
 	  << "_" << crop().bottom
 	  << "_" << scale().id()
-	  << "_" << colour_conversion().identifier ();
+	  << "_" << _fade_in
+	  << "_" << _fade_out;
+
+	if (colour_conversion()) {
+		s << "_" << colour_conversion().get().identifier ();
+	}
 
 	return s.str ();
 }
@@ -319,22 +343,31 @@ VideoContent::set_video_frame_type (VideoFrameType t)
 		_video_frame_type = t;
 	}
 
-	signal_changed (VideoContentProperty::VIDEO_FRAME_TYPE);
+	_parent->signal_changed (VideoContentProperty::VIDEO_FRAME_TYPE);
 }
 
 string
 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()
+	string s = String::compose (
+		N_("video: length %1 frames, size %2x%3, rate %4"),
+		video_length_after_3d_combine(),
+		video_size().width,
+		video_size().height,
+		video_frame_rate()
 		);
+
+	if (sample_aspect_ratio ()) {
+		s += String::compose (N_(", sample aspect ratio %1"), (sample_aspect_ratio().get ()));
+	}
+
+	return s;
 }
 
-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,12 +375,23 @@ 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);
+	}
+
+	DCPOMATIC_ASSERT (false);
+}
+
+void
+VideoContent::unset_colour_conversion ()
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_colour_conversion = boost::optional<ColourConversion> ();
 	}
 
-	assert (false);
+	_parent->signal_changed (VideoContentProperty::COLOUR_CONVERSION);
 }
 
 void
@@ -358,43 +402,48 @@ VideoContent::set_colour_conversion (ColourConversion c)
 		_colour_conversion = c;
 	}
 
-	signal_changed (VideoContentProperty::COLOUR_CONVERSION);
+	_parent->signal_changed (VideoContentProperty::COLOUR_CONVERSION);
 }
 
-/** @return Video size after 3D split and crop */
-libdcp::Size
-VideoContent::video_size_after_crop () const
+void
+VideoContent::set_fade_in (Frame t)
 {
-	return crop().apply (video_size_after_3d_split ());
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_fade_in = t;
+	}
+
+	_parent->signal_changed (VideoContentProperty::VIDEO_FADE_IN);
 }
 
-/** @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
+void
+VideoContent::set_fade_out (Frame t)
 {
-	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);
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_fade_out = t;
+	}
+
+	_parent->signal_changed (VideoContentProperty::VIDEO_FADE_OUT);
+}
+
+/** @return Video size after 3D split and crop */
+dcp::Size
+VideoContent::video_size_after_crop () const
+{
+	return crop().apply (video_size_after_3d_split ());
 }
 
 void
 VideoContent::scale_and_crop_to_fit_width ()
 {
 	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-
+	DCPOMATIC_ASSERT (film);
 	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_left_crop (0);
+	set_right_crop (0);
 	set_top_crop (crop / 2);
 	set_bottom_crop (crop / 2);
 }
@@ -403,162 +452,141 @@ void
 VideoContent::scale_and_crop_to_fit_height ()
 {
 	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-
+	DCPOMATIC_ASSERT (film);
 	set_scale (VideoContentScale (film->container ()));
 
 	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);
+	set_top_crop (0);
+	set_bottom_crop (0);
 }
 
 void
-VideoContent::set_video_frame_rate (float r)
+VideoContent::set_video_frame_rate (double r)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		if (_video_frame_rate == r) {
 			return;
 		}
-		
+
 		_video_frame_rate = r;
 	}
-	
-	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+
+	_parent->signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
 }
 
-VideoContentScale::VideoContentScale (Ratio const * r)
-	: _ratio (r)
-	, _scale (true)
+/** @param f Frame index within the whole (untrimmed) content */
+optional<double>
+VideoContent::fade (Frame f) const
 {
+	DCPOMATIC_ASSERT (f >= 0);
 
-}
+	Frame const ts = _parent->trim_start().frames_round(video_frame_rate());
+	if ((f - ts) < fade_in()) {
+		return double (f - ts) / fade_in();
+	}
 
-VideoContentScale::VideoContentScale ()
-	: _ratio (0)
-	, _scale (false)
-{
+	Frame fade_out_start = video_length() - _parent->trim_end().frames_round(video_frame_rate()) - fade_out();
+	if (f >= fade_out_start) {
+		return 1 - double (f - fade_out_start) / fade_out();
+	}
 
+	return optional<double> ();
 }
 
-VideoContentScale::VideoContentScale (bool scale)
-	: _ratio (0)
-	, _scale (scale)
+string
+VideoContent::processing_description () const
 {
+	/* stringstream is OK here as this string is just for presentation to the user */
+	SafeStringStream d;
 
-}
+	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
+			);
 
-VideoContentScale::VideoContentScale (shared_ptr<cxml::Node> node)
-	: _ratio (0)
-	, _scale (true)
-{
-	optional<string> r = node->optional_string_child ("Ratio");
-	if (r) {
-		_ratio = Ratio::from_id (r.get ());
-	} else {
-		_scale = node->bool_child ("Scale");
-	}
-}
 
-void
-VideoContentScale::as_xml (xmlpp::Node* node) const
-{
-	if (_ratio) {
-		node->add_child("Ratio")->add_child_text (_ratio->id ());
-	} else {
-		node->add_child("Scale")->add_child_text (_scale ? "1" : "0");
-	}
-}
+		double ratio = video_size_after_3d_split().ratio ();
 
-string
-VideoContentScale::id () const
-{
-	SafeStringStream s;
-	
-	if (_ratio) {
-		s << _ratio->id ();
-	} else {
-		s << (_scale ? "S1" : "S0");
-	}
-	
-	return s.str ();
-}
+		if (sample_aspect_ratio ()) {
+			d << ", " << _("pixel aspect ratio") << " " << fixed << setprecision(2) << sample_aspect_ratio().get () << ":1";
+			ratio *= sample_aspect_ratio().get ();
+		}
 
-string
-VideoContentScale::name () const
-{
-	if (_ratio) {
-		return _ratio->nickname ();
+		d << "\n" << _("Display aspect ratio") << " " << fixed << setprecision(2) << ratio << ":1\n";
 	}
 
-	if (_scale) {
-		return _("No stretch");
+	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";
 	}
 
-	return _("No scale");
-}
+	shared_ptr<const Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	dcp::Size const container_size = film->frame_size ();
+	dcp::Size const scaled = scale().size (shared_from_this(), container_size, container_size);
 
-VideoContentScale
-VideoContentScale::from_id (string id)
-{
-	Ratio const * r = Ratio::from_id (id);
-	if (r) {
-		return VideoContentScale (r);
-	}
+	if (scaled != video_size_after_crop ()) {
+		d << String::compose (
+			_("Scaled to %1x%2"),
+			scaled.width, scaled.height
+			);
 
-	if (id == "S0") {
-		return VideoContentScale (false);
+		d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n";
 	}
 
-	return VideoContentScale (true);
-}
-		
-/** @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
-{
-	if (_ratio) {
-		return fit_ratio_within (_ratio->ratio (), display_container);
+	if (scaled != container_size) {
+		d << String::compose (
+			_("Padded with black to fit container %1 (%2x%3)"),
+			film->container()->nickname (),
+			container_size.width, container_size.height
+			);
+
+		d << " (" << fixed << setprecision(2) << container_size.ratio () << ":1)\n";
 	}
 
-	libdcp::Size const ac = c->video_size_after_crop ();
+	d << _("Content frame rate");
+	d << " " << fixed << setprecision(4) << video_frame_rate() << "\n";
 
-	/* 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);
-	}
+	FrameRateChange frc (video_frame_rate(), film->video_frame_rate ());
+	d << frc.description () << "\n";
 
-	/* 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 d.str ();
 }
 
 void
-VideoContentScale::setup_scales ()
+VideoContent::add_properties (list<UserProperty>& p) const
 {
-	vector<Ratio const *> ratios = Ratio::all ();
-	for (vector<Ratio const *>::const_iterator i = ratios.begin(); i != ratios.end(); ++i) {
-		_scales.push_back (VideoContentScale (*i));
-	}
-
-	_scales.push_back (VideoContentScale (true));
-	_scales.push_back (VideoContentScale (false));
+	p.push_back (UserProperty (_("Video"), _("Length"), raw_convert<string> (video_length ()), _("video frames")));
+	p.push_back (UserProperty (_("Video"), _("Size"), raw_convert<string> (video_size().width) + "x" + raw_convert<string> (video_size().height)));
+	p.push_back (UserProperty (_("Video"), _("Frame rate"), raw_convert<string> (video_frame_rate(), 5), _("frames per second")));
 }
 
-bool
-operator== (VideoContentScale const & a, VideoContentScale const & b)
+double
+VideoContent::video_frame_rate () const
 {
-	return (a.ratio() == b.ratio() && a.scale() == b.scale());
+	boost::mutex::scoped_lock lm (_mutex);
+	shared_ptr<const Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	return _video_frame_rate.get_value_or (film->video_frame_rate ());
 }
 
-bool
-operator!= (VideoContentScale const & a, VideoContentScale const & b)
+void
+VideoContent::set_video_length (Frame len)
 {
-	return (a.ratio() != b.ratio() || a.scale() != b.scale());
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_video_length = len;
+	}
+
+	_parent->signal_changed (ContentProperty::LENGTH);
 }