X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=5dc9e3d66814424f4dee8eed190e30a52cb75437;hb=1b6a26c3b1387026f68c5cb72f3da21370595f2d;hp=ba656e4c2410330da76bfb4a193facc646137c8d;hpb=f90d74f7a0382f0dc63eef81bd553d7a7b38edb2;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index ba656e4c2..5dc9e3d66 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 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,10 +17,6 @@ */ -#include -#include -#include -#include #include "video_content.h" #include "video_examiner.h" #include "compose.hpp" @@ -33,6 +29,10 @@ #include "frame_rate_change.h" #include "log.h" #include "safe_stringstream.h" +#include +#include +#include +#include #include "i18n.h" @@ -53,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; @@ -63,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) @@ -73,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) @@ -83,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) @@ -103,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"); @@ -116,8 +120,11 @@ 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"), version); + } if (version >= 32) { _fade_in = ContentTime (node->number_child ("FadeIn")); _fade_out = ContentTime (node->number_child ("FadeOut")); @@ -129,7 +136,7 @@ VideoContent::VideoContent (shared_ptr f, vector , _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]); @@ -184,17 +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 = ColourConversion (dcp::ColourConversion::srgb_to_xyz ()); + } + + if (signal) { + signal_changed (VideoContentProperty::COLOUR_CONVERSION); + } } void @@ -202,45 +221,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 (); 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; + /* 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 (float (_video_size.width) * ar.get_value_or (1) / _video_size.height) + ); } shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_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 (VideoContentProperty::VIDEO_SCALE); signal_changed (ContentProperty::LENGTH); } - -string -VideoContent::information () const -{ - if (video_size().width == 0 || video_size().height == 0) { - return ""; - } - - SafeStringStream s; - - s << String::compose ( - _("%1x%2 pixels (%3:1)"), - video_size().width, - video_size().height, - setprecision (3), video_size().ratio () - ); - - return s.str (); -} - void VideoContent::set_left_crop (int c) { @@ -327,8 +335,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 (); } @@ -347,13 +358,19 @@ VideoContent::set_video_frame_type (VideoFrameType t) string VideoContent::technical_summary () const { - return String::compose ( - "video: length %1, size %2x%3, rate %4", + string s = String::compose ( + N_("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 (N_(", sample aspect ratio %1"), (sample_aspect_ratio().get ())); + } + + return s; } dcp::Size @@ -372,7 +389,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 @@ -422,7 +450,7 @@ ContentTime VideoContent::dcp_time_to_content_time (DCPTime t) const { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate())); } @@ -430,7 +458,7 @@ void VideoContent::scale_and_crop_to_fit_width () { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); set_scale (VideoContentScale (film->container ())); @@ -443,7 +471,7 @@ void VideoContent::scale_and_crop_to_fit_height () { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); set_scale (VideoContentScale (film->container ())); @@ -470,7 +498,7 @@ VideoContent::set_video_frame_rate (float r) optional VideoContent::fade (VideoFrame f) const { - assert (f >= 0); + DCPOMATIC_ASSERT (f >= 0); if (f < fade_in().frames (video_frame_rate ())) { return float (f) / _fade_in.frames (video_frame_rate ()); @@ -483,3 +511,71 @@ VideoContent::fade (VideoFrame f) const 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 + ); + + + float 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, 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 (); +} +