X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=ca0c687a791d9a1b15996cb0cf2f488b64d05a48;hb=c008066160d85b9ec9e5485375d7baaa5d27bda2;hp=b5097b35546ecd95d5dc75031911f206b5ac844f;hpb=946dbad9821e676f1d8fdc5abba459da54b8e84c;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index b5097b355..ca0c687a7 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -44,6 +44,8 @@ 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::setprecision; @@ -51,6 +53,9 @@ 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; @@ -61,9 +66,9 @@ VideoContent::VideoContent (shared_ptr f) , _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"))) { - setup_default_colour_conversion (); + set_default_colour_conversion (false); } VideoContent::VideoContent (shared_ptr f, DCPTime s, ContentTime len) @@ -71,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 (Config::instance()->default_scale ()) + , _scale (VideoContentScale (Ratio::from_id ("178"))) { - setup_default_colour_conversion (); + set_default_colour_conversion (false); } VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) @@ -81,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 (Config::instance()->default_scale ()) + , _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) @@ -101,6 +106,7 @@ VideoContent::VideoContent (shared_ptr f, cxml::ConstNodePtr node, i } _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"); @@ -114,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) @@ -152,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 (); } @@ -161,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 @@ -172,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 = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion; + } + + if (signal) { + signal_changed (VideoContentProperty::COLOUR_CONVERSION); + } } void @@ -188,14 +221,23 @@ 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; + if (vfr) { + _video_frame_rate = vfr.get (); + } _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 (); @@ -204,6 +246,7 @@ VideoContent::take_from_video_examiner (shared_ptr d) signal_changed (VideoContentProperty::VIDEO_SIZE); signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); + signal_changed (VideoContentProperty::VIDEO_SCALE); signal_changed (ContentProperty::LENGTH); } @@ -223,6 +266,10 @@ VideoContent::information () const video_size().height, setprecision (3), video_size().ratio () ); + + if (sample_aspect_ratio ()) { + s << String::compose (_(" sample aspect ratio %1:1"), sample_aspect_ratio().get ()); + } return s.str (); } @@ -313,8 +360,11 @@ VideoContent::identifier () const << "_" << crop().right << "_" << crop().top << "_" << crop().bottom - << "_" << scale().id() - << "_" << colour_conversion().identifier (); + << "_" << scale().id(); + + if (colour_conversion()) { + s << "_" << colour_conversion().get().identifier (); + } return s.str (); } @@ -333,13 +383,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 @@ -361,6 +417,17 @@ VideoContent::video_size_after_3d_split () const 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) { @@ -372,6 +439,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 @@ -431,3 +520,78 @@ VideoContent::set_video_frame_rate (float r) signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); } +optional +VideoContent::fade (VideoFrame f) const +{ + assert (f >= 0); + + if (f < fade_in().frames (video_frame_rate ())) { + return float (f) / _fade_in.frames (video_frame_rate ()); + } + + 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 +VideoContent::processing_description () 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 + ); + + d << " (" << fixed << setprecision(2) << video_size_after_3d_split().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 (); + assert (film); + + 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); + + 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 %1x%2"), + 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 (); +}