X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=ba4503d8e1ef84d9999cde135df9f0776d83688d;hb=17df947ac256397311a11894062070f8069c7e75;hp=aad75889fc6a4a4e9f0dedf339f4db88d9dfc012;hpb=769c71b5c3e050ccfc1c13771d24328fbf76a495;p=dcpomatic.git diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index aad75889f..ba4503d8e 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -23,18 +23,24 @@ #include "j2k_image_proxy.h" #include "film.h" #include "raw_convert.h" +extern "C" { +#include +} +#include +#include using std::string; using std::cout; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::optional; +using dcp::Data; 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, @@ -58,7 +64,7 @@ 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 +77,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_RGBA, 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"))); } } @@ -89,10 +95,10 @@ PlayerVideo::set_subtitle (PositionImage image) } shared_ptr -PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle, dcp::NoteHandler note) const +PlayerVideo::image (dcp::NoteHandler note) const { shared_ptr im = _in->image (optional (note)); - + Crop total_crop = _crop; switch (_part) { case PART_LEFT_HALF: @@ -110,11 +116,19 @@ PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle, dcp::NoteHan default: break; } - - shared_ptr out = im->crop_scale_window (total_crop, _inter_size, _out_size, pixel_format, true); - if (burn_subtitle && _subtitle.image) { - out->alpha_blend (_subtitle.image, _subtitle.position); + dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601; + if (_colour_conversion) { + yuv_to_rgb = _colour_conversion.get().yuv_to_rgb(); + } + + /* If the input is XYZ, keep it otherwise convert to RGB */ + AVPixelFormat const p = _in->pixel_format() == AV_PIX_FMT_XYZ12LE ? AV_PIX_FMT_XYZ12LE : AV_PIX_FMT_RGB48LE; + + shared_ptr out = im->crop_scale_window (total_crop, _inter_size, _out_size, yuv_to_rgb, p, true); + + if (_subtitle) { + out->alpha_blend (_subtitle->image, _subtitle->position); } if (_fade) { @@ -125,7 +139,7 @@ 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); @@ -142,37 +156,37 @@ PlayerVideo::add_metadata (xmlpp::Node* node, bool send_subtitles) const 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 () && _inter_size == j2k->size() && !_subtitle && !_fade && !_colour_conversion; } -shared_ptr +Data PlayerVideo::j2k () const { shared_ptr j2k = dynamic_pointer_cast (_in); @@ -192,17 +206,27 @@ PlayerVideo::inter_position () const bool PlayerVideo::same (shared_ptr other) const { - if (_in != other->_in || - _crop != other->_crop || + if (_crop != other->_crop || _fade.get_value_or(0) != other->_fade.get_value_or(0) || _inter_size != other->_inter_size || _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); }