X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=8eb39efedca6484e47b50d7fe679cef8d317197e;hb=3c88c626399fff9b95c89065d3b8ee9de1148d52;hp=a84d3b45f2c9346c6e58251dedf8328bcea774e0;hpb=a97dffe585e8e185c57a3f1b025cffa6da9525d2;p=dcpomatic.git diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index a84d3b45f..8eb39efed 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -1,48 +1,60 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #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 +} +#include +#include 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, + 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) @@ -50,15 +62,16 @@ 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"); + _fade = node->optional_number_child ("Fade"); _inter_size = dcp::Size (node->number_child ("InterWidth"), node->number_child ("InterHeight")); _out_size = dcp::Size (node->number_child ("OutWidth"), node->number_child ("OutHeight")); @@ -71,14 +84,14 @@ PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket _in = image_proxy_factory (node->node_child ("In"), socket); if (node->optional_number_child ("SubtitleX")) { - - _subtitle.position = Position (node->number_child ("SubtitleX"), node->number_child ("SubtitleY")); - _subtitle.image.reset ( - new Image (PIX_FMT_RGBA, dcp::Size (node->number_child ("SubtitleWidth"), node->number_child ("SubtitleHeight")), true) + shared_ptr image ( + new Image (AV_PIX_FMT_BGRA, dcp::Size (node->number_child ("SubtitleWidth"), node->number_child ("SubtitleHeight")), true) ); - - _subtitle.image->read_from_socket (socket); + + image->read_from_socket (socket); + + _subtitle = PositionImage (image, Position (node->number_child ("SubtitleX"), node->number_child ("SubtitleY"))); } } @@ -88,11 +101,19 @@ PlayerVideo::set_subtitle (PositionImage image) _subtitle = image; } +/** Create an image for this frame. + * @param note Handler for any notes that are made during the process. + * @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 (AVPixelFormat pixel_format, bool burn_subtitle, dcp::NoteHandler note) const +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) { case PART_LEFT_HALF: @@ -115,11 +136,13 @@ PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle, dcp::NoteHan 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, true); - if (burn_subtitle && _subtitle.image) { - out->alpha_blend (_subtitle.image, _subtitle.position); + shared_ptr out = im->crop_scale_window ( + total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format (_in->pixel_format()), aligned, fast + ); + + if (_subtitle) { + out->alpha_blend (Image::ensure_aligned (_subtitle->image), _subtitle->position); } if (_fade) { @@ -130,9 +153,8 @@ PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle, dcp::NoteHan } void -PlayerVideo::add_metadata (xmlpp::Node* node, bool send_subtitles) const +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 ())); @@ -142,39 +164,39 @@ PlayerVideo::add_metadata (xmlpp::Node* node, bool send_subtitles) 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); } - if (send_subtitles && _subtitle.image) { - 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 (_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)); } } void -PlayerVideo::send_binary (shared_ptr socket, bool send_subtitles) const +PlayerVideo::send_binary (shared_ptr socket) const { _in->send_binary (socket); - if (send_subtitles && _subtitle.image) { - _subtitle.image->write_to_socket (socket); + if (_subtitle) { + _subtitle->image->write_to_socket (socket); } } bool PlayerVideo::has_j2k () const { - /* XXX: burnt-in subtitle; maybe other things */ - + /* XXX: maybe other things */ + shared_ptr j2k = dynamic_pointer_cast (_in); if (!j2k) { return false; } - - return _crop == Crop () && _inter_size == j2k->size(); + + return _crop == Crop () && _out_size == j2k->size() && !_subtitle && !_fade && !_colour_conversion; } Data @@ -191,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 { @@ -203,11 +223,85 @@ PlayerVideo::same (shared_ptr other) const _out_size != other->_out_size || _eyes != other->_eyes || _part != other->_part || - _colour_conversion != other->_colour_conversion || - !_subtitle.same (other->_subtitle)) { + _colour_conversion != other->_colour_conversion) { + return false; + } + if ((!_subtitle && other->_subtitle) || (_subtitle && !other->_subtitle)) { + /* One has a subtitle and the other doesn't */ return false; } + if (_subtitle && other->_subtitle && !_subtitle->same (other->_subtitle.get ())) { + /* They both have subtitles but they are different */ + return false; + } + + /* Now neither has subtitles */ + return _in->same (other->_in); } + +AVPixelFormat +PlayerVideo::always_rgb (AVPixelFormat) +{ + return AV_PIX_FMT_RGB24; +} + +AVPixelFormat +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. + * @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; +}