X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=7321fc7c584bbf8c9dfa42b39f81dfce76b1d752;hb=7998c12eb59c07f583db27a250ff566b543bf40b;hp=a9b28631504a98e2ec82058cf18dab65b62c7fc1;hpb=f9068dcbfbb09082e29e2a779ef1a7a2f6ee849e;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index a9b286315..7321fc7c5 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -38,7 +38,7 @@ #include "i18n.h" -#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), LogEntry::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; @@ -55,7 +55,6 @@ using std::cout; using std::vector; using std::min; using std::max; -using std::stringstream; using std::fixed; using std::setprecision; using std::list; @@ -67,9 +66,9 @@ using boost::dynamic_pointer_cast; 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) { @@ -79,9 +78,9 @@ VideoContent::VideoContent (shared_ptr film) 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) { @@ -91,9 +90,9 @@ VideoContent::VideoContent (shared_ptr film, DCPTime s, Frame len) 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) { @@ -105,7 +104,7 @@ VideoContent::VideoContent (shared_ptr film, cxml::ConstNodePtr 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"); @@ -127,6 +126,9 @@ VideoContent::VideoContent (shared_ptr film, cxml::ConstNodePtr node 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"); @@ -138,6 +140,7 @@ VideoContent::VideoContent (shared_ptr film, cxml::ConstNodePtr node 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); @@ -174,6 +177,10 @@ VideoContent::VideoContent (shared_ptr film, vectorvideo_length (); + + if (vc->yuv ()) { + _yuv = true; + } } _video_size = ref->video_size (); @@ -193,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 ())); @@ -203,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)); } @@ -223,14 +233,15 @@ VideoContent::take_from_video_examiner (shared_ptr d) optional const vfr = d->video_frame_rate (); Frame vl = d->video_length (); 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 ( @@ -238,8 +249,6 @@ VideoContent::take_from_video_examiner (shared_ptr d) ); } - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length); set_default_colour_conversion (); @@ -449,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); } @@ -462,12 +468,9 @@ 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); } @@ -508,7 +511,7 @@ 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 ( @@ -538,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 ()) { @@ -556,7 +556,7 @@ VideoContent::processing_description () const 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 ); @@ -566,7 +566,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 ()); + FrameRateChange frc (video_frame_rate(), film()->video_frame_rate ()); d << frc.description () << "\n"; return d.str (); @@ -584,6 +584,14 @@ list VideoContent::reel_split_points () const { list t; - t.push_back (position ()); + /* 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 ()); +}