X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=f91b990c8b1d32c8df8ac723ddc820dac71da0c2;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=94432d66e046c289eb4f60f31923f8ac62623abe;hpb=f41310384889e4cfb6e709d098b316e212d8bf22;p=dcpomatic.git diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 94432d66e..f91b990c8 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,13 +18,14 @@ */ -#include "player_video.h" #include "content.h" -#include "video_content.h" +#include "film.h" #include "image.h" #include "image_proxy.h" #include "j2k_image_proxy.h" -#include "film.h" +#include "player.h" +#include "player_video.h" +#include "video_content.h" #include extern "C" { #include @@ -32,12 +33,13 @@ extern "C" { #include #include -using std::string; using std::cout; +using std::dynamic_pointer_cast; +using std::make_shared; using std::pair; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::string; +using std::weak_ptr; using boost::optional; using boost::function; using dcp::Data; @@ -52,8 +54,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 +67,10 @@ PlayerVideo::PlayerVideo ( , _eyes (eyes) , _part (part) , _colour_conversion (colour_conversion) + , _video_range (video_range) , _content (content) , _video_frame (video_frame) + , _error (error) { } @@ -76,23 +82,25 @@ PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket _inter_size = dcp::Size (node->number_child ("InterWidth"), node->number_child ("InterHeight")); _out_size = dcp::Size (node->number_child ("OutWidth"), node->number_child ("OutHeight")); - _eyes = (Eyes) node->number_child ("Eyes"); - _part = (Part) node->number_child ("Part"); + _eyes = static_cast(node->number_child("Eyes")); + _part = static_cast(node->number_child("Part")); + _video_range = static_cast(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); - _in = image_proxy_factory (node->node_child ("In"), socket); + _in = image_proxy_factory (node->node_child("In"), socket); - if (node->optional_number_child ("SubtitleX")) { + if (node->optional_number_child("SubtitleX")) { - shared_ptr image ( - new Image (AV_PIX_FMT_BGRA, dcp::Size (node->number_child ("SubtitleWidth"), node->number_child ("SubtitleHeight")), true) + auto image = make_shared ( + AV_PIX_FMT_BGRA, dcp::Size(node->number_child("SubtitleWidth"), node->number_child("SubtitleHeight")), true ); image->read_from_socket (socket); - _text = PositionImage (image, Position (node->number_child ("SubtitleX"), node->number_child ("SubtitleY"))); + _text = PositionImage (image, Position(node->number_child("SubtitleX"), node->number_child("SubtitleY"))); } } @@ -103,13 +111,13 @@ PlayerVideo::set_text (PositionImage image) } shared_ptr -PlayerVideo::image (function pixel_format, bool aligned, bool fast) const +PlayerVideo::image (function pixel_format, VideoRange video_range, bool aligned, bool fast) const { - /* XXX: this assumes that image() and prepare() are only ever called with the same parameters */ + /* 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) { - make_image (pixel_format, aligned, fast); + if (!_image || _crop != _image_crop || _inter_size != _image_inter_size || _out_size != _image_out_size || _fade != _image_fade) { + make_image (pixel_format, video_range, aligned, fast); } return _image; } @@ -122,46 +130,50 @@ PlayerVideo::image (function pixel_format, bool a * @param fast true to be fast at the expense of quality. */ void -PlayerVideo::make_image (function pixel_format, bool aligned, bool fast) const +PlayerVideo::make_image (function pixel_format, VideoRange video_range, bool aligned, bool fast) const { - pair, int> prox = _in->image (_inter_size); - shared_ptr im = prox.first; - int const reduce = prox.second; + _image_crop = _crop; + _image_inter_size = _inter_size; + _image_out_size = _out_size; + _image_fade = _fade; + + auto prox = _in->image (_inter_size); + _error = prox.error; - Crop total_crop = _crop; + auto total_crop = _crop; switch (_part) { - case PART_LEFT_HALF: - total_crop.right += im->size().width / 2; + case Part::LEFT_HALF: + total_crop.right += prox.image->size().width / 2; break; - case PART_RIGHT_HALF: - total_crop.left += im->size().width / 2; + case Part::RIGHT_HALF: + total_crop.left += prox.image->size().width / 2; break; - case PART_TOP_HALF: - total_crop.bottom += im->size().height / 2; + case Part::TOP_HALF: + total_crop.bottom += prox.image->size().height / 2; break; - case PART_BOTTOM_HALF: - total_crop.top += im->size().height / 2; + case Part::BOTTOM_HALF: + 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; total_crop.bottom /= r; } - dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601; + dcp::YUVToRGB yuv_to_rgb = dcp::YUVToRGB::REC601; if (_colour_conversion) { 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()), video_range, aligned, fast ); if (_text) { @@ -187,6 +199,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); } @@ -199,9 +213,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); } @@ -212,18 +226,18 @@ PlayerVideo::has_j2k () const { /* XXX: maybe other things */ - shared_ptr j2k = dynamic_pointer_cast (_in); + auto j2k = dynamic_pointer_cast (_in); if (!j2k) { return false; } - return _crop == Crop () && _out_size == j2k->size() && !_text && !_fade && !_colour_conversion; + return _crop == Crop() && _out_size == j2k->size() && !_text && !_fade && !_colour_conversion; } -Data +shared_ptr PlayerVideo::j2k () const { - shared_ptr j2k = dynamic_pointer_cast (_in); + auto j2k = dynamic_pointer_cast (_in); DCPOMATIC_ASSERT (j2k); return j2k->j2k (); } @@ -239,12 +253,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; } @@ -276,12 +291,12 @@ PlayerVideo::keep_xyz_or_rgb (AVPixelFormat p) } void -PlayerVideo::prepare (function pixel_format, bool aligned, bool fast) +PlayerVideo::prepare (function pixel_format, VideoRange video_range, bool aligned, bool fast) { _in->prepare (_inter_size); boost::mutex::scoped_lock lm (_mutex); if (!_image) { - make_image (pixel_format, aligned, fast); + make_image (pixel_format, video_range, aligned, fast); } } @@ -295,38 +310,39 @@ PlayerVideo::memory_used () const shared_ptr PlayerVideo::shallow_copy () const { - return shared_ptr( - new PlayerVideo( - _in, - _crop, - _fade, - _inter_size, - _out_size, - _eyes, - _part, - _colour_conversion, - _content, - _video_frame - ) + return std::make_shared( + _in, + _crop, + _fade, + _inter_size, + _out_size, + _eyes, + _part, + _colour_conversion, + _video_range, + _content, + _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 -PlayerVideo::reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size) +PlayerVideo::reset_metadata (shared_ptr film, dcp::Size player_video_container_size) { - shared_ptr content = _content.lock(); + auto content = _content.lock(); if (!content || !_video_frame) { return false; } _crop = content->video->crop(); - _fade = content->video->fade(_video_frame.get()); - _inter_size = content->video->scale().size(content->video, video_container_size, film_frame_size); - _out_size = video_container_size; + _fade = content->video->fade(film, _video_frame.get()); + _inter_size = scale_for_display(content->video->scaled_size(film->frame_size()), player_video_container_size, film->frame_size()); + _out_size = player_video_container_size; _colour_conversion = content->video->colour_conversion(); + _video_range = content->video->range(); return true; }