X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=8cb30546371a7c43a19a3afd1529c7941ffbb0c4;hb=2abb944d5a1c000911de5aafa6079d10b5600db9;hp=967522e3645166d8455b834060947d4b673db121;hpb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 967522e36..8cb305463 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -30,9 +30,8 @@
 #include "exceptions.h"
 #include "frame_rate_change.h"
 #include "log.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
-#include <dcp/colour_matrix.h>
 #include <libxml++/libxml++.h>
 #include <iomanip>
 #include <iostream>
@@ -62,6 +61,7 @@ using std::pair;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+using dcp::raw_convert;
 
 VideoContent::VideoContent (Content* parent)
 	: ContentPart (parent)
@@ -140,7 +140,6 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
 		_scale = VideoContentScale (node->node_child ("Scale"));
 	}
 
-
 	if (node->optional_node_child ("ColourConversion")) {
 		_colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version);
 	}
@@ -235,6 +234,10 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
 	optional<double> const ar = d->sample_aspect_ratio ();
 	bool const yuv = d->yuv ();
 
+	ChangeSignaller<Content> cc1 (_parent, VideoContentProperty::SIZE);
+	ChangeSignaller<Content> cc2 (_parent, VideoContentProperty::SCALE);
+	ChangeSignaller<Content> cc3 (_parent, ContentProperty::LENGTH);
+
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		_size = vs;
@@ -242,10 +245,14 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
 		_sample_aspect_ratio = ar;
 		_yuv = yuv;
 
-		/* Guess correct scale from size and sample aspect ratio */
-		_scale = VideoContentScale (
-			Ratio::nearest_from_ratio (double (_size.width) * ar.get_value_or (1) / _size.height)
-			);
+		if (Config::instance()->default_scale_to ()) {
+			_scale = VideoContentScale (Config::instance()->default_scale_to ());
+		} else {
+			/* Guess correct scale from size and sample aspect ratio */
+			_scale = VideoContentScale (
+				Ratio::nearest_from_ratio (double (_size.width) * ar.get_value_or (1) / _size.height)
+				);
+		}
 	}
 
 	LOG_GENERAL ("Video length obtained from header as %1 frames", _length);
@@ -253,10 +260,6 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
 	if (d->video_frame_rate()) {
 		_parent->set_video_frame_rate (d->video_frame_rate().get());
 	}
-
-	_parent->signal_changed (VideoContentProperty::SIZE);
-	_parent->signal_changed (VideoContentProperty::SCALE);
-	_parent->signal_changed (ContentProperty::LENGTH);
 }
 
 /** @return string which includes everything about how this content looks */
@@ -406,11 +409,11 @@ VideoContent::processing_description () const
 	if ((crop().left || crop().right || crop().top || crop().bottom) && size() != dcp::Size (0, 0)) {
 		dcp::Size cropped = size_after_crop ();
 		d += String::compose (
-			_("Cropped to %1x%2"),
+			_("\nCropped to %1x%2"),
 			cropped.width, cropped.height
 			);
 
-		snprintf (buffer, sizeof(buffer), " (%.2f:1)\n", cropped.ratio());
+		snprintf (buffer, sizeof(buffer), " (%.2f:1)", cropped.ratio());
 		d += buffer;
 	}
 
@@ -420,33 +423,33 @@ VideoContent::processing_description () const
 
 	if (scaled != size_after_crop ()) {
 		d += String::compose (
-			_("Scaled to %1x%2"),
+			_("\nScaled to %1x%2"),
 			scaled.width, scaled.height
 			);
 
-		snprintf (buffer, sizeof(buffer), _(" (%.2f:1)\n"), scaled.ratio());
+		snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), scaled.ratio());
 		d += buffer;
 	}
 
 	if (scaled != container_size) {
 		d += String::compose (
-			_("Padded with black to fit container %1 (%2x%3)"),
-			film->container()->nickname (),
+			_("\nPadded with black to fit container %1 (%2x%3)"),
+			film->container()->container_nickname (),
 			container_size.width, container_size.height
 			);
 
-		snprintf (buffer, sizeof(buffer), _(" (%.2f:1)\n"), container_size.ratio());
+		snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), container_size.ratio());
 		d += buffer;
 	}
 
 	if (_parent->video_frame_rate()) {
 		double const vfr = _parent->video_frame_rate().get ();
 
-		snprintf (buffer, sizeof(buffer), _("Content frame rate %.4f\n"), vfr);
+		snprintf (buffer, sizeof(buffer), _("\nContent frame rate %.4f\n"), vfr);
 		d += buffer;
 
 		FrameRateChange frc (vfr, film->video_frame_rate ());
-		d += frc.description () + "\n";
+		d += frc.description ();
 	}
 
 	return d;
@@ -455,8 +458,8 @@ VideoContent::processing_description () const
 void
 VideoContent::add_properties (list<UserProperty>& p) const
 {
-	p.push_back (UserProperty (UserProperty::VIDEO, _("Length"), raw_convert<string> (length ()), _("video frames")));
-	p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), raw_convert<string> (size().width) + "x" + raw_convert<string> (size().height)));
+	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
@@ -524,3 +527,35 @@ VideoContent::set_fade_out (Frame t)
 {
 	maybe_set (_fade_out, t, VideoContentProperty::FADE_OUT);
 }
+
+void
+VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
+{
+	if (c->_colour_conversion) {
+		set_colour_conversion (c->_colour_conversion.get());
+	} else {
+		unset_colour_conversion ();
+	}
+	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_scale (c->_scale);
+	set_fade_in (c->_fade_in);
+	set_fade_out (c->_fade_out);
+}
+
+void
+VideoContent::modify_position (DCPTime& pos) const
+{
+	pos = pos.round (_parent->film()->video_frame_rate());
+}
+
+void
+VideoContent::modify_trim_start (ContentTime& trim) const
+{
+	if (_parent->video_frame_rate()) {
+		trim = trim.round (_parent->video_frame_rate().get());
+	}
+}