X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=976bc3aa02429736d66fc2b4a235943f8a2a408b;hb=b6c780d3107557d452c6612d715d01e2be52dbda;hp=40772980fb466754fdec79cd85699a082b33c7ae;hpb=21e8238484af35ac207b01defe406e73445632be;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 40772980f..976bc3aa0 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include #include "video_content.h" #include "video_examiner.h" #include "compose.hpp" @@ -30,46 +30,52 @@ #include "util.h" #include "film.h" #include "exceptions.h" +#include "frame_rate_change.h" +#include "log.h" +#include "safe_stringstream.h" #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 boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; -using libdcp::raw_convert; - -vector VideoContentScale::_scales; +using dcp::raw_convert; 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 (Config::instance()->default_scale ()) { - setup_default_colour_conversion (); + set_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, Time s, VideoContent::Frame len) +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 (Ratio::from_id ("185")) + , _scale (Config::instance()->default_scale ()) { - setup_default_colour_conversion (); + set_default_colour_conversion (); } VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) @@ -77,18 +83,25 @@ 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 (Config::instance()->default_scale ()) { - setup_default_colour_conversion (); + set_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, shared_ptr node, int version) +VideoContent::VideoContent (shared_ptr f, cxml::ConstNodePtr node, int version) : Content (f, 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"); + + 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_type = static_cast (node->number_child ("VideoFrameType")); _crop.left = node->number_child ("LeftCrop"); _crop.right = node->number_child ("RightCrop"); @@ -103,8 +116,15 @@ VideoContent::VideoContent (shared_ptr f, shared_ptrnode_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) @@ -141,6 +161,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 (); } @@ -150,43 +174,56 @@ 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 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("VideoLength")->add_child_text (raw_convert (_video_length.get ())); 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))); _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 () { - _colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6).conversion; + set_colour_conversion (PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion); } void VideoContent::take_from_video_examiner (shared_ptr d) { /* These examiner calls could call other content methods which take a lock on the mutex */ - libdcp::Size const vs = d->video_size (); + dcp::Size const vs = d->video_size (); float const vfr = d->video_frame_rate (); - + ContentTime vl = d->video_length (); + { boost::mutex::scoped_lock lm (_mutex); _video_size = vs; _video_frame_rate = vfr; + _video_length = vl; } + + 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); } @@ -197,7 +234,7 @@ VideoContent::information () const return ""; } - stringstream s; + SafeStringStream s; s << String::compose ( _("%1x%2 pixels (%3:1)"), @@ -289,14 +326,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 (); } @@ -317,14 +357,17 @@ VideoContent::technical_summary () const { return String::compose ( "video: length %1, size %2x%3, rate %4", - video_length_after_3d_combine(), video_size().width, video_size().height, video_frame_rate() + video_length_after_3d_combine().seconds(), + video_size().width, + video_size().height, + video_frame_rate() ); } -libdcp::Size +dcp::Size VideoContent::video_size_after_3d_split () const { - libdcp::Size const s = video_size (); + dcp::Size const s = video_size (); switch (video_frame_type ()) { case VIDEO_FRAME_TYPE_2D: case VIDEO_FRAME_TYPE_3D_ALTERNATE: @@ -332,167 +375,130 @@ VideoContent::video_size_after_3d_split () const case VIDEO_FRAME_TYPE_3D_RIGHT: return s; case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: - return libdcp::Size (s.width / 2, s.height); + return dcp::Size (s.width / 2, s.height); case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM: - return libdcp::Size (s.width, s.height / 2); + return dcp::Size (s.width, s.height / 2); } assert (false); } void -VideoContent::set_colour_conversion (ColourConversion c) +VideoContent::unset_colour_conversion () { { boost::mutex::scoped_lock lm (_mutex); - _colour_conversion = c; + _colour_conversion = boost::optional (); } signal_changed (VideoContentProperty::COLOUR_CONVERSION); } -/** @return Video size after 3D split and crop */ -libdcp::Size -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. - */ -VideoContent::Frame -VideoContent::time_to_content_video_frames (Time t) const +void +VideoContent::set_colour_conversion (ColourConversion c) { - shared_ptr film = _film.lock (); - assert (film); - - FrameRateConversion frc (video_frame_rate(), film->video_frame_rate()); + { + boost::mutex::scoped_lock lm (_mutex); + _colour_conversion = c; + } - /* 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. - */ - return t * film->video_frame_rate() / (frc.factor() * TIME_HZ); + signal_changed (VideoContentProperty::COLOUR_CONVERSION); } -VideoContentScale::VideoContentScale (Ratio const * r) - : _ratio (r) - , _scale (true) +void +VideoContent::set_fade_in (ContentTime t) { + { + boost::mutex::scoped_lock lm (_mutex); + _fade_in = t; + } + signal_changed (VideoContentProperty::VIDEO_FADE_IN); } -VideoContentScale::VideoContentScale () - : _ratio (0) - , _scale (false) +void +VideoContent::set_fade_out (ContentTime t) { + { + boost::mutex::scoped_lock lm (_mutex); + _fade_out = t; + } + signal_changed (VideoContentProperty::VIDEO_FADE_OUT); } -VideoContentScale::VideoContentScale (bool scale) - : _ratio (0) - , _scale (scale) +/** @return Video size after 3D split and crop */ +dcp::Size +VideoContent::video_size_after_crop () const { - + return crop().apply (video_size_after_3d_split ()); } -VideoContentScale::VideoContentScale (shared_ptr node) - : _ratio (0) - , _scale (true) +/** @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 { - optional r = node->optional_string_child ("Ratio"); - if (r) { - _ratio = Ratio::from_id (r.get ()); - } else { - _scale = node->bool_child ("Scale"); - } + shared_ptr film = _film.lock (); + assert (film); + return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate())); } void -VideoContentScale::as_xml (xmlpp::Node* node) const +VideoContent::scale_and_crop_to_fit_width () { - if (_ratio) { - node->add_child("Ratio")->add_child_text (_ratio->id ()); - } else { - node->add_child("Scale")->add_child_text (_scale ? "1" : "0"); - } -} - -string -VideoContentScale::id () const -{ - stringstream s; - - if (_ratio) { - s << _ratio->id () << "_"; - } else { - s << (_scale ? "S1" : "S0"); - } - - return s.str (); -} - -string -VideoContentScale::name () const -{ - if (_ratio) { - return _ratio->nickname (); - } + shared_ptr film = _film.lock (); + assert (film); - if (_scale) { - return _("No stretch"); - } + set_scale (VideoContentScale (film->container ())); - return _("No scale"); + 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); } -/** @param display_container Size of the container that we are displaying this content in. - * @param film_container The size of the film's image. - */ -libdcp::Size -VideoContentScale::size (shared_ptr c, libdcp::Size display_container, libdcp::Size film_container) const +void +VideoContent::scale_and_crop_to_fit_height () { - if (_ratio) { - return fit_ratio_within (_ratio->ratio (), display_container); - } - - libdcp::Size const ac = c->video_size_after_crop (); + shared_ptr film = _film.lock (); + 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); - } + set_scale (VideoContentScale (film->container ())); - /* Scale the image so that it will be in the right place in film_container, even if display_container is a - different size. - */ - return libdcp::Size ( - c->video_size().width * float(display_container.width) / film_container.width, - c->video_size().height * float(display_container.height) / film_container.height - ); + 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 -VideoContentScale::setup_scales () +VideoContent::set_video_frame_rate (float r) { - vector ratios = Ratio::all (); - for (vector::const_iterator i = ratios.begin(); i != ratios.end(); ++i) { - _scales.push_back (VideoContentScale (*i)); + { + boost::mutex::scoped_lock lm (_mutex); + if (_video_frame_rate == r) { + return; + } + + _video_frame_rate = r; } - - _scales.push_back (VideoContentScale (true)); - _scales.push_back (VideoContentScale (false)); + + signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); } -bool -operator== (VideoContentScale const & a, VideoContentScale const & b) +optional +VideoContent::fade (VideoFrame f) const { - return (a.ratio() == b.ratio() && a.scale() == b.scale()); -} + assert (f >= 0); + + if (f < fade_in().frames (video_frame_rate ())) { + return float (f) / _fade_in.frames (video_frame_rate ()); + } -bool -operator!= (VideoContentScale const & a, VideoContentScale const & b) -{ - return (a.ratio() != b.ratio() || a.scale() != b.scale()); + 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 (); }