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

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index ba656e4c2..ca0c687a7 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -53,6 +53,9 @@ using std::cout;
 using std::vector;
 using std::min;
 using std::max;
+using std::stringstream;
+using std::fixed;
+using std::setprecision;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
@@ -63,9 +66,9 @@ VideoContent::VideoContent (shared_ptr<const Film> f)
 	, _video_length (0)
 	, _video_frame_rate (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
-	, _scale (Config::instance()->default_scale ())
+	, _scale (VideoContentScale (Ratio::from_id ("178")))
 {
-	setup_default_colour_conversion ();
+	set_default_colour_conversion (false);
 }
 
 VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len)
@@ -73,9 +76,9 @@ VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len
 	, _video_length (len)
 	, _video_frame_rate (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
-	, _scale (Config::instance()->default_scale ())
+	, _scale (VideoContentScale (Ratio::from_id ("178")))
 {
-	setup_default_colour_conversion ();
+	set_default_colour_conversion (false);
 }
 
 VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
@@ -83,9 +86,9 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	, _video_length (0)
 	, _video_frame_rate (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
-	, _scale (Config::instance()->default_scale ())
+	, _scale (VideoContentScale (Ratio::from_id ("178")))
 {
-	setup_default_colour_conversion ();
+	set_default_colour_conversion (false);
 }
 
 VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
@@ -103,6 +106,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, i
 	}
 	
 	_video_frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
+	_sample_aspect_ratio = node->optional_number_child<float> ("SampleAspectRatio");
 	_crop.left = node->number_child<int> ("LeftCrop");
 	_crop.right = node->number_child<int> ("RightCrop");
 	_crop.top = node->number_child<int> ("TopCrop");
@@ -116,8 +120,11 @@ VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, i
 	} 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"));
+	}
 	if (version >= 32) {
 		_fade_in = ContentTime (node->number_child<int64_t> ("FadeIn"));
 		_fade_out = ContentTime (node->number_child<int64_t> ("FadeOut"));
@@ -184,17 +191,29 @@ VideoContent::as_xml (xmlpp::Node* node) const
 	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)));
+	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("FadeIn")->add_child_text (raw_convert<string> (_fade_in.get ()));
 	node->add_child("FadeOut")->add_child_text (raw_convert<string> (_fade_out.get ()));
 }
 
 void
-VideoContent::setup_default_colour_conversion ()
+VideoContent::set_default_colour_conversion (bool signal)
 {
-	_colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion;
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion;
+	}
+
+	if (signal) {
+		signal_changed (VideoContentProperty::COLOUR_CONVERSION);
+	}
 }
 
 void
@@ -202,14 +221,23 @@ VideoContent::take_from_video_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 ();
-	float const vfr = d->video_frame_rate ();
+	optional<float> const vfr = d->video_frame_rate ();
 	ContentTime vl = d->video_length ();
+	optional<float> const ar = d->sample_aspect_ratio ();
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		_video_size = vs;
-		_video_frame_rate = vfr;
+		if (vfr) {
+			_video_frame_rate = vfr.get ();
+		}
 		_video_length = vl;
+		_sample_aspect_ratio = ar;
+
+		/* 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)
+			);
 	}
 
 	shared_ptr<const Film> film = _film.lock ();
@@ -218,6 +246,7 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
 	
 	signal_changed (VideoContentProperty::VIDEO_SIZE);
 	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+	signal_changed (VideoContentProperty::VIDEO_SCALE);
 	signal_changed (ContentProperty::LENGTH);
 }
 
@@ -237,6 +266,10 @@ VideoContent::information () const
 		video_size().height,
 		setprecision (3), video_size().ratio ()
 		);
+
+	if (sample_aspect_ratio ()) {
+		s << String::compose (_(" sample aspect ratio %1:1"), sample_aspect_ratio().get ());
+	}
 	
 	return s.str ();
 }
@@ -327,8 +360,11 @@ VideoContent::identifier () const
 	  << "_" << crop().right
 	  << "_" << crop().top
 	  << "_" << crop().bottom
-	  << "_" << scale().id()
-	  << "_" << colour_conversion().identifier ();
+	  << "_" << scale().id();
+
+	if (colour_conversion()) {
+		s << "_" << colour_conversion().get().identifier ();
+	}
 
 	return s.str ();
 }
@@ -347,13 +383,19 @@ VideoContent::set_video_frame_type (VideoFrameType t)
 string
 VideoContent::technical_summary () const
 {
-	return String::compose (
+	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 (sample_aspect_ratio ()) {
+		s += String::compose (_(", sample aspect ratio %1"), (sample_aspect_ratio().get ()));
+	}
+
+	return s;
 }
 
 dcp::Size
@@ -375,6 +417,17 @@ VideoContent::video_size_after_3d_split () const
 	assert (false);
 }
 
+void
+VideoContent::unset_colour_conversion ()
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_colour_conversion = boost::optional<ColourConversion> ();
+	}
+
+	signal_changed (VideoContentProperty::COLOUR_CONVERSION);
+}
+
 void
 VideoContent::set_colour_conversion (ColourConversion c)
 {
@@ -483,3 +536,62 @@ VideoContent::fade (VideoFrame f) const
 
 	return optional<float> ();
 }
+
+string
+VideoContent::processing_description () const
+{
+	/* stringstream is OK here as this string is just for presentation to the user */
+	stringstream 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
+			);
+
+		d << " (" << fixed << setprecision(2) << video_size_after_3d_split().ratio() << ":1)\n";
+	}
+
+	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";
+	}
+
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+
+	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);
+
+	if (scaled != video_size_after_crop ()) {
+		d << String::compose (
+			_("Scaled to %1x%2"),
+			scaled.width, scaled.height
+			);
+
+		d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n";
+	}
+	
+	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";
+	}
+
+	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 ();
+}