X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=8c6f6c7eb7ae11c39aada00f73ed0113c76febca;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=3470e62bfdc9891c5f00d283eddda0a6bf24c833;hpb=2734637c959928a7d412c709cc3433357418ae03;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 3470e62bf..8c6f6c7eb 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 "raw_convert.h" +#include +#include +#include #include "i18n.h" @@ -59,53 +59,52 @@ using std::setprecision; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; -using dcp::raw_convert; -VideoContent::VideoContent (shared_ptr f) - : Content (f) +VideoContent::VideoContent (shared_ptr film) + : Content (film) , _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"))) + , _fade_in (0) + , _fade_out (0) { - set_default_colour_conversion (false); + set_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, DCPTime s, ContentTime len) - : Content (f, s) +VideoContent::VideoContent (shared_ptr film, DCPTime s, Frame len) + : Content (film, s) , _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"))) + , _fade_in (0) + , _fade_out (0) { - set_default_colour_conversion (false); + set_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) - : Content (f, p) +VideoContent::VideoContent (shared_ptr film, boost::filesystem::path p) + : Content (film, 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"))) + , _fade_in (0) + , _fade_out (0) { - set_default_colour_conversion (false); + set_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, cxml::ConstNodePtr node, int version) - : Content (f, node) +VideoContent::VideoContent (shared_ptr film, cxml::ConstNodePtr node, int version) + : Content (film, node) { _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_length = node->number_child ("VideoLength"); _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"); @@ -120,22 +119,24 @@ VideoContent::VideoContent (shared_ptr f, cxml::ConstNodePtr node, i _scale = VideoContentScale (node->node_child ("Scale")); } - + if (node->optional_node_child ("ColourConversion")) { - _colour_conversion = ColourConversion (node->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")); + _fade_in = node->number_child ("FadeIn"); + _fade_out = node->number_child ("FadeOut"); + } else { + _fade_in = _fade_out = 0; } } -VideoContent::VideoContent (shared_ptr f, vector > c) - : Content (f, c) +VideoContent::VideoContent (shared_ptr film, vector > c) + : Content (film, c) , _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]); @@ -167,7 +168,7 @@ VideoContent::VideoContent (shared_ptr f, vector 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 (); } @@ -185,31 +186,29 @@ 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.get ())); + node->add_child("VideoLength")->add_child_text (raw_convert (_video_length)); 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))); + 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) { _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 ())); + node->add_child("FadeIn")->add_child_text (raw_convert (_fade_in)); + node->add_child("FadeOut")->add_child_text (raw_convert (_fade_out)); } void -VideoContent::set_default_colour_conversion (bool signal) +VideoContent::set_default_colour_conversion () { - { - boost::mutex::scoped_lock lm (_mutex); - _colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion; - } - - if (signal) { - signal_changed (VideoContentProperty::COLOUR_CONVERSION); - } + /* If there's no better offer we'll use Rec. 709 */ + boost::mutex::scoped_lock lm (_mutex); + _colour_conversion = PresetColourConversion::from_id ("rec709").conversion; } void @@ -217,58 +216,49 @@ 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 (); - ContentTime vl = d->video_length (); + optional const vfr = d->video_frame_rate (); + Frame 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); - LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length.frames (_video_frame_rate)); - + DCPOMATIC_ASSERT (film); + LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length); + + set_default_colour_conversion (); + 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) { { boost::mutex::scoped_lock lm (_mutex); - + if (_crop.left == c) { return; } - + _crop.left = c; } - + signal_changed (VideoContentProperty::VIDEO_CROP); } @@ -280,10 +270,10 @@ VideoContent::set_right_crop (int c) if (_crop.right == c) { return; } - + _crop.right = c; } - + signal_changed (VideoContentProperty::VIDEO_CROP); } @@ -295,10 +285,10 @@ VideoContent::set_top_crop (int c) if (_crop.top == c) { return; } - + _crop.top = c; } - + signal_changed (VideoContentProperty::VIDEO_CROP); } @@ -310,7 +300,7 @@ VideoContent::set_bottom_crop (int c) if (_crop.bottom == c) { return; } - + _crop.bottom = c; } @@ -342,7 +332,9 @@ VideoContent::identifier () const << "_" << crop().right << "_" << crop().top << "_" << crop().bottom - << "_" << scale().id(); + << "_" << scale().id() + << "_" << _fade_in + << "_" << _fade_out; if (colour_conversion()) { s << "_" << colour_conversion().get().identifier (); @@ -365,13 +357,19 @@ VideoContent::set_video_frame_type (VideoFrameType t) string VideoContent::technical_summary () const { - return String::compose ( - "video: length %1, size %2x%3, rate %4", - video_length_after_3d_combine().seconds(), + string s = String::compose ( + N_("video: length %1 frames, size %2x%3, rate %4"), + video_length_after_3d_combine(), 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 @@ -390,18 +388,20 @@ 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 () +VideoContent::unset_colour_conversion (bool signal) { { boost::mutex::scoped_lock lm (_mutex); _colour_conversion = boost::optional (); } - signal_changed (VideoContentProperty::COLOUR_CONVERSION); + if (signal) { + signal_changed (VideoContentProperty::COLOUR_CONVERSION); + } } void @@ -416,7 +416,7 @@ VideoContent::set_colour_conversion (ColourConversion c) } void -VideoContent::set_fade_in (ContentTime t) +VideoContent::set_fade_in (Frame t) { { boost::mutex::scoped_lock lm (_mutex); @@ -427,7 +427,7 @@ VideoContent::set_fade_in (ContentTime t) } void -VideoContent::set_fade_out (ContentTime t) +VideoContent::set_fade_out (Frame t) { { boost::mutex::scoped_lock lm (_mutex); @@ -444,22 +444,11 @@ 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 time with respect to the content. - */ -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())); -} - 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 +461,7 @@ void VideoContent::scale_and_crop_to_fit_height () { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); set_scale (VideoContentScale (film->container ())); @@ -489,25 +478,25 @@ VideoContent::set_video_frame_rate (float r) if (_video_frame_rate == r) { return; } - + _video_frame_rate = r; } - + signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); } optional -VideoContent::fade (VideoFrame f) const +VideoContent::fade (Frame f) const { - assert (f >= 0); - - if (f < fade_in().frames (video_frame_rate ())) { - return float (f) / _fade_in.frames (video_frame_rate ()); + DCPOMATIC_ASSERT (f >= 0); + + if (f < fade_in()) { + return float (f) / fade_in(); } - VideoFrame fade_out_start = ContentTime (video_length() - fade_out()).frames (video_frame_rate ()); + Frame fade_out_start = video_length() - fade_out(); if (f >= fade_out_start) { - return 1 - float (f - fade_out_start) / fade_out().frames (video_frame_rate ()); + return 1 - float (f - fade_out_start) / fade_out(); } return optional (); @@ -526,7 +515,15 @@ VideoContent::processing_description () const video_size_after_3d_split().height ); - d << " (" << fixed << setprecision(2) << video_size_after_3d_split().ratio() << ":1)\n"; + + 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)) { @@ -540,10 +537,10 @@ 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); + dcp::Size const scaled = scale().size (dynamic_pointer_cast (shared_from_this ()), container_size, container_size); if (scaled != video_size_after_crop ()) { d << String::compose ( @@ -553,10 +550,11 @@ VideoContent::processing_description () const d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n"; } - + if (scaled != container_size) { d << String::compose ( - _("Padded with black to %1x%2"), + _("Padded with black to fit container %1 (%2x%3)"), + film->container()->nickname (), container_size.width, container_size.height ); @@ -565,7 +563,7 @@ VideoContent::processing_description () const 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";