X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=d8d8adbf8becc2372bd331ef67e759a69284884d;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=8ccb921d04b06b932e63885be9adc302a0044b3d;hpb=fe0b4d0512d289caf3bc327a3791edcdd0fa3d0c;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 8ccb921d0..d8d8adbf8 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -30,6 +30,7 @@
 #include "exceptions.h"
 #include "frame_rate_change.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
@@ -38,8 +39,6 @@
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) _parent->film()->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-
 int const VideoContentProperty::SIZE	  = 0;
 int const VideoContentProperty::FRAME_TYPE  = 1;
 int const VideoContentProperty::CROP	  = 2;
@@ -62,6 +61,7 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 VideoContent::VideoContent (Content* parent)
 	: ContentPart (parent)
@@ -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;
@@ -256,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 */
@@ -332,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);
@@ -345,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);
@@ -357,15 +355,15 @@ VideoContent::scale_and_crop_to_fit_height ()
 	set_bottom_crop (0);
 }
 
-/** @param f Frame index within the whole (untrimmed) content */
+/** @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 (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()) {
@@ -381,7 +379,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];
@@ -417,7 +415,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);
 
@@ -434,7 +431,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
 			);
 
@@ -529,12 +526,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)
+{
+	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
 {
-	_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 (_parent->video_frame_rate()) {
+		trim = trim.round (_parent->video_frame_rate().get());
+	}
 }