X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=75479136f0682bea3be97bf9e1debc8bf4bb390b;hb=351942d335db261ac6fe54f2f8a3f439fef22d47;hp=376ace12818b971a1260262ee9c58243e3fc07ca;hpb=e5b744922fb6aed65ec13f22a9de0c86dd1bd561;p=dcpomatic.git diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 376ace128..75479136f 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -52,6 +52,7 @@ PlayerVideo::PlayerVideo ( Eyes eyes, Part part, optional colour_conversion, + VideoRange video_range, weak_ptr content, optional video_frame ) @@ -63,6 +64,7 @@ PlayerVideo::PlayerVideo ( , _eyes (eyes) , _part (part) , _colour_conversion (colour_conversion) + , _video_range (video_range) , _content (content) , _video_frame (video_frame) { @@ -78,6 +80,7 @@ PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket _out_size = dcp::Size (node->number_child ("OutWidth"), node->number_child ("OutHeight")); _eyes = (Eyes) node->number_child ("Eyes"); _part = (Part) node->number_child ("Part"); + _video_range = (VideoRange) node->number_child("VideoRange"); /* Assume that the ColourConversion uses the current state version */ _colour_conversion = ColourConversion::from_xml (node, Film::current_state_version); @@ -102,16 +105,33 @@ PlayerVideo::set_text (PositionImage image) _text = image; } -/** Create an image for this frame. +shared_ptr +PlayerVideo::image (function pixel_format, bool aligned, bool fast) const +{ + /* XXX: this assumes that image() and prepare() are only ever called with the same parameters (except crop, inter size, out size, fade) */ + + boost::mutex::scoped_lock lm (_mutex); + if (!_image || _crop != _image_crop || _inter_size != _image_inter_size || _out_size != _image_out_size || _fade != _image_fade) { + make_image (pixel_format, aligned, fast); + } + return _image; +} + +/** Create an image for this frame. A lock must be held on _mutex. * @param pixel_format Function which is called to decide what pixel format the output image should be; * it is passed the pixel format of the input image from the ImageProxy, and should return the desired - * output pixel format. Two functions always_rgb and keep_xyz_or_rgb are provided for use here. + * output pixel format. Two functions force and keep_xyz_or_rgb are provided for use here. * @param aligned true if the output image should be aligned to 32-byte boundaries. * @param fast true to be fast at the expense of quality. */ -shared_ptr -PlayerVideo::image (function pixel_format, bool aligned, bool fast) const +void +PlayerVideo::make_image (function pixel_format, bool aligned, bool fast) const { + _image_crop = _crop; + _image_inter_size = _inter_size; + _image_out_size = _out_size; + _image_fade = _fade; + pair, int> prox = _in->image (_inter_size); shared_ptr im = prox.first; int const reduce = prox.second; @@ -148,19 +168,17 @@ PlayerVideo::image (function pixel_format, bool a yuv_to_rgb = _colour_conversion.get().yuv_to_rgb(); } - shared_ptr out = im->crop_scale_window ( - total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format (im->pixel_format()), aligned, fast + _image = im->crop_scale_window ( + total_crop, _inter_size, _out_size, yuv_to_rgb, _video_range, pixel_format (im->pixel_format()), aligned, fast ); if (_text) { - out->alpha_blend (Image::ensure_aligned (_text->image), _text->position); + _image->alpha_blend (Image::ensure_aligned (_text->image), _text->position); } if (_fade) { - out->fade (_fade.get ()); + _image->fade (_fade.get ()); } - - return out; } void @@ -177,6 +195,7 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const node->add_child("OutHeight")->add_child_text (raw_convert (_out_size.height)); node->add_child("Eyes")->add_child_text (raw_convert (static_cast (_eyes))); node->add_child("Part")->add_child_text (raw_convert (static_cast (_part))); + node->add_child("VideoRange")->add_child_text(raw_convert(static_cast(_video_range))); if (_colour_conversion) { _colour_conversion.get().as_xml (node); } @@ -229,12 +248,13 @@ bool PlayerVideo::same (shared_ptr other) const { if (_crop != other->_crop || - _fade.get_value_or(0) != other->_fade.get_value_or(0) || + _fade != other->_fade || _inter_size != other->_inter_size || _out_size != other->_out_size || _eyes != other->_eyes || _part != other->_part || - _colour_conversion != other->_colour_conversion) { + _colour_conversion != other->_colour_conversion || + _video_range != other->_video_range) { return false; } @@ -254,9 +274,9 @@ PlayerVideo::same (shared_ptr other) const } AVPixelFormat -PlayerVideo::always_rgb (AVPixelFormat) +PlayerVideo::force (AVPixelFormat, AVPixelFormat force_to) { - return AV_PIX_FMT_RGB24; + return force_to; } AVPixelFormat @@ -266,9 +286,13 @@ PlayerVideo::keep_xyz_or_rgb (AVPixelFormat p) } void -PlayerVideo::prepare () +PlayerVideo::prepare (function pixel_format, bool aligned, bool fast) { _in->prepare (_inter_size); + boost::mutex::scoped_lock lm (_mutex); + if (!_image) { + make_image (pixel_format, aligned, fast); + } } size_t @@ -291,17 +315,18 @@ PlayerVideo::shallow_copy () const _eyes, _part, _colour_conversion, + _video_range, _content, _video_frame ) ); } -/** Re-read crop, fade, inter/out size and colour conversion from our content. +/** Re-read crop, fade, inter/out size, colour conversion and video range from our content. * @return true if this was possible, false if not. */ bool -PlayerVideo::reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size) +PlayerVideo::reset_metadata (shared_ptr film, dcp::Size video_container_size, dcp::Size film_frame_size) { shared_ptr content = _content.lock(); if (!content || !_video_frame) { @@ -309,10 +334,11 @@ PlayerVideo::reset_metadata (dcp::Size video_container_size, dcp::Size film_fram } _crop = content->video->crop(); - _fade = content->video->fade(_video_frame.get()); + _fade = content->video->fade(film, _video_frame.get()); _inter_size = content->video->scale().size(content->video, video_container_size, film_frame_size); _out_size = video_container_size; _colour_conversion = content->video->colour_conversion(); + _video_range = content->video->range(); return true; }