X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=216ad6784b22f1df56da7f2ebea36468f4fc7953;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=0dba555251465b1b77ed5af9326f3b0246c52a5e;hpb=bd5e8b83a3a18787241982efdae809d4db21f65d;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 0dba55525..216ad6784 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2021 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,17 @@ #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; +int const VideoContentProperty::CUSTOM_RATIO = 9; +int const VideoContentProperty::CUSTOM_SIZE = 10; using std::string; using std::setprecision; @@ -58,19 +61,22 @@ using std::fixed; using std::setprecision; using std::list; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; +using std::make_shared; using boost::optional; -using boost::dynamic_pointer_cast; +using std::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"))) + , _frame_type (VideoFrameType::TWO_D) , _yuv (true) , _fade_in (0) , _fade_out (0) + , _range (VideoRange::FULL) { } @@ -79,10 +85,10 @@ shared_ptr VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) { if (!node->optional_number_child ("VideoWidth")) { - return shared_ptr (); + return {}; } - return shared_ptr (new VideoContent (parent, node, version)); + return make_shared(parent, node, version); } VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int version) @@ -92,33 +98,34 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio _size.height = node->number_child ("VideoHeight"); /* Backwards compatibility */ - optional r = node->optional_number_child("VideoFrameRate"); + auto r = node->optional_number_child("VideoFrameRate"); if (r) { _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) { /* Snapshot of the VideoFrameType enum at version 34 */ switch (node->number_child ("VideoFrameType")) { case 0: - _frame_type = VIDEO_FRAME_TYPE_2D; + _frame_type = VideoFrameType::TWO_D; break; case 1: - _frame_type = VIDEO_FRAME_TYPE_3D_LEFT_RIGHT; + _frame_type = VideoFrameType::THREE_D_LEFT_RIGHT; break; case 2: - _frame_type = VIDEO_FRAME_TYPE_3D_TOP_BOTTOM; + _frame_type = VideoFrameType::THREE_D_TOP_BOTTOM; break; case 3: - _frame_type = VIDEO_FRAME_TYPE_3D_ALTERNATE; + _frame_type = VideoFrameType::THREE_D_ALTERNATE; break; case 4: - _frame_type = VIDEO_FRAME_TYPE_3D_LEFT; + _frame_type = VideoFrameType::THREE_D_LEFT; break; case 5: - _frame_type = VIDEO_FRAME_TYPE_3D_RIGHT; + _frame_type = VideoFrameType::THREE_D_RIGHT; break; } } else { @@ -132,12 +139,31 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio _crop.bottom = node->number_child ("BottomCrop"); if (version <= 7) { - optional r = node->optional_string_child ("Ratio"); + auto r = node->optional_string_child ("Ratio"); if (r) { - _scale = VideoContentScale (Ratio::from_id (r.get ())); + _legacy_ratio = Ratio::from_id(r.get())->ratio(); + } + } else if (version <= 37) { + auto ratio = node->node_child("Scale")->optional_string_child("Ratio"); + if (ratio) { + _legacy_ratio = Ratio::from_id(ratio.get())->ratio(); + } + auto scale = node->node_child("Scale")->optional_bool_child("Scale"); + if (scale) { + if (*scale) { + /* This is what we used to call "no stretch" */ + _legacy_ratio = _size.ratio(); + } else { + /* This is what we used to call "no scale" */ + _custom_size = _size; + } } + } else { - _scale = VideoContentScale (node->node_child ("Scale")); + _custom_ratio = node->optional_number_child("CustomRatio"); + if (node->optional_number_child("CustomWidth")) { + _custom_size = dcp::Size (node->number_child("CustomWidth"), node->number_child("CustomHeight")); + } } if (node->optional_node_child ("ColourConversion")) { @@ -152,12 +178,78 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio } else { _fade_in = _fade_out = 0; } + + _range = VideoRange::FULL; + if (node->optional_string_child("Range").get_value_or("full") == "video") { + _range = VideoRange::VIDEO; + } +} + +VideoContent::VideoContent (Content* parent, vector > c) + : ContentPart (parent) + , _length (0) + , _yuv (false) +{ + auto ref = c[0]->video; + DCPOMATIC_ASSERT (ref); + + 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.")); + } + + if (c[i]->video->frame_type() != ref->frame_type()) { + throw JoinError (_("Content to be joined must have the same video frame type.")); + } + + if (c[i]->video->crop() != ref->crop()) { + throw JoinError (_("Content to be joined must have the same crop.")); + } + + if (c[i]->video->custom_ratio() != ref->custom_ratio()) { + throw JoinError (_("Content to be joined must have the same custom ratio setting.")); + } + + if (c[i]->video->custom_size() != ref->custom_size()) { + throw JoinError (_("Content to be joined must have the same custom size setting.")); + } + + if (c[i]->video->colour_conversion() != ref->colour_conversion()) { + throw JoinError (_("Content to be joined must have the same colour conversion.")); + } + + if (c[i]->video->fade_in() != ref->fade_in() || c[i]->video->fade_out() != ref->fade_out()) { + throw JoinError (_("Content to be joined must have the same fades.")); + } + + _length += c[i]->video->length (); + + if (c[i]->video->yuv ()) { + _yuv = true; + } + } + + _use = ref->use (); + _size = ref->size (); + _frame_type = ref->frame_type (); + _crop = ref->crop (); + _custom_ratio = ref->custom_ratio (); + _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)); @@ -166,23 +258,36 @@ VideoContent::as_xml (xmlpp::Node* node) const node->add_child("SampleAspectRatio")->add_child_text (raw_convert (_sample_aspect_ratio.get ())); } _crop.as_xml (node); - _scale.as_xml (node->add_child("Scale")); + if (_custom_ratio) { + node->add_child("CustomRatio")->add_child_text(raw_convert(*_custom_ratio)); + } + if (_custom_size) { + node->add_child("CustomWidth")->add_child_text(raw_convert(_custom_size->width)); + node->add_child("CustomHeight")->add_child_text(raw_convert(_custom_size->height)); + } if (_colour_conversion) { _colour_conversion.get().as_xml (node->add_child("ColourConversion")); } 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 == VideoRange::FULL ? "full" : "video"); } void VideoContent::take_from_examiner (shared_ptr d) { /* These examiner calls could call other content methods which take a lock on the mutex */ - dcp::Size const vs = d->video_size (); - Frame vl = d->video_length (); - optional const ar = d->sample_aspect_ratio (); - bool const yuv = d->yuv (); + auto const vs = d->video_size (); + auto vl = d->video_length (); + auto const ar = d->sample_aspect_ratio (); + auto const yuv = d->yuv (); + auto const range = d->range (); + + 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); @@ -190,15 +295,7 @@ VideoContent::take_from_examiner (shared_ptr d) _length = vl; _sample_aspect_ratio = ar; _yuv = yuv; - - 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) - ); - } + _range = range; } LOG_GENERAL ("Video length obtained from header as %1 frames", _length); @@ -206,10 +303,6 @@ VideoContent::take_from_examiner (shared_ptr 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 */ @@ -218,14 +311,18 @@ 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_%f_%d_%d%" PRId64 "_%" PRId64 "_%d", + (_use ? 1 : 0), crop().left, crop().right, crop().top, crop().bottom, - scale().id().c_str(), + _custom_ratio.get_value_or(0), + _custom_size ? _custom_size->width : 0, + _custom_size ? _custom_size->height : 0, _fade_in, - _fade_out + _fade_out, + _range == VideoRange::FULL ? 0 : 1 ); string s (buffer); @@ -257,17 +354,17 @@ VideoContent::technical_summary () const dcp::Size VideoContent::size_after_3d_split () const { - dcp::Size const s = size (); + auto const s = size (); switch (frame_type ()) { - case VIDEO_FRAME_TYPE_2D: - case VIDEO_FRAME_TYPE_3D: - case VIDEO_FRAME_TYPE_3D_ALTERNATE: - case VIDEO_FRAME_TYPE_3D_LEFT: - case VIDEO_FRAME_TYPE_3D_RIGHT: + case VideoFrameType::TWO_D: + case VideoFrameType::THREE_D: + case VideoFrameType::THREE_D_ALTERNATE: + case VideoFrameType::THREE_D_LEFT: + case VideoFrameType::THREE_D_RIGHT: return s; - case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: + case VideoFrameType::THREE_D_LEFT_RIGHT: return dcp::Size (s.width / 2, s.height); - case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM: + case VideoFrameType::THREE_D_TOP_BOTTOM: return dcp::Size (s.width, s.height / 2); } @@ -281,48 +378,23 @@ VideoContent::size_after_crop () const return crop().apply (size_after_3d_split ()); } -void -VideoContent::scale_and_crop_to_fit_width () -{ - shared_ptr film = _parent->film (); - 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); - set_right_crop (0); - set_top_crop (crop / 2); - set_bottom_crop (crop / 2); -} - -void -VideoContent::scale_and_crop_to_fit_height () -{ - shared_ptr film = _parent->film (); - 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); - set_right_crop (crop / 2); - set_top_crop (0); - 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); + auto const ts = _parent->trim_start().frames_round(vfr); if ((f - ts) < fade_in()) { return double (f - ts) / fade_in(); } - Frame fade_out_start = length() - _parent->trim_end().frames_round(vfr) - fade_out(); + auto fade_out_start = length() - _parent->trim_end().frames_round(vfr) - fade_out(); if (f >= fade_out_start) { return 1 - double (f - fade_out_start) / fade_out(); } @@ -331,7 +403,7 @@ VideoContent::fade (Frame f) const } string -VideoContent::processing_description () const +VideoContent::processing_description (shared_ptr film) { string d; char buffer[256]; @@ -367,9 +439,8 @@ 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); + auto const container_size = film->frame_size (); + auto const scaled = scaled_size (container_size); if (scaled != size_after_crop ()) { d += String::compose ( @@ -442,11 +513,6 @@ VideoContent::set_bottom_crop (int c) maybe_set (_crop.bottom, c, VideoContentProperty::CROP); } -void -VideoContent::set_scale (VideoContentScale s) -{ - maybe_set (_scale, s, VideoContentProperty::SCALE); -} void VideoContent::set_frame_type (VideoFrameType t) @@ -478,6 +544,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) { @@ -486,20 +564,22 @@ 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); set_top_crop (c->_crop.top); set_bottom_crop (c->_crop.bottom); - set_scale (c->_scale); + set_custom_ratio (c->_custom_ratio); + set_custom_size (c->_custom_size); set_fade_in (c->_fade_in); set_fade_out (c->_fade_out); } 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 @@ -509,3 +589,48 @@ VideoContent::modify_trim_start (ContentTime& trim) const trim = trim.round (_parent->video_frame_rate().get()); } } + + +/** @param film_container The size of the container for the DCP that we are working on */ +dcp::Size +VideoContent::scaled_size (dcp::Size film_container) +{ + if (_custom_ratio) { + return fit_ratio_within(*_custom_ratio, film_container); + } + + if (_custom_size) { + return *_custom_size; + } + + auto size = size_after_crop (); + size.width *= _sample_aspect_ratio.get_value_or(1); + + /* This is what we will return unless there is any legacy stuff to take into account */ + auto auto_size = fit_ratio_within (size.ratio(), film_container); + + if (_legacy_ratio) { + if (fit_ratio_within(*_legacy_ratio, film_container) != auto_size) { + _custom_ratio = *_legacy_ratio; + _legacy_ratio = optional(); + return fit_ratio_within(*_custom_ratio, film_container); + } + _legacy_ratio = boost::optional(); + } + + return auto_size; +} + + +void +VideoContent::set_custom_ratio (optional ratio) +{ + maybe_set (_custom_ratio, ratio, VideoContentProperty::CUSTOM_RATIO); +} + + +void +VideoContent::set_custom_size (optional size) +{ + maybe_set (_custom_size, size, VideoContentProperty::CUSTOM_SIZE); +}