X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=5cf4704ea73585f4bcb306cfcfa82d7dec861e12;hb=6154d5f85664a26e9490c9120bef5e742af94490;hp=05f5c538eee2a81c6344f603ab2bfa3e60dfd2cb;hpb=0da7c88a1afb221f97e2e96c159b1a984e4e2f71;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 05f5c538e..5cf4704ea 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -17,10 +17,6 @@ */ -#include -#include -#include -#include #include "video_content.h" #include "video_examiner.h" #include "compose.hpp" @@ -31,38 +27,48 @@ #include "film.h" #include "exceptions.h" #include "frame_rate_change.h" +#include "log.h" +#include "safe_stringstream.h" +#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::COLOUR_CONVERSION = 5; +int const VideoContentProperty::VIDEO_FADE_IN = 6; +int const VideoContentProperty::VIDEO_FADE_OUT = 7; using std::string; -using std::stringstream; using std::setprecision; using std::cout; using std::vector; using std::min; using std::max; +using std::stringstream; +using std::fixed; +using std::setprecision; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; using dcp::raw_convert; -vector VideoContentScale::_scales; - VideoContent::VideoContent (shared_ptr f) : Content (f) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Ratio::from_id ("185")) + , _scale (VideoContentScale (Ratio::from_id ("178"))) { - setup_default_colour_conversion (); + set_default_colour_conversion (false); } VideoContent::VideoContent (shared_ptr f, DCPTime s, ContentTime len) @@ -70,9 +76,9 @@ VideoContent::VideoContent (shared_ptr f, DCPTime s, ContentTime len , _video_length (len) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Ratio::from_id ("185")) + , _scale (VideoContentScale (Ratio::from_id ("178"))) { - setup_default_colour_conversion (); + set_default_colour_conversion (false); } VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) @@ -80,9 +86,9 @@ VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Ratio::from_id ("185")) + , _scale (VideoContentScale (Ratio::from_id ("178"))) { - setup_default_colour_conversion (); + set_default_colour_conversion (false); } VideoContent::VideoContent (shared_ptr f, cxml::ConstNodePtr node, int version) @@ -96,10 +102,11 @@ VideoContent::VideoContent (shared_ptr f, cxml::ConstNodePtr node, i /* 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_length = ContentTime (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"); @@ -113,8 +120,15 @@ 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")); + } + if (version >= 32) { + _fade_in = ContentTime (node->number_child ("FadeIn")); + _fade_out = ContentTime (node->number_child ("FadeOut")); + } } VideoContent::VideoContent (shared_ptr f, vector > c) @@ -122,7 +136,7 @@ VideoContent::VideoContent (shared_ptr f, vector , _video_length (0) { 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]); @@ -151,6 +165,10 @@ VideoContent::VideoContent (shared_ptr f, vector 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()) { + throw JoinError (_("Content to be joined must have the same fades.")); + } + _video_length += vc->video_length (); } @@ -160,6 +178,8 @@ VideoContent::VideoContent (shared_ptr f, vector _crop = ref->crop (); _scale = ref->scale (); _colour_conversion = ref->colour_conversion (); + _fade_in = ref->fade_in (); + _fade_out = ref->fade_out (); } void @@ -171,15 +191,29 @@ VideoContent::as_xml (xmlpp::Node* node) const 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))); + 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")); + if (_colour_conversion) { + _colour_conversion.get().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 ())); } void -VideoContent::setup_default_colour_conversion () +VideoContent::set_default_colour_conversion (bool signal) { - _colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion; + { + boost::mutex::scoped_lock lm (_mutex); + _colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz); + } + + if (signal) { + signal_changed (VideoContentProperty::COLOUR_CONVERSION); + } } void @@ -187,36 +221,32 @@ 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 (); - + optional const vfr = d->video_frame_rate (); + ContentTime vl = d->video_length (); + optional const ar = d->sample_aspect_ratio (); + { boost::mutex::scoped_lock lm (_mutex); _video_size = vs; - _video_frame_rate = vfr; + /* 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) + ); } + + shared_ptr film = _film.lock (); + DCPOMATIC_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); -} - - -string -VideoContent::information () const -{ - if (video_size().width == 0 || video_size().height == 0) { - return ""; - } - - stringstream s; - - s << String::compose ( - _("%1x%2 pixels (%3:1)"), - video_size().width, - video_size().height, - setprecision (3), video_size().ratio () - ); - - return s.str (); + signal_changed (VideoContentProperty::VIDEO_SCALE); + signal_changed (ContentProperty::LENGTH); } void @@ -299,14 +329,17 @@ VideoContent::set_scale (VideoContentScale s) string VideoContent::identifier () const { - stringstream s; + SafeStringStream s; s << Content::identifier() << "_" << crop().left << "_" << crop().right << "_" << crop().top << "_" << crop().bottom - << "_" << scale().id() - << "_" << colour_conversion().identifier (); + << "_" << scale().id(); + + if (colour_conversion()) { + s << "_" << colour_conversion().get().identifier (); + } return s.str (); } @@ -325,13 +358,19 @@ VideoContent::set_video_frame_type (VideoFrameType t) string VideoContent::technical_summary () const { - return String::compose ( + string s = String::compose ( "video: length %1, size %2x%3, rate %4", video_length_after_3d_combine().seconds(), video_size().width, video_size().height, video_frame_rate() ); + + if (sample_aspect_ratio ()) { + s += String::compose (_(", sample aspect ratio %1"), (sample_aspect_ratio().get ())); + } + + return s; } dcp::Size @@ -350,7 +389,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 (); + } + + signal_changed (VideoContentProperty::COLOUR_CONVERSION); } void @@ -364,6 +414,28 @@ VideoContent::set_colour_conversion (ColourConversion c) signal_changed (VideoContentProperty::COLOUR_CONVERSION); } +void +VideoContent::set_fade_in (ContentTime t) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _fade_in = t; + } + + signal_changed (VideoContentProperty::VIDEO_FADE_IN); +} + +void +VideoContent::set_fade_out (ContentTime 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 @@ -378,7 +450,7 @@ ContentTime VideoContent::dcp_time_to_content_time (DCPTime t) const { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate())); } @@ -386,7 +458,7 @@ void VideoContent::scale_and_crop_to_fit_width () { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); set_scale (VideoContentScale (film->container ())); @@ -399,7 +471,7 @@ void VideoContent::scale_and_crop_to_fit_height () { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); set_scale (VideoContentScale (film->container ())); @@ -408,123 +480,93 @@ VideoContent::scale_and_crop_to_fit_height () set_right_crop (crop / 2); } -VideoContentScale::VideoContentScale (Ratio const * r) - : _ratio (r) - , _scale (true) -{ - -} - -VideoContentScale::VideoContentScale () - : _ratio (0) - , _scale (false) -{ - -} - -VideoContentScale::VideoContentScale (bool scale) - : _ratio (0) - , _scale (scale) -{ - -} - -VideoContentScale::VideoContentScale (cxml::NodePtr node) - : _ratio (0) - , _scale (true) -{ - optional r = node->optional_string_child ("Ratio"); - if (r) { - _ratio = Ratio::from_id (r.get ()); - } else { - _scale = node->bool_child ("Scale"); - } -} - void -VideoContentScale::as_xml (xmlpp::Node* node) const +VideoContent::set_video_frame_rate (float r) { - if (_ratio) { - node->add_child("Ratio")->add_child_text (_ratio->id ()); - } else { - node->add_child("Scale")->add_child_text (_scale ? "1" : "0"); + { + boost::mutex::scoped_lock lm (_mutex); + if (_video_frame_rate == r) { + return; + } + + _video_frame_rate = r; } + + signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); } -string -VideoContentScale::id () const +optional +VideoContent::fade (VideoFrame f) const { - stringstream s; + DCPOMATIC_ASSERT (f >= 0); - if (_ratio) { - s << _ratio->id () << "_"; - } else { - s << (_scale ? "S1" : "S0"); + if (f < fade_in().frames (video_frame_rate ())) { + return float (f) / _fade_in.frames (video_frame_rate ()); } - - return s.str (); + + VideoFrame fade_out_start = ContentTime (video_length() - fade_out()).frames (video_frame_rate ()); + if (f >= fade_out_start) { + return 1 - float (f - fade_out_start) / fade_out().frames (video_frame_rate ()); + } + + return optional (); } string -VideoContentScale::name () const +VideoContent::processing_description () const { - if (_ratio) { - return _ratio->nickname (); - } + /* 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 + ); - if (_scale) { - return _("No stretch"); + d << " (" << fixed << setprecision(2) << video_size_after_3d_split().ratio() << ":1)\n"; } - return _("No scale"); -} + 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 + ); -/** @param display_container Size of the container that we are displaying this content in. - * @param film_container The size of the film's image. - */ -dcp::Size -VideoContentScale::size (shared_ptr c, dcp::Size display_container, dcp::Size film_container) const -{ - if (_ratio) { - return fit_ratio_within (_ratio->ratio (), display_container); + d << " (" << fixed << setprecision(2) << cropped.ratio () << ":1)\n"; } - dcp::Size const ac = c->video_size_after_crop (); + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); - /* Force scale if the film_container is smaller than the content's image */ - if (_scale || film_container.width < ac.width || film_container.height < ac.height) { - return fit_ratio_within (ac.ratio (), display_container); - } + dcp::Size const container_size = film->frame_size (); + dcp::Size const scaled = scale().size (dynamic_pointer_cast (shared_from_this ()), container_size, container_size, 1); - /* Scale the image so that it will be in the right place in film_container, even if display_container is a - different size. - */ - return dcp::Size ( - c->video_size().width * float(display_container.width) / film_container.width, - c->video_size().height * float(display_container.height) / film_container.height - ); -} + if (scaled != video_size_after_crop ()) { + d << String::compose ( + _("Scaled to %1x%2"), + scaled.width, scaled.height + ); -void -VideoContentScale::setup_scales () -{ - vector ratios = Ratio::all (); - for (vector::const_iterator i = ratios.begin(); i != ratios.end(); ++i) { - _scales.push_back (VideoContentScale (*i)); + d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n"; } + + if (scaled != container_size) { + d << String::compose ( + _("Padded with black to %1x%2"), + container_size.width, container_size.height + ); - _scales.push_back (VideoContentScale (true)); - _scales.push_back (VideoContentScale (false)); -} + d << " (" << fixed << setprecision(2) << container_size.ratio () << ":1)\n"; + } -bool -operator== (VideoContentScale const & a, VideoContentScale const & b) -{ - return (a.ratio() == b.ratio() && a.scale() == b.scale()); -} + 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"; -bool -operator!= (VideoContentScale const & a, VideoContentScale const & b) -{ - return (a.ratio() != b.ratio() || a.scale() != b.scale()); + return d.str (); }