X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=c24f9ccaa06b4d70b0b552c62ad4d31876d17c55;hb=365e705bf9fab1107015c9c28bd675090614f154;hp=62dee823ff468c2121cdf05321b6cbd4e592d6ec;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 62dee823f..c24f9ccaa 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,11 +19,13 @@ */ #include "player_video.h" +#include "content.h" +#include "video_content.h" #include "image.h" #include "image_proxy.h" #include "j2k_image_proxy.h" #include "film.h" -#include "raw_convert.h" +#include extern "C" { #include } @@ -33,24 +35,26 @@ extern "C" { using std::string; using std::cout; using boost::shared_ptr; +using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; using boost::function; using dcp::Data; +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, + weak_ptr content, + optional video_frame ) : _in (in) - , _time (time) , _crop (crop) , _fade (fade) , _inter_size (inter_size) @@ -58,13 +62,14 @@ PlayerVideo::PlayerVideo ( , _eyes (eyes) , _part (part) , _colour_conversion (colour_conversion) + , _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"); @@ -81,7 +86,7 @@ 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); @@ -101,11 +106,13 @@ PlayerVideo::set_subtitle (PositionImage image) * @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. + * @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 { - shared_ptr im = _in->image (optional (note)); + shared_ptr im = _in->image (optional (note), _inter_size); Crop total_crop = _crop; switch (_part) { @@ -135,7 +142,7 @@ PlayerVideo::image (dcp::NoteHandler note, functionalpha_blend (_subtitle->image, _subtitle->position); + out->alpha_blend (Image::ensure_aligned (_subtitle->image), _subtitle->position); } if (_fade) { @@ -148,7 +155,6 @@ PlayerVideo::image (dcp::NoteHandler note, functionadd_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 ())); @@ -158,8 +164,8 @@ 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))); if (_colour_conversion) { _colour_conversion.get().as_xml (node); } @@ -190,7 +196,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() && !_subtitle && !_fade && !_colour_conversion; } Data @@ -207,9 +213,7 @@ 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 { @@ -249,3 +253,50 @@ PlayerVideo::keep_xyz_or_rgb (AVPixelFormat p) { return p == AV_PIX_FMT_XYZ12LE ? AV_PIX_FMT_XYZ12LE : AV_PIX_FMT_RGB48LE; } + +void +PlayerVideo::prepare () +{ + _in->prepare (_inter_size); +} + +size_t +PlayerVideo::memory_used () const +{ + return _in->memory_used(); +} + +/** @return Shallow copy of this; _in and _subtitle 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 */ +void +PlayerVideo::reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size) +{ + shared_ptr content = _content.lock(); + DCPOMATIC_ASSERT (content); + DCPOMATIC_ASSERT (_video_frame); + + _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(); +}