X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=b5097b35546ecd95d5dc75031911f206b5ac844f;hb=946dbad9821e676f1d8fdc5abba459da54b8e84c;hp=b704b64477b1ceaef7208dafd5ae2e0b775fcd89;hpb=07f3a8fccdf9127b2eaf4a6f3425185dba73a23f;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index b704b6447..b5097b355 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -19,7 +19,8 @@ #include #include -#include +#include +#include #include "video_content.h" #include "video_examiner.h" #include "compose.hpp" @@ -29,9 +30,14 @@ #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; @@ -40,33 +46,32 @@ int const VideoContentProperty::VIDEO_SCALE = 4; int const VideoContentProperty::COLOUR_CONVERSION = 5; 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::lexical_cast; using boost::optional; using boost::dynamic_pointer_cast; - -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 (); } -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 (); } @@ -76,18 +81,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 (); } -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"); @@ -155,15 +167,12 @@ 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)); + 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")); } @@ -171,24 +180,31 @@ VideoContent::as_xml (xmlpp::Node* node) const 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 (); - + 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); } @@ -199,7 +215,7 @@ VideoContent::information () const return ""; } - stringstream s; + SafeStringStream s; s << String::compose ( _("%1x%2 pixels (%3:1)"), @@ -291,7 +307,7 @@ VideoContent::set_scale (VideoContentScale s) string VideoContent::identifier () const { - stringstream s; + SafeStringStream s; s << Content::identifier() << "_" << crop().left << "_" << crop().right @@ -319,14 +335,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: @@ -334,9 +353,9 @@ 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); @@ -354,147 +373,61 @@ 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. + * @return Corresponding time with respect to the content. */ -VideoContent::Frame -VideoContent::time_to_content_video_frames (Time t) const +ContentTime +VideoContent::dcp_time_to_content_time (DCPTime t) const { shared_ptr film = _film.lock (); assert (film); - - FrameRateConversion frc (video_frame_rate(), film->video_frame_rate()); - - /* 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); -} - -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"); - } + return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate())); } 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; - - if (_ratio) { - s << _ratio->id () << "_"; - } else { - s << (_scale ? "S1" : "S0"); - } - - return s.str (); -} - -string -VideoContentScale::name () const +VideoContent::scale_and_crop_to_fit_width () { - 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); - } + shared_ptr film = _film.lock (); + assert (film); - libdcp::Size const ac = c->video_size_after_crop (); + set_scale (VideoContentScale (film->container ())); - /* 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); - } - - /* 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)); -} - -bool -operator== (VideoContentScale const & a, VideoContentScale const & b) -{ - return (a.ratio() == b.ratio() && a.scale() == b.scale()); + + signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); } -bool -operator!= (VideoContentScale const & a, VideoContentScale const & b) -{ - return (a.ratio() != b.ratio() || a.scale() != b.scale()); -}