X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=15445a68a4c7ea0a5e564b2fcd6fc52d4a9739b0;hp=36438fc2a9041f34ec31027fd4c76ffb5f541746;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hpb=6c98bac6ec242f8113a23b29a00f740a0ffa1129

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 36438fc2a..15445a68a 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -38,7 +38,7 @@
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) _parent->film()->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
+#define LOG_GENERAL(...) dcpomatic_log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
 
 int const VideoContentProperty::SIZE	  = 0;
 int const VideoContentProperty::FRAME_TYPE  = 1;
@@ -234,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;
@@ -241,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);
@@ -252,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 */
@@ -328,10 +332,9 @@ VideoContent::size_after_crop () const
 }
 
 void
-VideoContent::scale_and_crop_to_fit_width ()
+VideoContent::scale_and_crop_to_fit_width (shared_ptr<const Film> film)
 {
-	shared_ptr<const Film> film = _parent->film ();
-	set_scale (VideoContentScale (film->container ()));
+	set_scale (VideoContentScale(film->container()));
 
 	int const crop = max (0, int (size().height - double (film->frame_size().height) * size().width / film->frame_size().width));
 	set_left_crop (0);
@@ -341,10 +344,9 @@ VideoContent::scale_and_crop_to_fit_width ()
 }
 
 void
-VideoContent::scale_and_crop_to_fit_height ()
+VideoContent::scale_and_crop_to_fit_height (shared_ptr<const Film> film)
 {
-	shared_ptr<const Film> film = _parent->film ();
-	set_scale (VideoContentScale (film->container ()));
+	set_scale (VideoContentScale(film->container()));
 
 	int const crop = max (0, int (size().width - double (film->frame_size().width) * size().height / film->frame_size().height));
 	set_left_crop (crop / 2);
@@ -355,13 +357,11 @@ VideoContent::scale_and_crop_to_fit_height ()
 
 /** @param f Frame index within the whole (untrimmed) content */
 optional<double>
-VideoContent::fade (Frame f) const
+VideoContent::fade (shared_ptr<const Film> film, Frame f) const
 {
 	DCPOMATIC_ASSERT (f >= 0);
 
-	shared_ptr<const Film> film = _parent->film ();
-
-	double const vfr = _parent->active_video_frame_rate ();
+	double const vfr = _parent->active_video_frame_rate(film);
 
 	Frame const ts = _parent->trim_start().frames_round(vfr);
 	if ((f - ts) < fade_in()) {
@@ -377,7 +377,7 @@ VideoContent::fade (Frame f) const
 }
 
 string
-VideoContent::processing_description () const
+VideoContent::processing_description (shared_ptr<const Film> film) const
 {
 	string d;
 	char buffer[256];
@@ -413,7 +413,6 @@ VideoContent::processing_description () const
 		d += buffer;
 	}
 
-	shared_ptr<const Film> film = _parent->film ();
 	dcp::Size const container_size = film->frame_size ();
 	dcp::Size const scaled = scale().size (shared_from_this(), container_size, container_size);
 
@@ -430,7 +429,7 @@ VideoContent::processing_description () const
 	if (scaled != container_size) {
 		d += String::compose (
 			_("\nPadded with black to fit container %1 (%2x%3)"),
-			film->container()->nickname (),
+			film->container()->container_nickname (),
 			container_size.width, container_size.height
 			);
 
@@ -525,12 +524,33 @@ VideoContent::set_fade_out (Frame t)
 }
 
 void
-VideoContent::use_template (shared_ptr<const VideoContent> c)
+VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
 {
-	_colour_conversion = c->_colour_conversion;
-	_frame_type = c->_frame_type;
-	_crop = c->_crop;
-	_scale = c->_scale;
-	_fade_in = c->_fade_in;
-	_fade_out = c->_fade_out;
+	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 (shared_ptr<const Film> film, DCPTime& pos) const
+{
+	pos = pos.round (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());
+	}
 }