X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=02c85be12ea34c0cecc6526e0c8e4766de4d68ca;hb=4d3d20687c9e334b29c8a2821e0646fb9166ab3f;hp=14291fc35c917d068b74f4ba9726915402663523;hpb=3e230d3785f19bc707fd7ea2b1f55321b93f536f;p=dcpomatic.git diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 14291fc35..02c85be12 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; @@ -47,7 +51,9 @@ PlayerVideo::PlayerVideo ( dcp::Size out_size, Eyes eyes, Part part, - optional colour_conversion + optional colour_conversion, + weak_ptr content, + optional video_frame ) : _in (in) , _crop (crop) @@ -57,6 +63,8 @@ PlayerVideo::PlayerVideo ( , _eyes (eyes) , _part (part) , _colour_conversion (colour_conversion) + , _content (content) + , _video_frame (video_frame) { } @@ -79,19 +87,19 @@ 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. @@ -105,7 +113,9 @@ PlayerVideo::set_subtitle (PositionImage image) shared_ptr PlayerVideo::image (dcp::NoteHandler note, function pixel_format, bool aligned, bool fast) const { - shared_ptr im = _in->image (optional (note), _inter_size); + pair, int> prox = _in->image (optional (note), _inter_size); + shared_ptr im = prox.first; + int const reduce = prox.second; Crop total_crop = _crop; switch (_part) { @@ -125,6 +135,15 @@ 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(); @@ -134,8 +153,8 @@ PlayerVideo::image (dcp::NoteHandler note, functionpixel_format()), aligned, fast ); - if (_subtitle) { - out->alpha_blend (Image::ensure_aligned (_subtitle->image), _subtitle->position); + if (_text) { + out->alpha_blend (Image::ensure_aligned (_text->image), _text->position); } if (_fade) { @@ -162,11 +181,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)); } } @@ -174,8 +193,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); } } @@ -189,7 +208,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 @@ -220,13 +239,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; } @@ -252,3 +271,49 @@ PlayerVideo::prepare () { _in->prepare (_inter_size); } + +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, + _content, + _video_frame + ) + ); +} + +/** Re-read crop, fade, inter/out size and colour conversion 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) +{ + shared_ptr 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; + _colour_conversion = content->video->colour_conversion(); + + return true; +}