X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=b4ad30f70d1c77ad523b57ad4edc65ff00a93faa;hp=8c6f6c7eb7ae11c39aada00f73ed0113c76febca;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26 diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 8c6f6c7eb..b4ad30f70 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -1,23 +1,25 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2020 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "video_content.h" +#include "content.h" #include "video_examiner.h" #include "compose.hpp" #include "ratio.h" @@ -28,24 +30,26 @@ #include "exceptions.h" #include "frame_rate_change.h" #include "log.h" -#include "safe_stringstream.h" -#include "raw_convert.h" +#include "dcpomatic_log.h" +#include #include -#include +#include #include +#include #include "i18n.h" -#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); - -int const VideoContentProperty::VIDEO_SIZE = 0; -int const VideoContentProperty::VIDEO_FRAME_RATE = 1; -int const VideoContentProperty::VIDEO_FRAME_TYPE = 2; -int const VideoContentProperty::VIDEO_CROP = 3; -int const VideoContentProperty::VIDEO_SCALE = 4; +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::VIDEO_FADE_IN = 6; -int const VideoContentProperty::VIDEO_FADE_OUT = 7; +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; @@ -53,58 +57,81 @@ using std::cout; using std::vector; using std::min; using std::max; -using std::stringstream; using std::fixed; using std::setprecision; +using std::list; +using std::pair; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; - -VideoContent::VideoContent (shared_ptr film) - : Content (film) - , _video_length (0) - , _video_frame_rate (0) - , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (VideoContentScale (Ratio::from_id ("178"))) +using dcp::raw_convert; +using namespace dcpomatic; + +VideoContent::VideoContent (Content* parent) + : ContentPart (parent) + , _use (true) + , _length (0) + , _frame_type (VIDEO_FRAME_TYPE_2D) + , _yuv (true) , _fade_in (0) , _fade_out (0) + , _range (VIDEO_RANGE_FULL) { - set_default_colour_conversion (); -} -VideoContent::VideoContent (shared_ptr film, DCPTime s, Frame len) - : Content (film, s) - , _video_length (len) - , _video_frame_rate (0) - , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (VideoContentScale (Ratio::from_id ("178"))) - , _fade_in (0) - , _fade_out (0) -{ - set_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr film, boost::filesystem::path p) - : Content (film, p) - , _video_length (0) - , _video_frame_rate (0) - , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (VideoContentScale (Ratio::from_id ("178"))) - , _fade_in (0) - , _fade_out (0) +shared_ptr +VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) { - set_default_colour_conversion (); + if (!node->optional_number_child ("VideoWidth")) { + return shared_ptr (); + } + + return shared_ptr (new VideoContent (parent, node, version)); } -VideoContent::VideoContent (shared_ptr film, cxml::ConstNodePtr node, int version) - : Content (film, node) +VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int version) + : ContentPart (parent) { - _video_size.width = node->number_child ("VideoWidth"); - _video_size.height = node->number_child ("VideoHeight"); - _video_frame_rate = node->number_child ("VideoFrameRate"); - _video_length = node->number_child ("VideoLength"); - _video_frame_type = static_cast (node->number_child ("VideoFrameType")); - _sample_aspect_ratio = node->optional_number_child ("SampleAspectRatio"); + _size.width = node->number_child ("VideoWidth"); + _size.height = node->number_child ("VideoHeight"); + + /* Backwards compatibility */ + optional 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; + break; + case 1: + _frame_type = VIDEO_FRAME_TYPE_3D_LEFT_RIGHT; + break; + case 2: + _frame_type = VIDEO_FRAME_TYPE_3D_TOP_BOTTOM; + break; + case 3: + _frame_type = VIDEO_FRAME_TYPE_3D_ALTERNATE; + break; + case 4: + _frame_type = VIDEO_FRAME_TYPE_3D_LEFT; + break; + case 5: + _frame_type = VIDEO_FRAME_TYPE_3D_RIGHT; + break; + } + } else { + _frame_type = string_to_video_frame_type (node->string_child ("VideoFrameType")); + } + + _sample_aspect_ratio = node->optional_number_child ("SampleAspectRatio"); _crop.left = node->number_child ("LeftCrop"); _crop.right = node->number_child ("RightCrop"); _crop.top = node->number_child ("TopCrop"); @@ -113,256 +140,207 @@ VideoContent::VideoContent (shared_ptr film, cxml::ConstNodePtr node if (version <= 7) { optional 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) { + optional ratio = node->node_child("Scale")->optional_string_child("Ratio"); + if (ratio) { + _legacy_ratio = Ratio::from_id(ratio.get())->ratio(); + } + optional 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")) { _colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version); } + + _yuv = node->optional_bool_child("YUV").get_value_or (true); + if (version >= 32) { _fade_in = node->number_child ("FadeIn"); _fade_out = node->number_child ("FadeOut"); } 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 (shared_ptr film, vector > c) - : Content (film, c) - , _video_length (0) +VideoContent::VideoContent (Content* parent, vector > c) + : ContentPart (parent) + , _length (0) + , _yuv (false) { - shared_ptr ref = dynamic_pointer_cast (c[0]); + shared_ptr ref = c[0]->video; DCPOMATIC_ASSERT (ref); - for (size_t i = 0; i < c.size(); ++i) { - shared_ptr vc = dynamic_pointer_cast (c[i]); + for (size_t i = 1; i < c.size(); ++i) { - if (vc->video_size() != ref->video_size()) { - throw JoinError (_("Content to be joined must have the same picture size.")); + if (c[i]->video->use() != ref->use()) { + throw JoinError (_("Content to be joined must have all its video used or not used.")); } - if (vc->video_frame_rate() != ref->video_frame_rate()) { - throw JoinError (_("Content to be joined must have the same video frame rate.")); + if (c[i]->video->size() != ref->size()) { + throw JoinError (_("Content to be joined must have the same picture size.")); } - if (vc->video_frame_type() != ref->video_frame_type()) { + if (c[i]->video->frame_type() != ref->frame_type()) { throw JoinError (_("Content to be joined must have the same video frame type.")); } - if (vc->crop() != ref->crop()) { + if (c[i]->video->crop() != ref->crop()) { throw JoinError (_("Content to be joined must have the same crop.")); } - if (vc->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 (vc->colour_conversion() != ref->colour_conversion()) { + if (c[i]->video->colour_conversion() != ref->colour_conversion()) { throw JoinError (_("Content to be joined must have the same colour conversion.")); } - if (vc->fade_in() != ref->fade_in() || vc->fade_out() != ref->fade_out()) { + 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.")); } - _video_length += vc->video_length (); + _length += c[i]->video->length (); + + if (c[i]->video->yuv ()) { + _yuv = true; + } } - _video_size = ref->video_size (); - _video_frame_rate = ref->video_frame_rate (); - _video_frame_type = ref->video_frame_type (); + _use = ref->use (); + _size = ref->size (); + _frame_type = ref->frame_type (); _crop = ref->crop (); - _scale = ref->scale (); + _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("VideoLength")->add_child_text (raw_convert (_video_length)); - node->add_child("VideoWidth")->add_child_text (raw_convert (_video_size.width)); - node->add_child("VideoHeight")->add_child_text (raw_convert (_video_size.height)); - node->add_child("VideoFrameRate")->add_child_text (raw_convert (_video_frame_rate)); - node->add_child("VideoFrameType")->add_child_text (raw_convert (static_cast (_video_frame_type))); + 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)); + node->add_child("VideoFrameType")->add_child_text (video_frame_type_to_string (_frame_type)); if (_sample_aspect_ratio) { 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 == VIDEO_RANGE_FULL ? "full" : "video"); } void -VideoContent::set_default_colour_conversion () -{ - /* If there's no better offer we'll use Rec. 709 */ - boost::mutex::scoped_lock lm (_mutex); - _colour_conversion = PresetColourConversion::from_id ("rec709").conversion; -} - -void -VideoContent::take_from_video_examiner (shared_ptr d) +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 (); - optional const vfr = d->video_frame_rate (); Frame vl = d->video_length (); - optional const ar = d->sample_aspect_ratio (); - - { - boost::mutex::scoped_lock lm (_mutex); - _video_size = vs; - /* Default video frame rate to 24fps if the examiner doesn't know */ - _video_frame_rate = vfr.get_value_or (24); - _video_length = vl; - _sample_aspect_ratio = ar; - - /* Guess correct scale from size and sample aspect ratio */ - _scale = VideoContentScale ( - Ratio::nearest_from_ratio (float (_video_size.width) * ar.get_value_or (1) / _video_size.height) - ); - } + optional const ar = d->sample_aspect_ratio (); + bool const yuv = d->yuv (); + VideoRange const range = d->range (); - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length); + ChangeSignaller cc1 (_parent, VideoContentProperty::SIZE); + ChangeSignaller cc2 (_parent, VideoContentProperty::SCALE); + ChangeSignaller cc3 (_parent, ContentProperty::LENGTH); + ChangeSignaller cc4 (_parent, VideoContentProperty::RANGE); - set_default_colour_conversion (); - - signal_changed (VideoContentProperty::VIDEO_SIZE); - signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); - signal_changed (VideoContentProperty::VIDEO_SCALE); - signal_changed (ContentProperty::LENGTH); -} - -void -VideoContent::set_left_crop (int c) -{ { boost::mutex::scoped_lock lm (_mutex); - - if (_crop.left == c) { - return; - } - - _crop.left = c; - } - - signal_changed (VideoContentProperty::VIDEO_CROP); -} - -void -VideoContent::set_right_crop (int c) -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_crop.right == c) { - return; - } - - _crop.right = c; - } - - signal_changed (VideoContentProperty::VIDEO_CROP); -} - -void -VideoContent::set_top_crop (int c) -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_crop.top == c) { - return; - } - - _crop.top = c; + _size = vs; + _length = vl; + _sample_aspect_ratio = ar; + _yuv = yuv; + _range = range; } - signal_changed (VideoContentProperty::VIDEO_CROP); -} + LOG_GENERAL ("Video length obtained from header as %1 frames", _length); -void -VideoContent::set_bottom_crop (int c) -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_crop.bottom == c) { - return; - } - - _crop.bottom = c; + if (d->video_frame_rate()) { + _parent->set_video_frame_rate (d->video_frame_rate().get()); } - - signal_changed (VideoContentProperty::VIDEO_CROP); -} - -void -VideoContent::set_scale (VideoContentScale s) -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_scale == s) { - return; - } - - _scale = s; - } - - signal_changed (VideoContentProperty::VIDEO_SCALE); } /** @return string which includes everything about how this content looks */ string VideoContent::identifier () const { - SafeStringStream s; - s << Content::identifier() - << "_" << crop().left - << "_" << crop().right - << "_" << crop().top - << "_" << crop().bottom - << "_" << scale().id() - << "_" << _fade_in - << "_" << _fade_out; - - if (colour_conversion()) { - s << "_" << colour_conversion().get().identifier (); - } + char buffer[256]; + snprintf ( + 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, + _range == VIDEO_RANGE_FULL ? 0 : 1 + ); - return s.str (); -} + string s (buffer); -void -VideoContent::set_video_frame_type (VideoFrameType t) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _video_frame_type = t; + if (colour_conversion()) { + s += "_" + colour_conversion().get().identifier (); } - signal_changed (VideoContentProperty::VIDEO_FRAME_TYPE); + return s; } string VideoContent::technical_summary () const { string s = String::compose ( - N_("video: length %1 frames, size %2x%3, rate %4"), - video_length_after_3d_combine(), - video_size().width, - video_size().height, - video_frame_rate() + N_("video: length %1 frames, size %2x%3"), + length_after_3d_combine(), + size().width, + size().height ); if (sample_aspect_ratio ()) { @@ -373,11 +351,12 @@ VideoContent::technical_summary () const } dcp::Size -VideoContent::video_size_after_3d_split () const +VideoContent::size_after_3d_split () const { - dcp::Size const s = video_size (); - switch (video_frame_type ()) { + dcp::Size 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: @@ -391,181 +370,266 @@ VideoContent::video_size_after_3d_split () const DCPOMATIC_ASSERT (false); } -void -VideoContent::unset_colour_conversion (bool signal) +/** @return Video size after 3D split and crop */ +dcp::Size +VideoContent::size_after_crop () const { - { - boost::mutex::scoped_lock lm (_mutex); - _colour_conversion = boost::optional (); + return crop().apply (size_after_3d_split ()); +} + + +/** @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 +{ + DCPOMATIC_ASSERT (f >= 0); + + double const vfr = _parent->active_video_frame_rate(film); + + Frame const ts = _parent->trim_start().frames_round(vfr); + if ((f - ts) < fade_in()) { + return double (f - ts) / fade_in(); } - if (signal) { - signal_changed (VideoContentProperty::COLOUR_CONVERSION); + Frame 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(); } + + return optional (); } -void -VideoContent::set_colour_conversion (ColourConversion c) +string +VideoContent::processing_description (shared_ptr film) { - { - boost::mutex::scoped_lock lm (_mutex); - _colour_conversion = c; + string d; + char buffer[256]; + + if (size().width && size().height) { + d += String::compose ( + _("Content video is %1x%2"), + size_after_3d_split().width, + size_after_3d_split().height + ); + + + double ratio = size_after_3d_split().ratio (); + + if (sample_aspect_ratio ()) { + snprintf (buffer, sizeof(buffer), _(", pixel aspect ratio %.2f:1"), sample_aspect_ratio().get()); + d += buffer; + ratio *= sample_aspect_ratio().get (); + } + + snprintf (buffer, sizeof(buffer), _("\nDisplay aspect ratio %.2f:1"), ratio); + d += buffer; } - signal_changed (VideoContentProperty::COLOUR_CONVERSION); + if ((crop().left || crop().right || crop().top || crop().bottom) && size() != dcp::Size (0, 0)) { + dcp::Size cropped = size_after_crop (); + d += String::compose ( + _("\nCropped to %1x%2"), + cropped.width, cropped.height + ); + + snprintf (buffer, sizeof(buffer), " (%.2f:1)", cropped.ratio()); + d += buffer; + } + + dcp::Size const container_size = film->frame_size (); + dcp::Size const scaled = scaled_size (container_size); + + if (scaled != size_after_crop ()) { + d += String::compose ( + _("\nScaled to %1x%2"), + scaled.width, scaled.height + ); + + snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), scaled.ratio()); + d += buffer; + } + + if (scaled != container_size) { + d += String::compose ( + _("\nPadded with black to fit container %1 (%2x%3)"), + film->container()->container_nickname (), + container_size.width, container_size.height + ); + + snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), container_size.ratio()); + d += buffer; + } + + if (_parent->video_frame_rate()) { + double const vfr = _parent->video_frame_rate().get (); + + snprintf (buffer, sizeof(buffer), _("\nContent frame rate %.4f\n"), vfr); + d += buffer; + + FrameRateChange frc (vfr, film->video_frame_rate ()); + d += frc.description (); + } + + return d; } void -VideoContent::set_fade_in (Frame t) +VideoContent::add_properties (list& p) const { - { - boost::mutex::scoped_lock lm (_mutex); - _fade_in = t; - } + p.push_back (UserProperty (UserProperty::VIDEO, _("Length"), length (), _("video frames"))); + p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), String::compose ("%1x%2", size().width, size().height))); +} - signal_changed (VideoContentProperty::VIDEO_FADE_IN); +void +VideoContent::set_length (Frame len) +{ + maybe_set (_length, len, ContentProperty::LENGTH); } void -VideoContent::set_fade_out (Frame t) +VideoContent::set_left_crop (int c) { - { - boost::mutex::scoped_lock lm (_mutex); - _fade_out = t; - } + maybe_set (_crop.left, c, VideoContentProperty::CROP); +} - signal_changed (VideoContentProperty::VIDEO_FADE_OUT); +void +VideoContent::set_right_crop (int c) +{ + maybe_set (_crop.right, c, VideoContentProperty::CROP); } -/** @return Video size after 3D split and crop */ -dcp::Size -VideoContent::video_size_after_crop () const +void +VideoContent::set_top_crop (int c) { - return crop().apply (video_size_after_3d_split ()); + maybe_set (_crop.top, c, VideoContentProperty::CROP); } void -VideoContent::scale_and_crop_to_fit_width () +VideoContent::set_bottom_crop (int c) { - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); + maybe_set (_crop.bottom, c, VideoContentProperty::CROP); +} - set_scale (VideoContentScale (film->container ())); - int const crop = max (0, int (video_size().height - double (film->frame_size().height) * video_size().width / film->frame_size().width)); - set_top_crop (crop / 2); - set_bottom_crop (crop / 2); +void +VideoContent::set_frame_type (VideoFrameType t) +{ + maybe_set (_frame_type, t, VideoContentProperty::FRAME_TYPE); } void -VideoContent::scale_and_crop_to_fit_height () +VideoContent::unset_colour_conversion () { - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - - set_scale (VideoContentScale (film->container ())); - - int const crop = max (0, int (video_size().width - double (film->frame_size().width) * video_size().height / film->frame_size().height)); - set_left_crop (crop / 2); - set_right_crop (crop / 2); + maybe_set (_colour_conversion, boost::optional (), VideoContentProperty::COLOUR_CONVERSION); } void -VideoContent::set_video_frame_rate (float r) +VideoContent::set_colour_conversion (ColourConversion c) { - { - boost::mutex::scoped_lock lm (_mutex); - if (_video_frame_rate == r) { - return; - } + maybe_set (_colour_conversion, c, VideoContentProperty::COLOUR_CONVERSION); +} - _video_frame_rate = r; - } +void +VideoContent::set_fade_in (Frame t) +{ + maybe_set (_fade_in, t, VideoContentProperty::FADE_IN); +} - signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); +void +VideoContent::set_fade_out (Frame t) +{ + maybe_set (_fade_out, t, VideoContentProperty::FADE_OUT); } -optional -VideoContent::fade (Frame f) const +void +VideoContent::set_range (VideoRange r) { - DCPOMATIC_ASSERT (f >= 0); + maybe_set (_range, r, VideoContentProperty::RANGE); +} - if (f < fade_in()) { - return float (f) / fade_in(); - } +void +VideoContent::set_use (bool u) +{ + maybe_set (_use, u, VideoContentProperty::USE); +} - Frame fade_out_start = video_length() - fade_out(); - if (f >= fade_out_start) { - return 1 - float (f - fade_out_start) / fade_out(); +void +VideoContent::take_settings_from (shared_ptr c) +{ + if (c->_colour_conversion) { + set_colour_conversion (c->_colour_conversion.get()); + } else { + unset_colour_conversion (); } - - return optional (); + 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_custom_ratio (c->_custom_ratio); + set_custom_size (c->_custom_size); + set_fade_in (c->_fade_in); + set_fade_out (c->_fade_out); } -string -VideoContent::processing_description () const +void +VideoContent::modify_position (shared_ptr film, DCPTime& pos) const { - /* stringstream is OK here as this string is just for presentation to the user */ - stringstream d; - - if (video_size().width && video_size().height) { - d << String::compose ( - _("Content video is %1x%2"), - video_size_after_3d_split().width, - video_size_after_3d_split().height - ); - - - float ratio = video_size_after_3d_split().ratio (); - - if (sample_aspect_ratio ()) { - d << ", " << _("pixel aspect ratio") << " " << fixed << setprecision(2) << sample_aspect_ratio().get () << ":1"; - ratio *= sample_aspect_ratio().get (); - } + pos = pos.round (film->video_frame_rate()); +} - d << "\n" << _("Display aspect ratio") << " " << fixed << setprecision(2) << ratio << ":1\n"; +void +VideoContent::modify_trim_start (ContentTime& trim) const +{ + if (_parent->video_frame_rate()) { + trim = trim.round (_parent->video_frame_rate().get()); } +} - if ((crop().left || crop().right || crop().top || crop().bottom) && video_size() != dcp::Size (0, 0)) { - dcp::Size cropped = video_size_after_crop (); - d << String::compose ( - _("Cropped to %1x%2"), - cropped.width, cropped.height - ); - d << " (" << fixed << setprecision(2) << cropped.ratio () << ":1)\n"; +/** @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); } - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); + if (_custom_size) { + return *_custom_size; + } - dcp::Size const container_size = film->frame_size (); - dcp::Size const scaled = scale().size (dynamic_pointer_cast (shared_from_this ()), container_size, container_size); + dcp::Size size = size_after_crop (); + size.width *= _sample_aspect_ratio.get_value_or(1); - if (scaled != video_size_after_crop ()) { - d << String::compose ( - _("Scaled to %1x%2"), - scaled.width, scaled.height - ); + /* This is what we will return unless there is any legacy stuff to take into account */ + dcp::Size auto_size = fit_ratio_within (size.ratio(), film_container); - d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n"; + 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 = 0; } - if (scaled != container_size) { - d << String::compose ( - _("Padded with black to fit container %1 (%2x%3)"), - film->container()->nickname (), - container_size.width, container_size.height - ); + return auto_size; +} - d << " (" << fixed << setprecision(2) << container_size.ratio () << ":1)\n"; - } - d << _("Content frame rate"); - d << " " << fixed << setprecision(4) << video_frame_rate() << "\n"; +void +VideoContent::set_custom_ratio (optional ratio) +{ + maybe_set (_custom_ratio, ratio, VideoContentProperty::CUSTOM_RATIO); +} - FrameRateChange frc (video_frame_rate(), film->video_frame_rate ()); - d << frc.description () << "\n"; - return d.str (); +void +VideoContent::set_custom_size (optional size) +{ + maybe_set (_custom_size, size, VideoContentProperty::CUSTOM_SIZE); }