X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=cb2a55724726cb46803ad29f2178a620759ada6d;hb=0ab8cf5b312f36a14f66d4564c6f4b1694ddaae0;hp=023ab826a8c4e12d7a66b094b6b45ea4afecefce;hpb=3a42767c354cb0877f17a2a0078bbf37380967d0;p=dcpomatic.git diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 023ab826a..cb2a55724 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -52,8 +52,10 @@ PlayerVideo::PlayerVideo ( Eyes eyes, Part part, optional colour_conversion, + VideoRange video_range, weak_ptr content, - optional video_frame + optional video_frame, + bool error ) : _in (in) , _crop (crop) @@ -63,8 +65,10 @@ PlayerVideo::PlayerVideo ( , _eyes (eyes) , _part (part) , _colour_conversion (colour_conversion) + , _video_range (video_range) , _content (content) , _video_frame (video_frame) + , _error (error) { } @@ -78,6 +82,8 @@ 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"); + _error = node->optional_bool_child("Error").get_value_or (false); /* Assume that the ColourConversion uses the current state version */ _colour_conversion = ColourConversion::from_xml (node, Film::current_state_version); @@ -105,10 +111,10 @@ PlayerVideo::set_text (PositionImage image) 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) */ + /* 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) { + 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; @@ -127,32 +133,32 @@ PlayerVideo::make_image (function pixel_format, b _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; + ImageProxy::Result prox = _in->image (_inter_size); + _error = prox.error; Crop total_crop = _crop; switch (_part) { case PART_LEFT_HALF: - total_crop.right += im->size().width / 2; + total_crop.right += prox.image->size().width / 2; break; case PART_RIGHT_HALF: - total_crop.left += im->size().width / 2; + total_crop.left += prox.image->size().width / 2; break; case PART_TOP_HALF: - total_crop.bottom += im->size().height / 2; + total_crop.bottom += prox.image->size().height / 2; break; case PART_BOTTOM_HALF: - total_crop.top += im->size().height / 2; + total_crop.top += prox.image->size().height / 2; break; default: break; } - if (reduce > 0) { + if (prox.log2_scaling > 0) { /* Scale the crop down to account for the scaling that has already happened in ImageProxy::image */ - int const r = pow(2, reduce); + int const r = pow(2, prox.log2_scaling); total_crop.left /= r; total_crop.right /= r; total_crop.top /= r; @@ -164,8 +170,8 @@ PlayerVideo::make_image (function pixel_format, b yuv_to_rgb = _colour_conversion.get().yuv_to_rgb(); } - _image = im->crop_scale_window ( - total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format (im->pixel_format()), aligned, fast + _image = prox.image->crop_scale_window ( + total_crop, _inter_size, _out_size, yuv_to_rgb, _video_range, pixel_format (prox.image->pixel_format()), aligned, fast ); if (_text) { @@ -191,6 +197,8 @@ 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))); + node->add_child("Error")->add_child_text(_error ? "1" : "0"); if (_colour_conversion) { _colour_conversion.get().as_xml (node); } @@ -203,9 +211,9 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const } void -PlayerVideo::send_binary (shared_ptr socket) const +PlayerVideo::write_to_socket (shared_ptr socket) const { - _in->send_binary (socket); + _in->write_to_socket (socket); if (_text) { _text->image->write_to_socket (socket); } @@ -243,12 +251,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; } @@ -309,13 +318,15 @@ PlayerVideo::shallow_copy () const _eyes, _part, _colour_conversion, + _video_range, _content, - _video_frame + _video_frame, + _error ) ); } -/** 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 @@ -331,6 +342,7 @@ PlayerVideo::reset_metadata (shared_ptr film, dcp::Size video_contai _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; }