X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=967522e3645166d8455b834060947d4b673db121;hp=4059c29d1eb9395894d21543bbaa5d2b93ed0ea5;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hpb=78664f8073256de51355c9162f61a4ae4fa560d7 diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 4059c29d1..967522e36 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2013-2016 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 . */ @@ -29,7 +30,6 @@ #include "exceptions.h" #include "frame_rate_change.h" #include "log.h" -#include "safe_stringstream.h" #include "raw_convert.h" #include #include @@ -39,16 +39,15 @@ #include "i18n.h" -#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); +#define LOG_GENERAL(...) _parent->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::COLOUR_CONVERSION = 5; -int const VideoContentProperty::VIDEO_FADE_IN = 6; -int const VideoContentProperty::VIDEO_FADE_OUT = 7; +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; using std::string; using std::setprecision; @@ -64,10 +63,10 @@ using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; -VideoContent::VideoContent (Content* parent, shared_ptr film) - : ContentPart (parent, film) - , _video_length (0) - , _video_frame_type (VIDEO_FRAME_TYPE_2D) +VideoContent::VideoContent (Content* parent) + : ContentPart (parent) + , _length (0) + , _frame_type (VIDEO_FRAME_TYPE_2D) , _scale (VideoContentScale (Ratio::from_id ("178"))) , _yuv (true) , _fade_in (0) @@ -76,14 +75,56 @@ VideoContent::VideoContent (Content* parent, shared_ptr film) } -VideoContent::VideoContent (Content* parent, shared_ptr film, cxml::ConstNodePtr node, int version) - : ContentPart (parent, film) +shared_ptr +VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) +{ + if (!node->optional_number_child ("VideoWidth")) { + return shared_ptr (); + } + + return shared_ptr (new VideoContent (parent, node, version)); +} + +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 ()); + } + + _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"); @@ -114,55 +155,49 @@ VideoContent::VideoContent (Content* parent, shared_ptr film, cxml:: } } -VideoContent::VideoContent (Content* parent, shared_ptr film, vector > c) - : ContentPart (parent, film) - , _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()) { + if (c[i]->video->size() != ref->size()) { throw JoinError (_("Content to be joined must have the same picture size.")); } - if (vc->video_frame_rate() != ref->video_frame_rate()) { - throw JoinError (_("Content to be joined must have the same video frame rate.")); - } - - 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 (); + _size = ref->size (); + _frame_type = ref->frame_type (); _crop = ref->crop (); _scale = ref->scale (); _colour_conversion = ref->colour_conversion (); @@ -174,13 +209,10 @@ 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("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 ())); } @@ -195,163 +227,71 @@ VideoContent::as_xml (xmlpp::Node* node) const } 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 (); { 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) + Ratio::nearest_from_ratio (double (_size.width) * ar.get_value_or (1) / _size.height) ); } - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length); - - _parent->signal_changed (VideoContentProperty::VIDEO_SIZE); - _parent->signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); - _parent->signal_changed (VideoContentProperty::VIDEO_SCALE); - _parent->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; - } - - _parent->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; - } - - _parent->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; - } - - _parent->signal_changed (VideoContentProperty::VIDEO_CROP); -} - -void -VideoContent::set_bottom_crop (int c) -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_crop.bottom == c) { - return; - } + LOG_GENERAL ("Video length obtained from header as %1 frames", _length); - _crop.bottom = c; + if (d->video_frame_rate()) { + _parent->set_video_frame_rate (d->video_frame_rate().get()); } - _parent->signal_changed (VideoContentProperty::VIDEO_CROP); -} - -void -VideoContent::set_scale (VideoContentScale s) -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_scale == s) { - return; - } - - _scale = s; - } - - _parent->signal_changed (VideoContentProperty::VIDEO_SCALE); + _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 */ string VideoContent::identifier () const { - SafeStringStream s; - s << 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_%s_%" PRId64 "_%" PRId64, + crop().left, + crop().right, + crop().top, + crop().bottom, + scale().id().c_str(), + _fade_in, + _fade_out + ); - 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 (); } - _parent->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 ()) { @@ -362,11 +302,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: @@ -380,65 +321,20 @@ 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 (); - } - - _parent->signal_changed (VideoContentProperty::COLOUR_CONVERSION); -} - -void -VideoContent::set_colour_conversion (ColourConversion c) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _colour_conversion = c; - } - - _parent->signal_changed (VideoContentProperty::COLOUR_CONVERSION); -} - -void -VideoContent::set_fade_in (Frame t) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _fade_in = t; - } - - _parent->signal_changed (VideoContentProperty::VIDEO_FADE_IN); -} - -void -VideoContent::set_fade_out (Frame t) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _fade_out = t; - } - - _parent->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 () { - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); + shared_ptr film = _parent->film (); 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); @@ -448,44 +344,32 @@ VideoContent::scale_and_crop_to_fit_width () void VideoContent::scale_and_crop_to_fit_height () { - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); + shared_ptr film = _parent->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)); + 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; - } - - _parent->signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); -} - /** @param f Frame index within the whole (untrimmed) content */ optional VideoContent::fade (Frame f) const { DCPOMATIC_ASSERT (f >= 0); - Frame const ts = _parent->trim_start().frames_round(video_frame_rate()); + shared_ptr film = _parent->film (); + + double const vfr = _parent->active_video_frame_rate (); + + 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() - _parent->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(); } @@ -496,94 +380,147 @@ VideoContent::fade (Frame f) const string VideoContent::processing_description () 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 ( + if ((crop().left || crop().right || crop().top || crop().bottom) && size() != dcp::Size (0, 0)) { + dcp::Size cropped = size_after_crop (); + d += String::compose ( _("Cropped to %1x%2"), cropped.width, cropped.height ); - d << " (" << fixed << setprecision(2) << cropped.ratio () << ":1)\n"; + snprintf (buffer, sizeof(buffer), " (%.2f:1)\n", cropped.ratio()); + d += buffer; } - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); + 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); - if (scaled != video_size_after_crop ()) { - d << String::compose ( + if (scaled != size_after_crop ()) { + d += String::compose ( _("Scaled to %1x%2"), scaled.width, scaled.height ); - d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n"; + snprintf (buffer, sizeof(buffer), _(" (%.2f:1)\n"), scaled.ratio()); + d += buffer; } if (scaled != container_size) { - d << String::compose ( + d += String::compose ( _("Padded with black to fit container %1 (%2x%3)"), film->container()->nickname (), container_size.width, container_size.height ); - d << " (" << fixed << setprecision(2) << container_size.ratio () << ":1)\n"; + snprintf (buffer, sizeof(buffer), _(" (%.2f:1)\n"), container_size.ratio()); + d += buffer; } - d << _("Content frame rate"); - d << " " << fixed << setprecision(4) << video_frame_rate() << "\n"; + if (_parent->video_frame_rate()) { + double const vfr = _parent->video_frame_rate().get (); - FrameRateChange frc (video_frame_rate(), film->video_frame_rate ()); - d << frc.description () << "\n"; + snprintf (buffer, sizeof(buffer), _("Content frame rate %.4f\n"), vfr); + d += buffer; - return d.str (); + FrameRateChange frc (vfr, film->video_frame_rate ()); + d += frc.description () + "\n"; + } + + return d; } void VideoContent::add_properties (list& p) const { - p.push_back (UserProperty (_("Video"), _("Length"), raw_convert (video_length ()), _("video frames"))); - p.push_back (UserProperty (_("Video"), _("Size"), raw_convert (video_size().width) + "x" + raw_convert (video_size().height))); - p.push_back (UserProperty (_("Video"), _("Frame rate"), raw_convert (video_frame_rate(), 5), _("frames per second"))); + p.push_back (UserProperty (UserProperty::VIDEO, _("Length"), raw_convert (length ()), _("video frames"))); + p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), raw_convert (size().width) + "x" + raw_convert (size().height))); } -double -VideoContent::video_frame_rate () const +void +VideoContent::set_length (Frame len) { - boost::mutex::scoped_lock lm (_mutex); - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - return _video_frame_rate.get_value_or (film->video_frame_rate ()); + maybe_set (_length, len, ContentProperty::LENGTH); +} + +void +VideoContent::set_left_crop (int c) +{ + maybe_set (_crop.left, c, VideoContentProperty::CROP); } void -VideoContent::set_video_length (Frame len) +VideoContent::set_right_crop (int c) { - { - boost::mutex::scoped_lock lm (_mutex); - _video_length = len; - } + maybe_set (_crop.right, c, VideoContentProperty::CROP); +} - _parent->signal_changed (ContentProperty::LENGTH); +void +VideoContent::set_top_crop (int c) +{ + 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); }