X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=7321fc7c584bbf8c9dfa42b39f81dfce76b1d752;hb=d2728b07a42b0da60effd259b508761e670c0789;hp=a8355ffd67aa0b78ef6c97c5c59d324cbc5c2cc4;hpb=0a20f4b0ee59f06732648f981fe4d3e387b5705a;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index a8355ffd6..7321fc7c5 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -32,11 +32,13 @@ #include "raw_convert.h" #include #include +#include #include +#include #include "i18n.h" -#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); +#define LOG_GENERAL(...) film()->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); int const VideoContentProperty::VIDEO_SIZE = 0; int const VideoContentProperty::VIDEO_FRAME_RATE = 1; @@ -53,58 +55,59 @@ using std::cout; using std::vector; using std::min; using std::max; -using std::stringstream; using std::fixed; using std::setprecision; +using std::list; +using std::pair; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; -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 (VideoContentScale (Ratio::from_id ("178"))) + , _yuv (true) , _fade_in (0) , _fade_out (0) { set_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, DCPTime s, Frame 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 (VideoContentScale (Ratio::from_id ("178"))) + , _yuv (true) , _fade_in (0) , _fade_out (0) { 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 (VideoContentScale (Ratio::from_id ("178"))) + , _yuv (true) , _fade_in (0) , _fade_out (0) { 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"); + _video_frame_rate = node->optional_number_child ("VideoFrameRate"); _video_length = node->number_child ("VideoLength"); _video_frame_type = static_cast (node->number_child ("VideoFrameType")); - _sample_aspect_ratio = node->optional_number_child ("SampleAspectRatio"); + _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"); @@ -119,10 +122,13 @@ 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"), version); } + + _yuv = node->optional_bool_child("YUV").get_value_or (true); + if (version >= 32) { _fade_in = node->number_child ("FadeIn"); _fade_out = node->number_child ("FadeOut"); @@ -131,9 +137,10 @@ VideoContent::VideoContent (shared_ptr f, cxml::ConstNodePtr node, i } } -VideoContent::VideoContent (shared_ptr f, vector > c) - : Content (f, c) +VideoContent::VideoContent (shared_ptr film, vector > c) + : Content (film, c) , _video_length (0) + , _yuv (false) { shared_ptr ref = dynamic_pointer_cast (c[0]); DCPOMATIC_ASSERT (ref); @@ -168,8 +175,12 @@ 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 (); + + if (vc->yuv ()) { + _yuv = true; + } } _video_size = ref->video_size (); @@ -189,7 +200,9 @@ VideoContent::as_xml (xmlpp::Node* node) const 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)); + if (_video_frame_rate) { + node->add_child("VideoFrameRate")->add_child_text (raw_convert (_video_frame_rate.get())); + } 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 ())); @@ -199,6 +212,7 @@ VideoContent::as_xml (xmlpp::Node* node) const if (_colour_conversion) { _colour_conversion.get().as_xml (node->add_child("ColourConversion")); } + node->add_child("YUV")->add_child_text (_yuv ? "1" : "0"); node->add_child("FadeIn")->add_child_text (raw_convert (_fade_in)); node->add_child("FadeOut")->add_child_text (raw_convert (_fade_out)); } @@ -216,30 +230,29 @@ 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 (); - optional const vfr = d->video_frame_rate (); + optional const vfr = d->video_frame_rate (); Frame vl = d->video_length (); - optional const ar = d->sample_aspect_ratio (); + optional const ar = d->sample_aspect_ratio (); + bool const yuv = d->yuv (); { boost::mutex::scoped_lock lm (_mutex); _video_size = vs; - /* Default video frame rate to 24fps if the examiner doesn't know */ - _video_frame_rate = vfr.get_value_or (24); + _video_frame_rate = vfr; _video_length = vl; _sample_aspect_ratio = ar; + _yuv = yuv; /* 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) + Ratio::nearest_from_ratio (double (_video_size.width) * ar.get_value_or (1) / _video_size.height) ); } - shared_ptr film = _film.lock (); - 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); @@ -251,14 +264,14 @@ 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); } @@ -270,10 +283,10 @@ VideoContent::set_right_crop (int c) if (_crop.right == c) { return; } - + _crop.right = c; } - + signal_changed (VideoContentProperty::VIDEO_CROP); } @@ -285,10 +298,10 @@ VideoContent::set_top_crop (int c) if (_crop.top == c) { return; } - + _crop.top = c; } - + signal_changed (VideoContentProperty::VIDEO_CROP); } @@ -300,7 +313,7 @@ VideoContent::set_bottom_crop (int c) if (_crop.bottom == c) { return; } - + _crop.bottom = c; } @@ -332,7 +345,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 (); @@ -390,16 +405,14 @@ VideoContent::video_size_after_3d_split () const } void -VideoContent::unset_colour_conversion (bool signal) +VideoContent::unset_colour_conversion () { { boost::mutex::scoped_lock lm (_mutex); _colour_conversion = boost::optional (); } - if (signal) { - signal_changed (VideoContentProperty::COLOUR_CONVERSION); - } + signal_changed (VideoContentProperty::COLOUR_CONVERSION); } void @@ -445,12 +458,9 @@ VideoContent::video_size_after_crop () const void VideoContent::scale_and_crop_to_fit_width () { - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); - - set_scale (VideoContentScale (film->container ())); + set_scale (VideoContentScale (film()->container ())); - int const crop = max (0, int (video_size().height - double (film->frame_size().height) * video_size().width / film->frame_size().width)); + 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); } @@ -458,53 +468,50 @@ VideoContent::scale_and_crop_to_fit_width () void VideoContent::scale_and_crop_to_fit_height () { - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); + set_scale (VideoContentScale (film()->container ())); - set_scale (VideoContentScale (film->container ())); - - int const crop = max (0, int (video_size().width - double (film->frame_size().width) * video_size().height / film->frame_size().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 -VideoContent::set_video_frame_rate (float r) +VideoContent::set_video_frame_rate (double r) { { boost::mutex::scoped_lock lm (_mutex); if (_video_frame_rate == r) { return; } - + _video_frame_rate = r; } - + signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); } -optional +optional VideoContent::fade (Frame f) const { DCPOMATIC_ASSERT (f >= 0); - + if (f < fade_in()) { - return float (f) / fade_in(); + return double (f) / fade_in(); } Frame fade_out_start = video_length() - fade_out(); if (f >= fade_out_start) { - return 1 - float (f - fade_out_start) / fade_out(); + return 1 - double (f - fade_out_start) / fade_out(); } - return optional (); + return optional (); } string VideoContent::processing_description () const { /* stringstream is OK here as this string is just for presentation to the user */ - stringstream d; + SafeStringStream d; if (video_size().width && video_size().height) { d << String::compose ( @@ -514,7 +521,7 @@ VideoContent::processing_description () const ); - float ratio = video_size_after_3d_split().ratio (); + double ratio = video_size_after_3d_split().ratio (); if (sample_aspect_ratio ()) { d << ", " << _("pixel aspect ratio") << " " << fixed << setprecision(2) << sample_aspect_ratio().get () << ":1"; @@ -534,10 +541,7 @@ VideoContent::processing_description () const 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 container_size = film()->frame_size (); dcp::Size const scaled = scale().size (dynamic_pointer_cast (shared_from_this ()), container_size, container_size); if (scaled != video_size_after_crop ()) { @@ -548,11 +552,11 @@ VideoContent::processing_description () const d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n"; } - + if (scaled != container_size) { d << String::compose ( _("Padded with black to fit container %1 (%2x%3)"), - film->container()->nickname (), + film()->container()->nickname (), container_size.width, container_size.height ); @@ -561,9 +565,33 @@ 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 ()); + + FrameRateChange frc (video_frame_rate(), film()->video_frame_rate ()); d << frc.description () << "\n"; return d.str (); } + +void +VideoContent::add_properties (list >& p) const +{ + p.push_back (make_pair (_("Video length"), raw_convert (video_length ()) + " " + _("video frames"))); + p.push_back (make_pair (_("Video size"), raw_convert (video_size().width) + "x" + raw_convert (video_size().height))); + p.push_back (make_pair (_("Video frame rate"), raw_convert (video_frame_rate()) + " " + _("frames per second"))); +} + +list +VideoContent::reel_split_points () const +{ + list t; + /* XXX: this is questionable; perhaps the position should be forced to be on a frame boundary */ + t.push_back (position().round_up (film()->video_frame_rate())); + return t; +} + +double +VideoContent::video_frame_rate () const +{ + boost::mutex::scoped_lock lm (_mutex); + return _video_frame_rate.get_value_or (film()->video_frame_rate ()); +}