X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=1e8b9034a6242463a60389458e810a23df334eb9;hb=c07707e9ba362786c9a22c51e5310a9f0e56ff3d;hp=80515ca4d8ed87ff99f5e154ce2f68717f240ddb;hpb=f58d9e44302151dea9f594acd9fc27a331fa77fb;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 80515ca4d..1e8b9034a 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 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,94 +17,130 @@ */ -#include -#include -#include #include "video_content.h" #include "video_examiner.h" -#include "ratio.h" #include "compose.hpp" +#include "ratio.h" #include "config.h" #include "colour_conversion.h" #include "util.h" #include "film.h" #include "exceptions.h" +#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__), 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_RATIO = 4; +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 std::list; +using std::pair; using boost::shared_ptr; -using boost::lexical_cast; using boost::optional; using boost::dynamic_pointer_cast; -VideoContent::VideoContent (shared_ptr f) - : Content (f) +VideoContent::VideoContent (shared_ptr film) + : Content (film) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _ratio (Ratio::from_id ("185")) + , _scale (VideoContentScale (Ratio::from_id ("178"))) + , _fade_in (0) + , _fade_out (0) { - setup_default_colour_conversion (); + set_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, DCPTime s, VideoFrame len) - : Content (f, s) +VideoContent::VideoContent (shared_ptr film, DCPTime s, Frame len) + : Content (film, s) , _video_length (len) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _ratio (Ratio::from_id ("185")) + , _scale (VideoContentScale (Ratio::from_id ("178"))) + , _fade_in (0) + , _fade_out (0) { - setup_default_colour_conversion (); + set_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) - : Content (f, p) +VideoContent::VideoContent (shared_ptr film, boost::filesystem::path p) + : Content (film, p) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _ratio (Ratio::from_id ("185")) + , _scale (VideoContentScale (Ratio::from_id ("178"))) + , _fade_in (0) + , _fade_out (0) { - setup_default_colour_conversion (); + set_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, shared_ptr node) - : Content (f, node) - , _ratio (0) +VideoContent::VideoContent (shared_ptr film, cxml::ConstNodePtr node, int version) + : Content (film, node) { - _video_length = node->number_child ("VideoLength"); _video_size.width = node->number_child ("VideoWidth"); _video_size.height = node->number_child ("VideoHeight"); - _video_frame_rate = node->number_child ("VideoFrameRate"); + _video_frame_rate = node->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"); _crop.bottom = node->number_child ("BottomCrop"); - optional r = node->optional_string_child ("Ratio"); - if (r) { - _ratio = Ratio::from_id (r.get ()); + + if (version <= 7) { + optional r = node->optional_string_child ("Ratio"); + if (r) { + _scale = VideoContentScale (Ratio::from_id (r.get ())); + } + } else { + _scale = VideoContentScale (node->node_child ("Scale")); + } + + + if (node->optional_node_child ("ColourConversion")) { + _colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version); + } + if (version >= 32) { + _fade_in = node->number_child ("FadeIn"); + _fade_out = node->number_child ("FadeOut"); + } else { + _fade_in = _fade_out = 0; } - _colour_conversion = ColourConversion (node->node_child ("ColourConversion")); } -VideoContent::VideoContent (shared_ptr f, vector > c) - : Content (f, c) +VideoContent::VideoContent (shared_ptr film, vector > c) + : Content (film, c) , _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]); @@ -125,14 +161,18 @@ VideoContent::VideoContent (shared_ptr f, vector throw JoinError (_("Content to be joined must have the same crop.")); } - if (vc->ratio() != ref->ratio()) { - throw JoinError (_("Content to be joined must have the same ratio.")); + if (vc->scale() != ref->scale()) { + throw JoinError (_("Content to be joined must have the same scale setting.")); } if (vc->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()) { + throw JoinError (_("Content to be joined must have the same fades.")); + } + _video_length += vc->video_length (); } @@ -140,33 +180,39 @@ VideoContent::VideoContent (shared_ptr f, vector _video_frame_rate = ref->video_frame_rate (); _video_frame_type = ref->video_frame_type (); _crop = ref->crop (); - _ratio = ref->ratio (); + _scale = ref->scale (); _colour_conversion = ref->colour_conversion (); + _fade_in = ref->fade_in (); + _fade_out = ref->fade_out (); } void VideoContent::as_xml (xmlpp::Node* node) const { boost::mutex::scoped_lock lm (_mutex); - node->add_child("VideoLength")->add_child_text (lexical_cast (_video_length)); - node->add_child("VideoWidth")->add_child_text (lexical_cast (_video_size.width)); - node->add_child("VideoHeight")->add_child_text (lexical_cast (_video_size.height)); - node->add_child("VideoFrameRate")->add_child_text (lexical_cast (_video_frame_rate)); - node->add_child("VideoFrameType")->add_child_text (lexical_cast (static_cast (_video_frame_type))); - node->add_child("LeftCrop")->add_child_text (boost::lexical_cast (_crop.left)); - node->add_child("RightCrop")->add_child_text (boost::lexical_cast (_crop.right)); - node->add_child("TopCrop")->add_child_text (boost::lexical_cast (_crop.top)); - node->add_child("BottomCrop")->add_child_text (boost::lexical_cast (_crop.bottom)); - if (_ratio) { - node->add_child("Ratio")->add_child_text (_ratio->id ()); + 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)); + 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 ())); } - _colour_conversion.as_xml (node->add_child("ColourConversion")); + _crop.as_xml (node); + _scale.as_xml (node->add_child("Scale")); + if (_colour_conversion) { + _colour_conversion.get().as_xml (node->add_child("ColourConversion")); + } + 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 @@ -174,36 +220,34 @@ 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 (); + Frame 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 (double (_video_size.width) * ar.get_value_or (1) / _video_size.height) + ); } - - signal_changed (VideoContentProperty::VIDEO_SIZE); - signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); -} + shared_ptr film = _film.lock (); + 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 ""; - } - - stringstream s; + set_default_colour_conversion (); - 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_SIZE); + signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); + signal_changed (VideoContentProperty::VIDEO_SCALE); + signal_changed (ContentProperty::LENGTH); } void @@ -211,14 +255,14 @@ 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); } @@ -230,10 +274,10 @@ VideoContent::set_right_crop (int c) if (_crop.right == c) { return; } - + _crop.right = c; } - + signal_changed (VideoContentProperty::VIDEO_CROP); } @@ -245,10 +289,10 @@ VideoContent::set_top_crop (int c) if (_crop.top == c) { return; } - + _crop.top = c; } - + signal_changed (VideoContentProperty::VIDEO_CROP); } @@ -260,7 +304,7 @@ VideoContent::set_bottom_crop (int c) if (_crop.bottom == c) { return; } - + _crop.bottom = c; } @@ -268,34 +312,36 @@ VideoContent::set_bottom_crop (int c) } void -VideoContent::set_ratio (Ratio const * r) +VideoContent::set_scale (VideoContentScale s) { { boost::mutex::scoped_lock lm (_mutex); - if (_ratio == r) { + if (_scale == s) { return; } - _ratio = r; + _scale = s; } - signal_changed (VideoContentProperty::VIDEO_RATIO); + signal_changed (VideoContentProperty::VIDEO_SCALE); } /** @return string which includes everything about how this content looks */ string VideoContent::identifier () const { - stringstream s; + SafeStringStream s; s << Content::identifier() << "_" << crop().left << "_" << crop().right << "_" << crop().top << "_" << crop().bottom - << "_" << colour_conversion().identifier (); + << "_" << scale().id() + << "_" << _fade_in + << "_" << _fade_out; - if (ratio()) { - s << "_" << ratio()->id (); + if (colour_conversion()) { + s << "_" << colour_conversion().get().identifier (); } return s.str (); @@ -315,7 +361,19 @@ VideoContent::set_video_frame_type (VideoFrameType t) string VideoContent::technical_summary () const { - return String::compose ("video: length %1, size %2x%3, rate %4", video_length(), video_size().width, video_size().height, video_frame_rate()); + 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 @@ -324,6 +382,9 @@ VideoContent::video_size_after_3d_split () const dcp::Size const s = video_size (); switch (video_frame_type ()) { case VIDEO_FRAME_TYPE_2D: + case VIDEO_FRAME_TYPE_3D_ALTERNATE: + case VIDEO_FRAME_TYPE_3D_LEFT: + case VIDEO_FRAME_TYPE_3D_RIGHT: return s; case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: return dcp::Size (s.width / 2, s.height); @@ -331,7 +392,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 @@ -345,6 +417,28 @@ VideoContent::set_colour_conversion (ColourConversion 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 @@ -352,22 +446,147 @@ 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 frame index, rounded up so that the frame index - * is that of the next complete frame which starts after `t'. - */ -VideoFrame -VideoContent::time_to_content_video_frames (DCPTime t) const +void +VideoContent::scale_and_crop_to_fit_width () +{ + shared_ptr film = _film.lock (); + 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_top_crop (crop / 2); + set_bottom_crop (crop / 2); +} + +void +VideoContent::scale_and_crop_to_fit_height () +{ + shared_ptr film = _film.lock (); + 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); +} + +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); +} + +optional +VideoContent::fade (Frame f) const +{ + DCPOMATIC_ASSERT (f >= 0); + + if (f < fade_in()) { + return double (f) / fade_in(); + } + + Frame fade_out_start = video_length() - fade_out(); + if (f >= fade_out_start) { + 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 */ + 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 + ); + + + 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 (dynamic_pointer_cast (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 (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"))); +} + +list +VideoContent::reel_split_points () const { + list t; shared_ptr film = _film.lock (); - assert (film); - - /* Here we are converting from time (in the DCP) to a frame number in the content. - Hence we need to use the DCP's frame rate and the double/skip correction, not - the source's rate; source rate will be equal to DCP rate if we ignore - double/skip. There's no need to call Film::active_frame_rate_change() here - as we know that we are it (since we're video). - */ - FrameRateChange frc (video_frame_rate(), film->video_frame_rate()); - return ceil (t * film->video_frame_rate() / (frc.factor() * TIME_HZ)); + DCPOMATIC_ASSERT (film); + /* 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; }