X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=708edee76a031e4ea8fe90624388564b173d77a0;hb=6f344b876689a1234a5eb75041882f06f5d9fe5c;hp=ba656e4c2410330da76bfb4a193facc646137c8d;hpb=f90d74f7a0382f0dc63eef81bd553d7a7b38edb2;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index ba656e4c2..708edee76 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,11 +17,8 @@ */ -#include -#include -#include -#include #include "video_content.h" +#include "content.h" #include "video_examiner.h" #include "compose.hpp" #include "ratio.h" @@ -33,10 +30,16 @@ #include "frame_rate_change.h" #include "log.h" #include "safe_stringstream.h" +#include "raw_convert.h" +#include +#include +#include +#include +#include #include "i18n.h" -#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); +#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; @@ -53,56 +56,37 @@ using std::cout; using std::vector; using std::min; using std::max; +using std::fixed; +using std::setprecision; +using std::list; +using std::pair; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; -using dcp::raw_convert; -VideoContent::VideoContent (shared_ptr f) - : Content (f) +VideoContent::VideoContent (Content* parent, shared_ptr film) + : _parent (parent) + , _film (film) , _video_length (0) - , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Config::instance()->default_scale ()) + , _scale (VideoContentScale (Ratio::from_id ("178"))) + , _yuv (true) + , _fade_in (0) + , _fade_out (0) { - setup_default_colour_conversion (); -} -VideoContent::VideoContent (shared_ptr f, DCPTime s, ContentTime len) - : Content (f, s) - , _video_length (len) - , _video_frame_rate (0) - , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Config::instance()->default_scale ()) -{ - setup_default_colour_conversion (); -} - -VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) - : Content (f, p) - , _video_length (0) - , _video_frame_rate (0) - , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Config::instance()->default_scale ()) -{ - setup_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, cxml::ConstNodePtr node, int version) - : Content (f, node) +VideoContent::VideoContent (Content* parent, shared_ptr film, cxml::ConstNodePtr node, int version) + : _parent (parent) + , _film (film) { _video_size.width = node->number_child ("VideoWidth"); _video_size.height = node->number_child ("VideoHeight"); - _video_frame_rate = node->number_child ("VideoFrameRate"); - - if (version < 32) { - /* DCP-o-matic 1.0 branch */ - _video_length = ContentTime::from_frames (node->number_child ("VideoLength"), _video_frame_rate); - } else { - _video_length = ContentTime (node->number_child ("VideoLength")); - } - + _video_frame_rate = node->optional_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"); _crop.left = node->number_child ("LeftCrop"); _crop.right = node->number_child ("RightCrop"); _crop.top = node->number_child ("TopCrop"); @@ -116,20 +100,30 @@ VideoContent::VideoContent (shared_ptr f, cxml::ConstNodePtr node, i } else { _scale = VideoContentScale (node->node_child ("Scale")); } - - _colour_conversion = ColourConversion (node->node_child ("ColourConversion")); + + + 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 = ContentTime (node->number_child ("FadeIn")); - _fade_out = ContentTime (node->number_child ("FadeOut")); + _fade_in = node->number_child ("FadeIn"); + _fade_out = node->number_child ("FadeOut"); + } else { + _fade_in = _fade_out = 0; } } -VideoContent::VideoContent (shared_ptr f, vector > c) - : Content (f, c) +VideoContent::VideoContent (Content* parent, shared_ptr film, vector > c) + : _parent (parent) + , _film (film) , _video_length (0) + , _yuv (false) { shared_ptr ref = dynamic_pointer_cast (c[0]); - assert (ref); + DCPOMATIC_ASSERT (ref); for (size_t i = 0; i < c.size(); ++i) { shared_ptr vc = dynamic_pointer_cast (c[i]); @@ -161,8 +155,12 @@ VideoContent::VideoContent (shared_ptr f, vector if (vc->fade_in() != ref->fade_in() || vc->fade_out() != ref->fade_out()) { throw JoinError (_("Content to be joined must have the same fades.")); } - + _video_length += vc->video_length (); + + if (vc->yuv ()) { + _yuv = true; + } } _video_size = ref->video_size (); @@ -179,22 +177,32 @@ 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.get ())); + 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)); + 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))); + 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")); - _colour_conversion.as_xml (node->add_child("ColourConversion")); - node->add_child("FadeIn")->add_child_text (raw_convert (_fade_in.get ())); - node->add_child("FadeOut")->add_child_text (raw_convert (_fade_out.get ())); + 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)); } void -VideoContent::setup_default_colour_conversion () +VideoContent::set_default_colour_conversion () { - _colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).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 @@ -202,43 +210,33 @@ VideoContent::take_from_video_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 (); - float const vfr = d->video_frame_rate (); - ContentTime vl = d->video_length (); + 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; + _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) + ); } shared_ptr film = _film.lock (); - assert (film); - LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length.frames (_video_frame_rate)); - - signal_changed (VideoContentProperty::VIDEO_SIZE); - signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); - signal_changed (ContentProperty::LENGTH); -} + DCPOMATIC_ASSERT (film); + LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length); - -string -VideoContent::information () const -{ - if (video_size().width == 0 || video_size().height == 0) { - return ""; - } - - SafeStringStream s; - - s << String::compose ( - _("%1x%2 pixels (%3:1)"), - video_size().width, - video_size().height, - setprecision (3), video_size().ratio () - ); - - return s.str (); + _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 @@ -246,15 +244,15 @@ 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); + + _parent->signal_changed (VideoContentProperty::VIDEO_CROP); } void @@ -265,11 +263,11 @@ VideoContent::set_right_crop (int c) if (_crop.right == c) { return; } - + _crop.right = c; } - - signal_changed (VideoContentProperty::VIDEO_CROP); + + _parent->signal_changed (VideoContentProperty::VIDEO_CROP); } void @@ -280,11 +278,11 @@ VideoContent::set_top_crop (int c) if (_crop.top == c) { return; } - + _crop.top = c; } - - signal_changed (VideoContentProperty::VIDEO_CROP); + + _parent->signal_changed (VideoContentProperty::VIDEO_CROP); } void @@ -295,11 +293,11 @@ VideoContent::set_bottom_crop (int c) if (_crop.bottom == c) { return; } - + _crop.bottom = c; } - signal_changed (VideoContentProperty::VIDEO_CROP); + _parent->signal_changed (VideoContentProperty::VIDEO_CROP); } void @@ -314,7 +312,7 @@ VideoContent::set_scale (VideoContentScale s) _scale = s; } - signal_changed (VideoContentProperty::VIDEO_SCALE); + _parent->signal_changed (VideoContentProperty::VIDEO_SCALE); } /** @return string which includes everything about how this content looks */ @@ -322,13 +320,17 @@ string VideoContent::identifier () const { SafeStringStream s; - s << Content::identifier() - << "_" << crop().left + s << crop().left << "_" << crop().right << "_" << crop().top << "_" << crop().bottom << "_" << scale().id() - << "_" << colour_conversion().identifier (); + << "_" << _fade_in + << "_" << _fade_out; + + if (colour_conversion()) { + s << "_" << colour_conversion().get().identifier (); + } return s.str (); } @@ -341,19 +343,25 @@ VideoContent::set_video_frame_type (VideoFrameType t) _video_frame_type = t; } - signal_changed (VideoContentProperty::VIDEO_FRAME_TYPE); + _parent->signal_changed (VideoContentProperty::VIDEO_FRAME_TYPE); } string VideoContent::technical_summary () const { - return String::compose ( - "video: length %1, size %2x%3, rate %4", - video_length_after_3d_combine().seconds(), + 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() ); + + if (sample_aspect_ratio ()) { + s += String::compose (N_(", sample aspect ratio %1"), (sample_aspect_ratio().get ())); + } + + return s; } dcp::Size @@ -372,7 +380,18 @@ VideoContent::video_size_after_3d_split () const return dcp::Size (s.width, s.height / 2); } - assert (false); + 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 @@ -383,29 +402,29 @@ VideoContent::set_colour_conversion (ColourConversion c) _colour_conversion = c; } - signal_changed (VideoContentProperty::COLOUR_CONVERSION); + _parent->signal_changed (VideoContentProperty::COLOUR_CONVERSION); } void -VideoContent::set_fade_in (ContentTime t) +VideoContent::set_fade_in (Frame t) { { boost::mutex::scoped_lock lm (_mutex); _fade_in = t; } - signal_changed (VideoContentProperty::VIDEO_FADE_IN); + _parent->signal_changed (VideoContentProperty::VIDEO_FADE_IN); } void -VideoContent::set_fade_out (ContentTime t) +VideoContent::set_fade_out (Frame t) { { boost::mutex::scoped_lock lm (_mutex); _fade_out = t; } - signal_changed (VideoContentProperty::VIDEO_FADE_OUT); + _parent->signal_changed (VideoContentProperty::VIDEO_FADE_OUT); } /** @return Video size after 3D split and crop */ @@ -415,26 +434,16 @@ VideoContent::video_size_after_crop () const return crop().apply (video_size_after_3d_split ()); } -/** @param t A time offset from the start of this piece of content. - * @return Corresponding time with respect to the content. - */ -ContentTime -VideoContent::dcp_time_to_content_time (DCPTime t) const -{ - shared_ptr film = _film.lock (); - assert (film); - return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate())); -} - void VideoContent::scale_and_crop_to_fit_width () { shared_ptr film = _film.lock (); - assert (film); - + DCPOMATIC_ASSERT (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)); + set_left_crop (0); + set_right_crop (0); set_top_crop (crop / 2); set_bottom_crop (crop / 2); } @@ -443,43 +452,141 @@ void VideoContent::scale_and_crop_to_fit_height () { shared_ptr film = _film.lock (); - assert (film); - + 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); + set_top_crop (0); + set_bottom_crop (0); } void -VideoContent::set_video_frame_rate (float r) +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); + + _parent->signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); } -optional -VideoContent::fade (VideoFrame f) const +/** @param f Frame index within the whole (untrimmed) content */ +optional +VideoContent::fade (Frame f) const { - assert (f >= 0); - - if (f < fade_in().frames (video_frame_rate ())) { - return float (f) / _fade_in.frames (video_frame_rate ()); + DCPOMATIC_ASSERT (f >= 0); + + Frame const ts = _parent->trim_start().frames_round(video_frame_rate()); + if ((f - ts) < fade_in()) { + return double (f - ts) / fade_in(); } - VideoFrame fade_out_start = ContentTime (video_length() - fade_out()).frames (video_frame_rate ()); + Frame fade_out_start = video_length() - _parent->trim_end().frames_round(video_frame_rate()) - fade_out(); if (f >= fade_out_start) { - return 1 - float (f - fade_out_start) / fade_out().frames (video_frame_rate ()); + return 1 - double (f - fade_out_start) / fade_out(); + } + + return optional (); +} + +string +VideoContent::processing_description () const +{ + /* stringstream is OK here as this string is just for presentation to the user */ + SafeStringStream 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 + ); + + + double 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 (); + } + + d << "\n" << _("Display aspect ratio") << " " << fixed << setprecision(2) << ratio << ":1\n"; + } + + 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"; + } + + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (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 ( + _("Scaled to %1x%2"), + scaled.width, scaled.height + ); + + d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n"; + } + + 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 + ); + + d << " (" << fixed << setprecision(2) << container_size.ratio () << ":1)\n"; + } + + d << _("Content frame rate"); + d << " " << fixed << setprecision(4) << video_frame_rate() << "\n"; + + FrameRateChange frc (video_frame_rate(), film->video_frame_rate ()); + d << frc.description () << "\n"; + + return d.str (); +} + +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"))); +} + +double +VideoContent::video_frame_rate () const +{ + 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 ()); +} + +void +VideoContent::set_video_length (Frame len) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _video_length = len; } - return optional (); + _parent->signal_changed (ContentProperty::LENGTH); }