X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=081147434ad4846bf751cf9340ff7859da8587ce;hb=d311043bf3c1e3e7f41b314f7ab7c91ed7e5aa7f;hp=a687e7ea536a1622c4f037dfce1cdec3cdd442c7;hpb=9bfa07293928c371d59db2091ba2b7e715ce5994;p=dcpomatic.git diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index a687e7ea5..081147434 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -18,6 +18,7 @@ */ + #include "content.h" #include "film.h" #include "image.h" @@ -33,17 +34,19 @@ extern "C" { #include #include + using std::cout; using std::dynamic_pointer_cast; +using std::function; using std::make_shared; using std::shared_ptr; using std::string; using std::weak_ptr; using boost::optional; -using std::function; using dcp::Data; using dcp::raw_convert; + PlayerVideo::PlayerVideo ( shared_ptr in, Crop crop, @@ -74,6 +77,7 @@ PlayerVideo::PlayerVideo ( } + PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket) { _crop = Crop (node); @@ -94,7 +98,7 @@ PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket if (node->optional_number_child("SubtitleX")) { auto image = make_shared ( - AV_PIX_FMT_BGRA, dcp::Size(node->number_child("SubtitleWidth"), node->number_child("SubtitleHeight")), true + AV_PIX_FMT_BGRA, dcp::Size(node->number_child("SubtitleWidth"), node->number_child("SubtitleHeight")), Image::Alignment::PADDED ); image->read_from_socket (socket); @@ -103,20 +107,22 @@ PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket } } + void PlayerVideo::set_text (PositionImage image) { _text = image; } + shared_ptr -PlayerVideo::image (function pixel_format, VideoRange video_range, bool aligned, bool fast) const +PlayerVideo::image (function pixel_format, VideoRange video_range, 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, video_range, aligned, fast); + make_image (pixel_format, video_range, fast); } return _image; } @@ -125,7 +131,7 @@ PlayerVideo::image (function pixel_format, VideoR shared_ptr PlayerVideo::raw_image () const { - return _in->image(false, _inter_size).image; + return _in->image(Image::Alignment::COMPACT, _inter_size).image; } @@ -133,18 +139,17 @@ PlayerVideo::raw_image () const * @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 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. */ void -PlayerVideo::make_image (function pixel_format, VideoRange video_range, bool aligned, bool fast) const +PlayerVideo::make_image (function pixel_format, VideoRange video_range, bool fast) const { _image_crop = _crop; _image_inter_size = _inter_size; _image_out_size = _out_size; _image_fade = _fade; - auto prox = _in->image (true, _inter_size); + auto prox = _in->image (Image::Alignment::PADDED, _inter_size); _error = prox.error; auto total_crop = _crop; @@ -180,11 +185,11 @@ PlayerVideo::make_image (function pixel_format, V } _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 + total_crop, _inter_size, _out_size, yuv_to_rgb, _video_range, pixel_format (prox.image->pixel_format()), video_range, Image::Alignment::COMPACT, fast ); if (_text) { - _image->alpha_blend (Image::ensure_aligned(_text->image, true), _text->position); + _image->alpha_blend (_text->image, _text->position); } if (_fade) { @@ -192,6 +197,7 @@ PlayerVideo::make_image (function pixel_format, V } } + void PlayerVideo::add_metadata (xmlpp::Node* node) const { @@ -219,6 +225,7 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const } } + void PlayerVideo::write_to_socket (shared_ptr socket) const { @@ -228,6 +235,7 @@ PlayerVideo::write_to_socket (shared_ptr socket) const } } + bool PlayerVideo::has_j2k () const { @@ -241,6 +249,7 @@ PlayerVideo::has_j2k () const return _crop == Crop() && _out_size == j2k->size() && _inter_size == j2k->size() && !_text && !_fade && !_colour_conversion; } + shared_ptr PlayerVideo::j2k () const { @@ -249,12 +258,14 @@ PlayerVideo::j2k () const return j2k->j2k (); } + Position 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, false if it is probably not */ bool PlayerVideo::same (shared_ptr other) const @@ -285,6 +296,7 @@ PlayerVideo::same (shared_ptr other) const return _in->same (other->_in); } + AVPixelFormat PlayerVideo::force (AVPixelFormat, AVPixelFormat force_to) { @@ -297,22 +309,25 @@ 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, VideoRange video_range, bool aligned, bool fast, bool proxy_only) +PlayerVideo::prepare (function pixel_format, VideoRange video_range, Image::Alignment alignment, bool fast, bool proxy_only) { - _in->prepare (aligned, _inter_size); + _in->prepare (alignment, _inter_size); boost::mutex::scoped_lock lm (_mutex); if (!_image && !proxy_only) { - make_image (pixel_format, video_range, aligned, fast); + make_image (pixel_format, video_range, 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 @@ -333,6 +348,7 @@ PlayerVideo::shallow_copy () const ); } + /** Re-read crop, fade, inter/out size, colour conversion and video range from our content. * @return true if this was possible, false if not. */ @@ -344,9 +360,14 @@ PlayerVideo::reset_metadata (shared_ptr film, dcp::Size player_video return false; } - _crop = content->video->crop(); + _crop = content->video->actual_crop(); _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()); + _inter_size = scale_for_display( + content->video->scaled_size(film->frame_size()), + player_video_container_size, + film->frame_size(), + content->video->pixel_quanta() + ); _out_size = player_video_container_size; _colour_conversion = content->video->colour_conversion(); _video_range = content->video->range();