X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=6853363678ff76173d6c1943038c3cb5da572359;hp=d104004f23c451ad00ed34c07c298d6e58a64c3e;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=e2cf12c4cbdad8aa54072e606d0ffe44a4c24398 diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index d104004f2..685336367 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-2019 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,26 +30,24 @@ #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__), LogEntry::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; using std::string; using std::setprecision; @@ -62,51 +62,74 @@ 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_type (VIDEO_FRAME_TYPE_2D) +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) { - set_default_colour_conversion (); -} -VideoContent::VideoContent (shared_ptr film, DCPTime s, Frame len) - : Content (film, s) - , _video_length (len) - , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (VideoContentScale (Ratio::from_id ("178"))) - , _yuv (true) - , _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_type (VIDEO_FRAME_TYPE_2D) - , _scale (VideoContentScale (Ratio::from_id ("178"))) - , _yuv (true) - , _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->optional_number_child ("VideoFrameRate"); - _video_length = node->number_child ("VideoLength"); - _video_frame_type = static_cast (node->number_child ("VideoFrameType")); + _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"); @@ -122,7 +145,6 @@ VideoContent::VideoContent (shared_ptr film, cxml::ConstNodePtr node _scale = VideoContentScale (node->node_child ("Scale")); } - if (node->optional_node_child ("ColourConversion")) { _colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version); } @@ -135,75 +157,78 @@ VideoContent::VideoContent (shared_ptr film, cxml::ConstNodePtr node } 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()) { + if (c[i]->video->scale() != ref->scale()) { throw JoinError (_("Content to be joined must have the same scale 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 (vc->yuv ()) { + 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 (); _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)); - if (_video_frame_rate) { - node->add_child("VideoFrameRate")->add_child_text (raw_convert (_video_frame_rate.get())); - } - 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 ())); } @@ -215,167 +240,84 @@ 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 -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 (); bool const yuv = d->yuv (); + VideoRange 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); - _video_size = vs; - _video_frame_rate = vfr; - _video_length = vl; + _size = vs; + _length = vl; _sample_aspect_ratio = ar; _yuv = yuv; - - /* Guess correct scale from size and sample aspect ratio */ - _scale = VideoContentScale ( - Ratio::nearest_from_ratio (double (_video_size.width) * ar.get_value_or (1) / _video_size.height) - ); - } - - LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length); - - 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; + _range = range; + + 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) + ); } - - _crop.left = c; } - signal_changed (VideoContentProperty::VIDEO_CROP); -} + LOG_GENERAL ("Video length obtained from header as %1 frames", _length); -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; - } - - signal_changed (VideoContentProperty::VIDEO_CROP); -} - -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; + char buffer[256]; + snprintf ( + 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, + _range == VIDEO_RANGE_FULL ? 0 : 1 + ); - if (colour_conversion()) { - s << "_" << colour_conversion().get().identifier (); - } + string s (buffer); - return s.str (); -} - -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 ()) { @@ -386,11 +328,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: @@ -404,104 +347,53 @@ VideoContent::video_size_after_3d_split () const DCPOMATIC_ASSERT (false); } -void -VideoContent::unset_colour_conversion () -{ - { - boost::mutex::scoped_lock lm (_mutex); - _colour_conversion = boost::optional (); - } - - signal_changed (VideoContentProperty::COLOUR_CONVERSION); -} - -void -VideoContent::set_colour_conversion (ColourConversion c) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _colour_conversion = c; - } - - signal_changed (VideoContentProperty::COLOUR_CONVERSION); -} - -void -VideoContent::set_fade_in (Frame t) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _fade_in = t; - } - - signal_changed (VideoContentProperty::VIDEO_FADE_IN); -} - -void -VideoContent::set_fade_out (Frame t) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _fade_out = t; - } - - signal_changed (VideoContentProperty::VIDEO_FADE_OUT); -} - /** @return Video size after 3D split and crop */ dcp::Size -VideoContent::video_size_after_crop () const +VideoContent::size_after_crop () const { - return crop().apply (video_size_after_3d_split ()); + return crop().apply (size_after_3d_split ()); } void -VideoContent::scale_and_crop_to_fit_width () +VideoContent::scale_and_crop_to_fit_width (shared_ptr film) { - set_scale (VideoContentScale (film()->container ())); + 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)); + 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 () +VideoContent::scale_and_crop_to_fit_height (shared_ptr film) { - set_scale (VideoContentScale (film()->container ())); + 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)); + 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); } -void -VideoContent::set_video_frame_rate (double r) -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_video_frame_rate == r) { - return; - } - - _video_frame_rate = r; - } - - signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); -} - -/** @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); - Frame const ts = trim_start().frames_round(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()) { return double (f - ts) / fade_in(); } - Frame fade_out_start = video_length() - trim_end().frames_round(video_frame_rate()) - fade_out(); + 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(); } @@ -510,90 +402,193 @@ VideoContent::fade (Frame f) const } string -VideoContent::processing_description () const +VideoContent::processing_description (shared_ptr film) const { - /* stringstream is OK here as this string is just for presentation to the user */ - SafeStringStream d; + string d; + char buffer[256]; - if (video_size().width && video_size().height) { - d << String::compose ( + if (size().width && size().height) { + d += String::compose ( _("Content video is %1x%2"), - video_size_after_3d_split().width, - video_size_after_3d_split().height + size_after_3d_split().width, + size_after_3d_split().height ); - double ratio = video_size_after_3d_split().ratio (); + double ratio = size_after_3d_split().ratio (); if (sample_aspect_ratio ()) { - d << ", " << _("pixel aspect ratio") << " " << fixed << setprecision(2) << sample_aspect_ratio().get () << ":1"; + snprintf (buffer, sizeof(buffer), _(", pixel aspect ratio %.2f:1"), sample_aspect_ratio().get()); + d += buffer; ratio *= sample_aspect_ratio().get (); } - d << "\n" << _("Display aspect ratio") << " " << fixed << setprecision(2) << ratio << ":1\n"; + snprintf (buffer, sizeof(buffer), _("\nDisplay aspect ratio %.2f:1"), ratio); + d += buffer; } - 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"), + 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 ); - d << " (" << fixed << setprecision(2) << cropped.ratio () << ":1)\n"; + snprintf (buffer, sizeof(buffer), " (%.2f:1)", cropped.ratio()); + d += buffer; } - 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 const container_size = film->frame_size (); + dcp::Size const scaled = scale().size (shared_from_this(), container_size, container_size); - if (scaled != video_size_after_crop ()) { - d << String::compose ( - _("Scaled to %1x%2"), + if (scaled != size_after_crop ()) { + d += String::compose ( + _("\nScaled to %1x%2"), scaled.width, scaled.height ); - d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n"; + snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), scaled.ratio()); + d += buffer; } if (scaled != container_size) { - d << String::compose ( - _("Padded with black to fit container %1 (%2x%3)"), - film()->container()->nickname (), + d += String::compose ( + _("\nPadded with black to fit container %1 (%2x%3)"), + film->container()->container_nickname (), container_size.width, container_size.height ); - d << " (" << fixed << setprecision(2) << container_size.ratio () << ":1)\n"; + 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 (); } - d << _("Content frame rate"); - d << " " << fixed << setprecision(4) << video_frame_rate() << "\n"; + return d; +} - FrameRateChange frc (video_frame_rate(), film()->video_frame_rate ()); - d << frc.description () << "\n"; +void +VideoContent::add_properties (list& p) const +{ + 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))); +} - return d.str (); +void +VideoContent::set_length (Frame len) +{ + maybe_set (_length, len, ContentProperty::LENGTH); } void -VideoContent::add_properties (list >& p) const +VideoContent::set_left_crop (int c) { - p.push_back (make_pair (_("Video length"), raw_convert (video_length ()) + " " + _("video frames"))); - p.push_back (make_pair (_("Video size"), raw_convert (video_size().width) + "x" + raw_convert (video_size().height))); - p.push_back (make_pair (_("Video frame rate"), raw_convert (video_frame_rate()) + " " + _("frames per second"))); + maybe_set (_crop.left, c, VideoContentProperty::CROP); } -list -VideoContent::reel_split_points () const +void +VideoContent::set_right_crop (int c) { - list t; - /* XXX: this is questionable; perhaps the position should be forced to be on a frame boundary */ - t.push_back (position().round_up (film()->video_frame_rate())); - return t; + maybe_set (_crop.right, c, VideoContentProperty::CROP); } -double -VideoContent::video_frame_rate () const +void +VideoContent::set_top_crop (int c) { - boost::mutex::scoped_lock lm (_mutex); - return _video_frame_rate.get_value_or (film()->video_frame_rate ()); + maybe_set (_crop.top, c, VideoContentProperty::CROP); +} + +void +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) +{ + maybe_set (_frame_type, t, VideoContentProperty::FRAME_TYPE); +} + +void +VideoContent::unset_colour_conversion () +{ + maybe_set (_colour_conversion, boost::optional (), VideoContentProperty::COLOUR_CONVERSION); +} + +void +VideoContent::set_colour_conversion (ColourConversion c) +{ + maybe_set (_colour_conversion, c, VideoContentProperty::COLOUR_CONVERSION); +} + +void +VideoContent::set_fade_in (Frame t) +{ + maybe_set (_fade_in, t, VideoContentProperty::FADE_IN); +} + +void +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) +{ + if (c->_colour_conversion) { + set_colour_conversion (c->_colour_conversion.get()); + } 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_fade_in (c->_fade_in); + set_fade_out (c->_fade_out); +} + +void +VideoContent::modify_position (shared_ptr film, DCPTime& pos) const +{ + pos = pos.round (film->video_frame_rate()); +} + +void +VideoContent::modify_trim_start (ContentTime& trim) const +{ + if (_parent->video_frame_rate()) { + trim = trim.round (_parent->video_frame_rate().get()); + } }