/*
- Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "i18n.h"
-int const VideoContentProperty::SIZE = 0;
-int const VideoContentProperty::FRAME_TYPE = 1;
-int const VideoContentProperty::CROP = 2;
-int const VideoContentProperty::SCALE = 3;
-int const VideoContentProperty::COLOUR_CONVERSION = 4;
-int const VideoContentProperty::FADE_IN = 5;
-int const VideoContentProperty::FADE_OUT = 6;
+int const VideoContentProperty::USE = 0;
+int const VideoContentProperty::SIZE = 1;
+int const VideoContentProperty::FRAME_TYPE = 2;
+int const VideoContentProperty::CROP = 3;
+int const VideoContentProperty::SCALE = 4;
+int const VideoContentProperty::COLOUR_CONVERSION = 5;
+int const VideoContentProperty::FADE_IN = 6;
+int const VideoContentProperty::FADE_OUT = 7;
+int const VideoContentProperty::RANGE = 8;
using std::string;
using std::setprecision;
using boost::optional;
using boost::dynamic_pointer_cast;
using dcp::raw_convert;
+using namespace dcpomatic;
VideoContent::VideoContent (Content* parent)
: ContentPart (parent)
+ , _use (true)
, _length (0)
, _frame_type (VIDEO_FRAME_TYPE_2D)
, _scale (VideoContentScale (Ratio::from_id ("178")))
, _yuv (true)
, _fade_in (0)
, _fade_out (0)
+ , _range (VIDEO_RANGE_FULL)
{
}
_parent->set_video_frame_rate (r.get ());
}
+ _use = node->optional_bool_child("Use").get_value_or(true);
_length = node->number_child<Frame> ("VideoLength");
if (version <= 34) {
} else {
_fade_in = _fade_out = 0;
}
+
+ _range = VIDEO_RANGE_FULL;
+ if (node->optional_string_child("Range").get_value_or("full") == "video") {
+ _range = VIDEO_RANGE_VIDEO;
+ }
}
VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
for (size_t i = 1; i < c.size(); ++i) {
+ if (c[i]->video->use() != ref->use()) {
+ throw JoinError (_("Content to be joined must have all its video used or not used."));
+ }
+
if (c[i]->video->size() != ref->size()) {
throw JoinError (_("Content to be joined must have the same picture size."));
}
}
}
+ _use = ref->use ();
_size = ref->size ();
_frame_type = ref->frame_type ();
_crop = ref->crop ();
_colour_conversion = ref->colour_conversion ();
_fade_in = ref->fade_in ();
_fade_out = ref->fade_out ();
+ _range = ref->range ();
}
void
VideoContent::as_xml (xmlpp::Node* node) const
{
boost::mutex::scoped_lock lm (_mutex);
+ node->add_child("Use")->add_child_text (_use ? "1" : "0");
node->add_child("VideoLength")->add_child_text (raw_convert<string> (_length));
node->add_child("VideoWidth")->add_child_text (raw_convert<string> (_size.width));
node->add_child("VideoHeight")->add_child_text (raw_convert<string> (_size.height));
node->add_child("YUV")->add_child_text (_yuv ? "1" : "0");
node->add_child("FadeIn")->add_child_text (raw_convert<string> (_fade_in));
node->add_child("FadeOut")->add_child_text (raw_convert<string> (_fade_out));
+ node->add_child("Range")->add_child_text(_range == VIDEO_RANGE_FULL ? "full" : "video");
}
void
Frame vl = d->video_length ();
optional<double> const ar = d->sample_aspect_ratio ();
bool const yuv = d->yuv ();
+ VideoRange const range = d->range ();
ChangeSignaller<Content> cc1 (_parent, VideoContentProperty::SIZE);
ChangeSignaller<Content> cc2 (_parent, VideoContentProperty::SCALE);
ChangeSignaller<Content> cc3 (_parent, ContentProperty::LENGTH);
+ ChangeSignaller<Content> cc4 (_parent, VideoContentProperty::RANGE);
{
boost::mutex::scoped_lock lm (_mutex);
_length = vl;
_sample_aspect_ratio = ar;
_yuv = yuv;
+ _range = range;
if (Config::instance()->default_scale_to ()) {
_scale = VideoContentScale (Config::instance()->default_scale_to ());
{
char buffer[256];
snprintf (
- buffer, sizeof(buffer), "%d_%d_%d_%d_%s_%" PRId64 "_%" PRId64,
+ buffer, sizeof(buffer), "%d_%d_%d_%d_%d_%s_%" PRId64 "_%" PRId64 "_%d",
+ (_use ? 1 : 0),
crop().left,
crop().right,
crop().top,
crop().bottom,
scale().id().c_str(),
_fade_in,
- _fade_out
+ _fade_out,
+ _range == VIDEO_RANGE_FULL ? 0 : 1
);
string s (buffer);
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 (shared_ptr<const Film> film, Frame f) const
{
maybe_set (_fade_out, t, VideoContentProperty::FADE_OUT);
}
+void
+VideoContent::set_range (VideoRange r)
+{
+ maybe_set (_range, r, VideoContentProperty::RANGE);
+}
+
+void
+VideoContent::set_use (bool u)
+{
+ maybe_set (_use, u, VideoContentProperty::USE);
+}
+
void
VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
{
} else {
unset_colour_conversion ();
}
+ set_use (c->_use);
set_frame_type (c->_frame_type);
set_left_crop (c->_crop.left);
set_right_crop (c->_crop.right);