X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=6853363678ff76173d6c1943038c3cb5da572359;hp=81f4138fbef98248cf52aa16a7a8375c7d9a5adc;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=1fe6bd7f8ba059322b8357b2210f0fd590567ce2 diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 81f4138fb..685336367 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -30,6 +30,7 @@ #include "exceptions.h" #include "frame_rate_change.h" #include "log.h" +#include "dcpomatic_log.h" #include #include #include @@ -38,15 +39,15 @@ #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; -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; @@ -62,15 +63,18 @@ 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) + , _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) { } @@ -97,6 +101,7 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio _parent->set_video_frame_rate (r.get ()); } + _use = node->optional_bool_child("Use").get_value_or(true); _length = node->number_child ("VideoLength"); if (version <= 34) { @@ -152,6 +157,11 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio } 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 > c) @@ -164,6 +174,10 @@ VideoContent::VideoContent (Content* parent, vector > 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.")); } @@ -195,6 +209,7 @@ VideoContent::VideoContent (Content* parent, vector > c) } } + _use = ref->use (); _size = ref->size (); _frame_type = ref->frame_type (); _crop = ref->crop (); @@ -202,12 +217,14 @@ VideoContent::VideoContent (Content* parent, vector > c) _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 (_length)); node->add_child("VideoWidth")->add_child_text (raw_convert (_size.width)); node->add_child("VideoHeight")->add_child_text (raw_convert (_size.height)); @@ -223,6 +240,7 @@ VideoContent::as_xml (xmlpp::Node* node) const node->add_child("YUV")->add_child_text (_yuv ? "1" : "0"); node->add_child("FadeIn")->add_child_text (raw_convert (_fade_in)); node->add_child("FadeOut")->add_child_text (raw_convert (_fade_out)); + node->add_child("Range")->add_child_text(_range == VIDEO_RANGE_FULL ? "full" : "video"); } void @@ -233,10 +251,12 @@ VideoContent::take_from_examiner (shared_ptr d) Frame vl = d->video_length (); optional const ar = d->sample_aspect_ratio (); bool const yuv = d->yuv (); + VideoRange const range = d->range (); - ContentChange cc1 (_parent, VideoContentProperty::SIZE); - ContentChange cc2 (_parent, VideoContentProperty::SCALE); - ContentChange cc3 (_parent, ContentProperty::LENGTH); + ChangeSignaller cc1 (_parent, VideoContentProperty::SIZE); + ChangeSignaller cc2 (_parent, VideoContentProperty::SCALE); + ChangeSignaller cc3 (_parent, ContentProperty::LENGTH); + ChangeSignaller cc4 (_parent, VideoContentProperty::RANGE); { boost::mutex::scoped_lock lm (_mutex); @@ -244,6 +264,7 @@ VideoContent::take_from_examiner (shared_ptr d) _length = vl; _sample_aspect_ratio = ar; _yuv = yuv; + _range = range; if (Config::instance()->default_scale_to ()) { _scale = VideoContentScale (Config::instance()->default_scale_to ()); @@ -268,14 +289,16 @@ VideoContent::identifier () const { 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); @@ -332,10 +355,9 @@ VideoContent::size_after_crop () const } void -VideoContent::scale_and_crop_to_fit_width () +VideoContent::scale_and_crop_to_fit_width (shared_ptr film) { - shared_ptr 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 +367,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 film) { - shared_ptr 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 +378,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 -VideoContent::fade (Frame f) const +VideoContent::fade (shared_ptr film, Frame f) const { DCPOMATIC_ASSERT (f >= 0); - shared_ptr 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 +402,7 @@ VideoContent::fade (Frame f) const } string -VideoContent::processing_description () const +VideoContent::processing_description (shared_ptr film) const { string d; char buffer[256]; @@ -417,7 +438,6 @@ VideoContent::processing_description () const d += buffer; } - shared_ptr film = _parent->film (); dcp::Size const container_size = film->frame_size (); dcp::Size const scaled = scale().size (shared_from_this(), container_size, container_size); @@ -528,6 +548,18 @@ VideoContent::set_fade_out (Frame t) 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 c) { @@ -536,6 +568,7 @@ VideoContent::take_settings_from (shared_ptr 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); @@ -547,9 +580,9 @@ VideoContent::take_settings_from (shared_ptr c) } void -VideoContent::modify_position (DCPTime& pos) const +VideoContent::modify_position (shared_ptr film, DCPTime& pos) const { - pos = pos.round (_parent->film()->video_frame_rate()); + pos = pos.round (film->video_frame_rate()); } void