#include "log.h"
#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
-#include <dcp/colour_matrix.h>
#include <libxml++/libxml++.h>
#include <iomanip>
#include <iostream>
_scale = VideoContentScale (node->node_child ("Scale"));
}
-
if (node->optional_node_child ("ColourConversion")) {
_colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version);
}
_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);
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
);
VideoContent::add_properties (list<UserProperty>& p) const
{
p.push_back (UserProperty (UserProperty::VIDEO, _("Length"), length (), _("video frames")));
- p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), size().width + "x" + size().height));
+ p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), String::compose ("%1x%2", size().width, size().height)));
}
void
{
maybe_set (_fade_out, t, VideoContentProperty::FADE_OUT);
}
+
+void
+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;
+}
+
+void
+VideoContent::modify_position (DCPTime& pos) const
+{
+ pos = pos.ceil (_parent->film()->video_frame_rate());
+}
+
+void
+VideoContent::modify_trim_start (ContentTime& trim) const
+{
+ if (_parent->video_frame_rate()) {
+ trim = trim.ceil (_parent->video_frame_rate().get());
+ }
+}