using dcp::raw_convert;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
+using boost::optional;
PlayerVideo::PlayerVideo (
shared_ptr<const ImageProxy> in,
Scaler const * scaler,
Eyes eyes,
Part part,
- ColourConversion colour_conversion
+ optional<ColourConversion> colour_conversion
)
: _in (in)
, _time (time)
_scaler = Scaler::from_id (node->string_child ("Scaler"));
_eyes = (Eyes) node->number_child<int> ("Eyes");
_part = (Part) node->number_child<int> ("Part");
- _colour_conversion = ColourConversion (node);
+ _colour_conversion = ColourConversion::from_xml (node);
_in = image_proxy_factory (node->node_child ("In"), socket, log);
}
shared_ptr<Image>
-PlayerVideo::image (bool burn_subtitle) const
+PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle) const
{
shared_ptr<Image> im = _in->image ();
break;
}
- shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, PIX_FMT_RGB24, true);
+ shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, pixel_format, true);
if (burn_subtitle && _subtitle.image) {
out->alpha_blend (_subtitle.image, _subtitle.position);
node->add_child("Scaler")->add_child_text (_scaler->id ());
node->add_child("Eyes")->add_child_text (raw_convert<string> (_eyes));
node->add_child("Part")->add_child_text (raw_convert<string> (_part));
- _colour_conversion.as_xml (node);
+ if (_colour_conversion) {
+ _colour_conversion.get().as_xml (node);
+ }
if (send_subtitles && _subtitle.image) {
node->add_child ("SubtitleWidth")->add_child_text (raw_convert<string> (_subtitle.image->size().width));
node->add_child ("SubtitleHeight")->add_child_text (raw_convert<string> (_subtitle.image->size().height));