X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=75479136f0682bea3be97bf9e1debc8bf4bb390b;hp=a86ff14516c941a745914705b473ee26bdd6db61;hb=ce17803bf356f3e796dccde43b4cc3656609e7fc;hpb=73654117144c6de0ec4efe39ddc88485df546cc9 diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index a86ff1451..75479136f 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -19,6 +19,8 @@ */ #include "player_video.h" +#include "content.h" +#include "video_content.h" #include "image.h" #include "image_proxy.h" #include "j2k_image_proxy.h" @@ -32,7 +34,9 @@ extern "C" { using std::string; using std::cout; +using std::pair; using boost::shared_ptr; +using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; using boost::function; @@ -41,17 +45,18 @@ using dcp::raw_convert; PlayerVideo::PlayerVideo ( shared_ptr in, - DCPTime time, Crop crop, boost::optional fade, dcp::Size inter_size, dcp::Size out_size, Eyes eyes, Part part, - optional colour_conversion + optional colour_conversion, + VideoRange video_range, + weak_ptr content, + optional video_frame ) : _in (in) - , _time (time) , _crop (crop) , _fade (fade) , _inter_size (inter_size) @@ -59,13 +64,15 @@ PlayerVideo::PlayerVideo ( , _eyes (eyes) , _part (part) , _colour_conversion (colour_conversion) + , _video_range (video_range) + , _content (content) + , _video_frame (video_frame) { } PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket) { - _time = DCPTime (node->number_child ("Time")); _crop = Crop (node); _fade = node->optional_number_child ("Fade"); @@ -73,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); @@ -82,31 +90,51 @@ PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket if (node->optional_number_child ("SubtitleX")) { shared_ptr image ( - new Image (AV_PIX_FMT_RGBA, dcp::Size (node->number_child ("SubtitleWidth"), node->number_child ("SubtitleHeight")), true) + new Image (AV_PIX_FMT_BGRA, dcp::Size (node->number_child ("SubtitleWidth"), node->number_child ("SubtitleHeight")), true) ); image->read_from_socket (socket); - _subtitle = PositionImage (image, Position (node->number_child ("SubtitleX"), node->number_child ("SubtitleY"))); + _text = PositionImage (image, Position (node->number_child ("SubtitleX"), node->number_child ("SubtitleY"))); } } void -PlayerVideo::set_subtitle (PositionImage image) +PlayerVideo::set_text (PositionImage image) { - _subtitle = image; + _text = image; } -/** Create an image for this frame. - * @param note Handler for any notes that are made during the process. +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 (dcp::NoteHandler note, function pixel_format, bool aligned, bool fast) const +void +PlayerVideo::make_image (function pixel_format, bool aligned, bool fast) const { - shared_ptr im = _in->image (optional (note)); + _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; Crop total_crop = _crop; switch (_part) { @@ -126,30 +154,36 @@ PlayerVideo::image (dcp::NoteHandler note, function 0) { + /* Scale the crop down to account for the scaling that has already happened in ImageProxy::image */ + int const r = pow(2, reduce); + 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; if (_colour_conversion) { 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 (_in->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 (_subtitle) { - out->alpha_blend (_subtitle->image, _subtitle->position); + if (_text) { + _image->alpha_blend (Image::ensure_aligned (_text->image), _text->position); } if (_fade) { - out->fade (_fade.get ()); + _image->fade (_fade.get ()); } - - return out; } void PlayerVideo::add_metadata (xmlpp::Node* node) const { - node->add_child("Time")->add_child_text (raw_convert (_time.get ())); _crop.as_xml (node); if (_fade) { node->add_child("Fade")->add_child_text (raw_convert (_fade.get ())); @@ -159,16 +193,17 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const node->add_child("InterHeight")->add_child_text (raw_convert (_inter_size.height)); node->add_child("OutWidth")->add_child_text (raw_convert (_out_size.width)); node->add_child("OutHeight")->add_child_text (raw_convert (_out_size.height)); - node->add_child("Eyes")->add_child_text (raw_convert (_eyes)); - node->add_child("Part")->add_child_text (raw_convert (_part)); + 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); } - if (_subtitle) { - node->add_child ("SubtitleWidth")->add_child_text (raw_convert (_subtitle->image->size().width)); - node->add_child ("SubtitleHeight")->add_child_text (raw_convert (_subtitle->image->size().height)); - node->add_child ("SubtitleX")->add_child_text (raw_convert (_subtitle->position.x)); - node->add_child ("SubtitleY")->add_child_text (raw_convert (_subtitle->position.y)); + if (_text) { + node->add_child ("SubtitleWidth")->add_child_text (raw_convert (_text->image->size().width)); + node->add_child ("SubtitleHeight")->add_child_text (raw_convert (_text->image->size().height)); + node->add_child ("SubtitleX")->add_child_text (raw_convert (_text->position.x)); + node->add_child ("SubtitleY")->add_child_text (raw_convert (_text->position.y)); } } @@ -176,8 +211,8 @@ void PlayerVideo::send_binary (shared_ptr socket) const { _in->send_binary (socket); - if (_subtitle) { - _subtitle->image->write_to_socket (socket); + if (_text) { + _text->image->write_to_socket (socket); } } @@ -191,7 +226,7 @@ PlayerVideo::has_j2k () const return false; } - return _crop == Crop () && _inter_size == j2k->size() && !_subtitle && !_fade && !_colour_conversion; + return _crop == Crop () && _out_size == j2k->size() && !_text && !_fade && !_colour_conversion; } Data @@ -208,29 +243,28 @@ PlayerVideo::inter_position () const return Position ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.height) / 2); } -/** @return true if this PlayerVideo is definitely the same as another - * (apart from _time), false if it is probably not - */ +/** @return true if this PlayerVideo is definitely the same as another, false if it is probably not */ 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; } - if ((!_subtitle && other->_subtitle) || (_subtitle && !other->_subtitle)) { - /* One has a subtitle and the other doesn't */ + if ((!_text && other->_text) || (_text && !other->_text)) { + /* One has a text and the other doesn't */ return false; } - if (_subtitle && other->_subtitle && !_subtitle->same (other->_subtitle.get ())) { - /* They both have subtitles but they are different */ + if (_text && other->_text && !_text->same (other->_text.get ())) { + /* They both have texts but they are different */ return false; } @@ -240,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 @@ -250,3 +284,61 @@ PlayerVideo::keep_xyz_or_rgb (AVPixelFormat p) { return p == AV_PIX_FMT_XYZ12LE ? AV_PIX_FMT_XYZ12LE : AV_PIX_FMT_RGB48LE; } + +void +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 +PlayerVideo::memory_used () const +{ + return _in->memory_used(); +} + +/** @return Shallow copy of this; _in and _text are shared between the original and the copy */ +shared_ptr +PlayerVideo::shallow_copy () const +{ + return shared_ptr( + new PlayerVideo( + _in, + _crop, + _fade, + _inter_size, + _out_size, + _eyes, + _part, + _colour_conversion, + _video_range, + _content, + _video_frame + ) + ); +} + +/** 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 (shared_ptr film, dcp::Size video_container_size, dcp::Size film_frame_size) +{ + shared_ptr content = _content.lock(); + if (!content || !_video_frame) { + return false; + } + + _crop = content->video->crop(); + _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; +}