X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=1d1d010a95662193bc52ab84e5dacb2b8746fb10;hp=15445a68a4c7ea0a5e564b2fcd6fc52d4a9739b0;hb=7e39519864cf40256a31fb6d42818c1a02fa2d63;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5 diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 15445a68a..1d1d010a9 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-2022 Carl Hetherington This file is part of DCP-o-matic. @@ -18,18 +18,20 @@ */ -#include "video_content.h" -#include "content.h" -#include "video_examiner.h" + +#include "colour_conversion.h" #include "compose.hpp" -#include "ratio.h" #include "config.h" -#include "colour_conversion.h" -#include "util.h" -#include "film.h" +#include "content.h" +#include "dcpomatic_log.h" #include "exceptions.h" +#include "film.h" #include "frame_rate_change.h" #include "log.h" +#include "ratio.h" +#include "util.h" +#include "video_content.h" +#include "video_examiner.h" #include #include #include @@ -38,87 +40,100 @@ #include "i18n.h" -#define LOG_GENERAL(...) dcpomatic_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::USE = 0; +int const VideoContentProperty::SIZE = 1; +int const VideoContentProperty::FRAME_TYPE = 2; +int const VideoContentProperty::CROP = 3; int const VideoContentProperty::COLOUR_CONVERSION = 4; -int const VideoContentProperty::FADE_IN = 5; -int const VideoContentProperty::FADE_OUT = 6; +int const VideoContentProperty::FADE_IN = 5; +int const VideoContentProperty::FADE_OUT = 6; +int const VideoContentProperty::RANGE = 7; +int const VideoContentProperty::CUSTOM_RATIO = 8; +int const VideoContentProperty::CUSTOM_SIZE = 9; +int const VideoContentProperty::BURNT_SUBTITLE_LANGUAGE = 10; + -using std::string; -using std::setprecision; using std::cout; -using std::vector; -using std::min; -using std::max; +using std::dynamic_pointer_cast; using std::fixed; -using std::setprecision; using std::list; +using std::make_shared; +using std::max; +using std::min; using std::pair; -using boost::shared_ptr; +using std::setprecision; +using std::setprecision; +using std::shared_ptr; +using std::string; +using std::vector; 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"))) + , _frame_type (VideoFrameType::TWO_D) , _yuv (true) , _fade_in (0) , _fade_out (0) + , _range (VideoRange::FULL) { } + +/** @param video_range_hint Video range to use if none is given in the XML */ shared_ptr -VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) +VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version, VideoRange video_range_hint) { if (!node->optional_number_child ("VideoWidth")) { - return shared_ptr (); + return {}; } - return shared_ptr (new VideoContent (parent, node, version)); + return make_shared(parent, node, version, video_range_hint); } -VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int version) + +/** @param video_range_hint Video range to use if none is given in the XML */ +VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int version, VideoRange video_range_hint) : ContentPart (parent) { _size.width = node->number_child ("VideoWidth"); _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 +147,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")) { @@ -147,23 +181,48 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio _yuv = node->optional_bool_child("YUV").get_value_or (true); if (version >= 32) { + /* These should be VideoFadeIn and VideoFadeOut but we'll leave them like this until 2.18.x */ _fade_in = node->number_child ("FadeIn"); _fade_out = node->number_child ("FadeOut"); } else { _fade_in = _fade_out = 0; } + + auto video_range = node->optional_string_child("Range"); + if (!video_range) { + _range = video_range_hint; + } else if (*video_range == "full") { + _range = VideoRange::FULL; + } else { + _range = VideoRange::VIDEO; + } + + if (auto pixel_quanta = node->optional_node_child("PixelQuanta")) { + _pixel_quanta = PixelQuanta(pixel_quanta); + } + + auto burnt = node->optional_string_child("BurntSubtitleLanguage"); + if (burnt) { + _burnt_subtitle_language = dcp::LanguageTag (*burnt); + } + } + VideoContent::VideoContent (Content* parent, vector > c) : ContentPart (parent) , _length (0) , _yuv (false) { - shared_ptr ref = c[0]->video; + 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.")); } @@ -172,12 +231,16 @@ VideoContent::VideoContent (Content* parent, vector > c) throw JoinError (_("Content to be joined must have the same video frame type.")); } - if (c[i]->video->crop() != ref->crop()) { + if (c[i]->video->requested_crop() != ref->requested_crop()) { throw JoinError (_("Content to be joined must have the same crop.")); } - if (c[i]->video->scale() != ref->scale()) { - throw JoinError (_("Content to be joined must have the same scale setting.")); + 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()) { @@ -188,26 +251,37 @@ VideoContent::VideoContent (Content* parent, vector > c) throw JoinError (_("Content to be joined must have the same fades.")); } + if (c[i]->video->burnt_subtitle_language() != ref->burnt_subtitle_language()) { + throw JoinError (_("Content to be joined must have the same burnt subtitle language.")); + } + _length += c[i]->video->length (); if (c[i]->video->yuv ()) { _yuv = true; } + + _pixel_quanta = max(_pixel_quanta, c[i]->video->_pixel_quanta); } + _use = ref->use (); _size = ref->size (); _frame_type = ref->frame_type (); - _crop = ref->crop (); - _scale = ref->scale (); + _crop = ref->requested_crop (); + _custom_ratio = ref->custom_ratio (); _colour_conversion = ref->colour_conversion (); _fade_in = ref->fade_in (); _fade_out = ref->fade_out (); + _range = ref->range (); + _burnt_subtitle_language = ref->burnt_subtitle_language (); } + 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)); @@ -216,27 +290,40 @@ 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"); + _pixel_quanta.as_xml(node->add_child("PixelQuanta")); + if (_burnt_subtitle_language) { + node->add_child("BurntSubtitleLanguage")->add_child_text(_burnt_subtitle_language->to_string()); + } } 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 (); + auto const pixel_quanta = d->pixel_quanta (); - ChangeSignaller cc1 (_parent, VideoContentProperty::SIZE); - ChangeSignaller cc2 (_parent, VideoContentProperty::SCALE); - ChangeSignaller cc3 (_parent, ContentProperty::LENGTH); + ContentChangeSignaller cc1 (_parent, VideoContentProperty::SIZE); + ContentChangeSignaller cc2 (_parent, ContentProperty::LENGTH); + ContentChangeSignaller cc3 (_parent, VideoContentProperty::RANGE); { boost::mutex::scoped_lock lm (_mutex); @@ -244,15 +331,8 @@ 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; + _pixel_quanta = pixel_quanta; } LOG_GENERAL ("Video length obtained from header as %1 frames", _length); @@ -267,15 +347,20 @@ string VideoContent::identifier () const { char buffer[256]; + auto const crop = actual_crop(); snprintf ( - buffer, sizeof(buffer), "%d_%d_%d_%d_%s_%" PRId64 "_%" PRId64, - crop().left, - crop().right, - crop().top, - crop().bottom, - scale().id().c_str(), + 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, + _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); @@ -307,17 +392,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); } @@ -328,34 +413,13 @@ VideoContent::size_after_3d_split () const dcp::Size VideoContent::size_after_crop () const { - return crop().apply (size_after_3d_split ()); -} - -void -VideoContent::scale_and_crop_to_fit_width (shared_ptr 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); + return actual_crop().apply(size_after_3d_split()); } -void -VideoContent::scale_and_crop_to_fit_height (shared_ptr 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 (shared_ptr film, Frame f) const { @@ -363,12 +427,12 @@ VideoContent::fade (shared_ptr film, Frame f) const 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(); } @@ -377,7 +441,7 @@ VideoContent::fade (shared_ptr film, Frame f) const } string -VideoContent::processing_description (shared_ptr film) const +VideoContent::processing_description (shared_ptr film) { string d; char buffer[256]; @@ -402,8 +466,10 @@ VideoContent::processing_description (shared_ptr film) const d += buffer; } - if ((crop().left || crop().right || crop().top || crop().bottom) && size() != dcp::Size (0, 0)) { - dcp::Size cropped = size_after_crop (); + auto const crop = actual_crop(); + + if ((crop.left || crop.right || crop.top || crop.bottom) && size() != dcp::Size(0, 0)) { + auto const cropped = size_after_crop (); d += String::compose ( _("\nCropped to %1x%2"), cropped.width, cropped.height @@ -413,8 +479,8 @@ VideoContent::processing_description (shared_ptr film) const d += buffer; } - 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 ( @@ -463,6 +529,12 @@ VideoContent::set_length (Frame len) maybe_set (_length, len, ContentProperty::LENGTH); } +void +VideoContent::set_crop (Crop c) +{ + maybe_set (_crop, c, VideoContentProperty::CROP); +} + void VideoContent::set_left_crop (int c) { @@ -487,11 +559,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) @@ -523,6 +590,26 @@ 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::set_burnt_subtitle_language (boost::optional language) +{ + maybe_set (_burnt_subtitle_language, language, VideoContentProperty::BURNT_SUBTITLE_LANGUAGE); +} + + void VideoContent::take_settings_from (shared_ptr c) { @@ -531,16 +618,20 @@ 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); + set_burnt_subtitle_language (c->_burnt_subtitle_language); } + void VideoContent::modify_position (shared_ptr film, DCPTime& pos) const { @@ -554,3 +645,61 @@ 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 = std::lrint(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 _pixel_quanta.round (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); +} + + +Crop +VideoContent::actual_crop () const +{ + return Crop( + _pixel_quanta.round_x(_crop.left), + _pixel_quanta.round_x(_crop.right), + _pixel_quanta.round_y(_crop.top), + _pixel_quanta.round_y(_crop.bottom) + ); +} +