X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=5c287dc92d3cbdf1bd48f66af90be17af41edd3c;hb=ff06669bc8c14abe40cd9590afc8391f19608424;hp=a50b196a200152caf782a108c45eb1fdaddc5fbc;hpb=0ff4fa6058b305476e7bc60c590acb6135c49b1c;p=dcpomatic.git diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index a50b196a2..5c287dc92 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -92,28 +92,43 @@ PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket 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) */ + + boost::mutex::scoped_lock lm (_mutex); + if (!_image || _crop != _image_crop || _inter_size != _image_inter_size || _out_size != _image_out_size) { + 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 { - pair, int> prox = _in->image (optional (note), _inter_size); + _image_crop = _crop; + _image_inter_size = _inter_size; + _image_out_size = _out_size; + + pair, int> prox = _in->image (_inter_size); shared_ptr im = prox.first; int const reduce = prox.second; @@ -149,19 +164,17 @@ PlayerVideo::image (dcp::NoteHandler note, function 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, pixel_format (im->pixel_format()), aligned, fast ); - if (_subtitle) { - out->alpha_blend (Image::ensure_aligned (_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 @@ -181,11 +194,11 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const 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)); } } @@ -193,8 +206,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); } } @@ -208,7 +221,7 @@ PlayerVideo::has_j2k () const return false; } - return _crop == Crop () && _out_size == j2k->size() && !_subtitle && !_fade && !_colour_conversion; + return _crop == Crop () && _out_size == j2k->size() && !_text && !_fade && !_colour_conversion; } Data @@ -230,7 +243,7 @@ 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 || @@ -239,13 +252,13 @@ PlayerVideo::same (shared_ptr other) const 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; } @@ -255,9 +268,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 @@ -267,9 +280,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 @@ -278,7 +295,7 @@ PlayerVideo::memory_used () const return _in->memory_used(); } -/** @return Shallow copy of this; _in and _subtitle are shared between the original and the copy */ +/** @return Shallow copy of this; _in and _text are shared between the original and the copy */ shared_ptr PlayerVideo::shallow_copy () const { @@ -302,7 +319,7 @@ PlayerVideo::shallow_copy () const * @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) { @@ -310,7 +327,7 @@ 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();