X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=3e361e45de48dc001f5e2e860a694e3b642a5758;hp=8fd966e5fc57a73ff2c0297fe0c893b07ec35e81;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=cb1dfa9ec09af2abf6d10e4bf2764476db83841b diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 8fd966e5f..3e361e45d 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,36 +17,38 @@ */ -#include #include "player_video.h" #include "image.h" #include "image_proxy.h" #include "j2k_image_proxy.h" -#include "scaler.h" +#include "film.h" +#include "raw_convert.h" +#include +#include using std::string; using std::cout; -using dcp::raw_convert; using boost::shared_ptr; using boost::dynamic_pointer_cast; +using boost::optional; PlayerVideo::PlayerVideo ( shared_ptr in, DCPTime time, Crop crop, + boost::optional fade, dcp::Size inter_size, dcp::Size out_size, - Scaler const * scaler, Eyes eyes, Part part, - ColourConversion colour_conversion + optional colour_conversion ) : _in (in) , _time (time) , _crop (crop) + , _fade (fade) , _inter_size (inter_size) , _out_size (out_size) - , _scaler (scaler) , _eyes (eyes) , _part (part) , _colour_conversion (colour_conversion) @@ -54,29 +56,31 @@ PlayerVideo::PlayerVideo ( } -PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket, shared_ptr log) +PlayerVideo::PlayerVideo (shared_ptr node, shared_ptr socket) { _time = DCPTime (node->number_child ("Time")); _crop = Crop (node); + _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")); - _scaler = Scaler::from_id (node->string_child ("Scaler")); _eyes = (Eyes) node->number_child ("Eyes"); _part = (Part) node->number_child ("Part"); - _colour_conversion = ColourConversion (node); - _in = image_proxy_factory (node->node_child ("In"), socket, log); + /* Assume that the ColourConversion uses the current state version */ + _colour_conversion = ColourConversion::from_xml (node, Film::current_state_version); + + _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 ( + shared_ptr image ( new Image (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"))); } } @@ -87,10 +91,10 @@ PlayerVideo::set_subtitle (PositionImage image) } shared_ptr -PlayerVideo::image (bool burn_subtitle) const +PlayerVideo::image (AVPixelFormat pixel_format, dcp::NoteHandler note) const { - shared_ptr im = _in->image (); - + shared_ptr im = _in->image (optional (note)); + Crop total_crop = _crop; switch (_part) { case PART_LEFT_HALF: @@ -108,65 +112,78 @@ PlayerVideo::image (bool burn_subtitle) const default: break; } - - shared_ptr out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, PIX_FMT_RGB24, 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(); + } + + shared_ptr out = im->crop_scale_window (total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format, true); + + if (_subtitle) { + out->alpha_blend (_subtitle->image, _subtitle->position); + } + + if (_fade) { + out->fade (_fade.get ()); } return out; } 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 ())); + } _in->add_metadata (node->add_child ("In")); node->add_child("InterWidth")->add_child_text (raw_convert (_inter_size.width)); 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("Scaler")->add_child_text (_scaler->id ()); node->add_child("Eyes")->add_child_text (raw_convert (_eyes)); node->add_child("Part")->add_child_text (raw_convert (_part)); - _colour_conversion.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 (_colour_conversion) { + _colour_conversion.get().as_xml (node); + } + 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); - assert (j2k); + DCPOMATIC_ASSERT (j2k); return j2k->j2k (); } @@ -176,4 +193,33 @@ 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 + */ +bool +PlayerVideo::same (shared_ptr other) const +{ + 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) { + 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); +}