X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=8973fba7e2786e5c818dd46ce87d9582b2e7fe99;hb=6d25faad09cec21a39fd81d140c57542eceb0a6f;hp=3470e62bfdc9891c5f00d283eddda0a6bf24c833;hpb=009e4abb14cfcaecc0de8fab179adc7bd5feffd4;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 3470e62bf..8973fba7e 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -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" @@ -66,7 +66,7 @@ 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"))) { set_default_colour_conversion (false); } @@ -76,7 +76,7 @@ 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"))) { set_default_colour_conversion (false); } @@ -86,7 +86,7 @@ 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"))) { set_default_colour_conversion (false); } @@ -106,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"); @@ -135,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]); @@ -190,6 +191,9 @@ 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")); if (_colour_conversion) { @@ -204,7 +208,7 @@ VideoContent::set_default_colour_conversion (bool signal) { { boost::mutex::scoped_lock lm (_mutex); - _colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion; + _colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz ()); } if (signal) { @@ -217,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) { @@ -365,13 +358,19 @@ VideoContent::set_video_frame_type (VideoFrameType t) string VideoContent::technical_summary () const { - return String::compose ( + string s = String::compose ( "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 (_(", sample aspect ratio %1"), (sample_aspect_ratio().get ())); + } + + return s; } dcp::Size @@ -390,7 +389,7 @@ VideoContent::video_size_after_3d_split () const return dcp::Size (s.width, s.height / 2); } - assert (false); + DCPOMATIC_ASSERT (false); } void @@ -451,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())); } @@ -459,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 ())); @@ -472,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 ())); @@ -499,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 ()); @@ -540,7 +539,7 @@ VideoContent::processing_description () const } shared_ptr film = _film.lock (); - assert (film); + 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);