X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fplayer_video.cc;h=14291fc35c917d068b74f4ba9726915402663523;hb=3e230d3785f19bc707fd7ea2b1f55321b93f536f;hp=018f04737acec4df8a050b086aff84be1fbe5659;hpb=4a4725e41bf4070969223f9c40885063c50e61d0;p=dcpomatic.git diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 018f04737..14291fc35 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2013-2015 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 . */ @@ -22,17 +23,24 @@ #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::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, @@ -42,7 +50,6 @@ PlayerVideo::PlayerVideo ( optional colour_conversion ) : _in (in) - , _time (time) , _crop (crop) , _fade (fade) , _inter_size (inter_size) @@ -56,7 +63,6 @@ PlayerVideo::PlayerVideo ( PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket) { - _time = DCPTime (node->number_child ("Time")); _crop = Crop (node); _fade = node->optional_number_child ("Fade"); @@ -73,7 +79,7 @@ PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket if (node->optional_number_child ("SubtitleX")) { shared_ptr image ( - new Image (PIX_FMT_RGBA, dcp::Size (node->number_child ("SubtitleWidth"), node->number_child ("SubtitleHeight")), true) + new Image (AV_PIX_FMT_RGBA, dcp::Size (node->number_child ("SubtitleWidth"), node->number_child ("SubtitleHeight")), true) ); image->read_from_socket (socket); @@ -88,10 +94,18 @@ 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, 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) { @@ -116,10 +130,12 @@ PlayerVideo::image (AVPixelFormat pixel_format, dcp::NoteHandler note) const 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); + 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 (_subtitle->image, _subtitle->position); + out->alpha_blend (Image::ensure_aligned (_subtitle->image), _subtitle->position); } if (_fade) { @@ -132,7 +148,6 @@ PlayerVideo::image (AVPixelFormat pixel_format, dcp::NoteHandler note) const void 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,8 +157,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); } @@ -174,7 +189,7 @@ PlayerVideo::has_j2k () const return false; } - return _crop == Crop () && _inter_size == j2k->size() && !_subtitle && !_fade; + return _crop == Crop () && _out_size == j2k->size() && !_subtitle && !_fade && !_colour_conversion; } Data @@ -191,9 +206,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 { @@ -221,3 +234,21 @@ PlayerVideo::same (shared_ptr other) const 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); +}