X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=b33a37cb8ce385892d3b2aac663e05857e46cc1d;hb=a79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1;hp=ebec8b6dbe3ce3f40d1ee184d461d0e494af3f6e;hpb=097a1fb413bbbb89182161d4c1a31daa5419ec96;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index ebec8b6db..b33a37cb8 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-2014 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 @@ -19,11 +19,11 @@ #include #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" @@ -36,7 +36,7 @@ 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; using std::string; @@ -49,22 +49,24 @@ using boost::lexical_cast; using boost::optional; using boost::dynamic_pointer_cast; +vector VideoContentScale::_scales; + VideoContent::VideoContent (shared_ptr f) : Content (f) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _ratio (Ratio::from_id ("185")) + , _scale (Ratio::from_id ("185")) { setup_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, DCPTime 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) - , _ratio (Ratio::from_id ("185")) + , _scale (Ratio::from_id ("185")) { setup_default_colour_conversion (); } @@ -74,16 +76,15 @@ VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _ratio (Ratio::from_id ("185")) + , _scale (Ratio::from_id ("185")) { setup_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, shared_ptr node) +VideoContent::VideoContent (shared_ptr f, shared_ptr node, int version) : Content (f, node) - , _ratio (0) { - _video_length = node->number_child ("VideoLength"); + _video_length = ContentTime (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"); @@ -92,10 +93,16 @@ VideoContent::VideoContent (shared_ptr f, shared_ptrnumber_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")); } + _colour_conversion = ColourConversion (node->node_child ("ColourConversion")); } @@ -125,8 +132,8 @@ 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()) { @@ -140,7 +147,7 @@ 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 (); } @@ -157,23 +164,21 @@ VideoContent::as_xml (xmlpp::Node* node) const 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 ()); - } + _scale.as_xml (node->add_child("Scale")); _colour_conversion.as_xml (node->add_child("ColourConversion")); } void VideoContent::setup_default_colour_conversion () { - _colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6).conversion; + _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 (); { @@ -268,18 +273,18 @@ 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 */ @@ -292,12 +297,9 @@ VideoContent::identifier () const << "_" << crop().right << "_" << crop().top << "_" << crop().bottom + << "_" << scale().id() << "_" << colour_conversion().identifier (); - if (ratio()) { - s << "_" << ratio()->id (); - } - return s.str (); } @@ -318,15 +320,17 @@ 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()); } -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: 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 dcp::Size (s.width, s.height / 2); } assert (false); @@ -344,28 +348,129 @@ VideoContent::set_colour_conversion (ColourConversion c) } /** @return Video size after 3D split and crop */ -libdcp::Size +dcp::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, rounded up so that the frame index - * is that of the next complete frame which starts after `t'. + * @return Corresponding time with respect to the content. */ -VideoContent::Frame -VideoContent::time_to_content_video_frames (DCPTime t) const +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())); +} + +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 (shared_ptr 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 +{ + 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; - /* 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)); + if (_ratio) { + s << _ratio->id () << "_"; + } else { + s << (_scale ? "S1" : "S0"); + } + + return s.str (); +} + +string +VideoContentScale::name () const +{ + if (_ratio) { + return _ratio->nickname (); + } + + if (_scale) { + return _("No stretch"); + } + + return _("No scale"); +} + +libdcp::Size +VideoContentScale::size (shared_ptr c, libdcp::Size container) const +{ + if (_ratio) { + return fit_ratio_within (_ratio->ratio (), container); + } + + /* Force scale if the container is smaller than the content's image */ + if (_scale || container.width < c->video_size().width || container.height < c->video_size().height) { + return fit_ratio_within (c->video_size().ratio (), container); + } + + return c->video_size (); +} + +void +VideoContentScale::setup_scales () +{ + vector ratios = Ratio::all (); + for (vector::const_iterator i = ratios.begin(); i != ratios.end(); ++i) { + _scales.push_back (VideoContentScale (*i)); + } + + _scales.push_back (VideoContentScale (true)); + _scales.push_back (VideoContentScale (false)); +} + +bool +operator== (VideoContentScale const & a, VideoContentScale const & b) +{ + return (a.ratio() == b.ratio() && a.scale() == b.scale()); +} + +bool +operator!= (VideoContentScale const & a, VideoContentScale const & b) +{ + return (a.ratio() != b.ratio() || a.scale() != b.scale()); }