*/
-#include <dcp/raw_convert.h>
+#include <libdcp/raw_convert.h>
#include "player_video_frame.h"
#include "image.h"
#include "image_proxy.h"
using std::string;
using std::cout;
using boost::shared_ptr;
-using dcp::raw_convert;
+using libdcp::raw_convert;
PlayerVideoFrame::PlayerVideoFrame (
shared_ptr<const ImageProxy> in,
Crop crop,
- dcp::Size inter_size,
- dcp::Size out_size,
+ libdcp::Size inter_size,
+ libdcp::Size out_size,
Scaler const * scaler,
Eyes eyes,
Part part,
- ColourConversion colour_conversion
+ boost::optional<ColourConversion> colour_conversion
)
: _in (in)
, _crop (crop)
{
_crop = Crop (node);
- _inter_size = dcp::Size (node->number_child<int> ("InterWidth"), node->number_child<int> ("InterHeight"));
- _out_size = dcp::Size (node->number_child<int> ("OutWidth"), node->number_child<int> ("OutHeight"));
+ _inter_size = libdcp::Size (node->number_child<int> ("InterWidth"), node->number_child<int> ("InterHeight"));
+ _out_size = libdcp::Size (node->number_child<int> ("OutWidth"), node->number_child<int> ("OutHeight"));
_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);
if (node->optional_number_child<int> ("SubtitleX")) {
- _subtitle.position = Position<int> (node->number_child<int> ("SubtitleX"), node->number_child<int> ("SubtitleY"));
+ _subtitle_position = Position<int> (node->number_child<int> ("SubtitleX"), node->number_child<int> ("SubtitleY"));
- _subtitle.image.reset (
- new Image (PIX_FMT_RGBA, dcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true)
+ shared_ptr<Image> image (
+ new Image (PIX_FMT_RGBA, libdcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true)
);
- _subtitle.image->read_from_socket (socket);
+ image->read_from_socket (socket);
+ _subtitle_image = image;
}
}
void
-PlayerVideoFrame::set_subtitle (PositionImage image)
+PlayerVideoFrame::set_subtitle (shared_ptr<const Image> image, Position<int> pos)
{
- _subtitle = image;
+ _subtitle_image = image;
+ _subtitle_position = pos;
}
shared_ptr<Image>
-PlayerVideoFrame::image () const
+PlayerVideoFrame::image (AVPixelFormat pixel_format) 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, false);
Position<int> const container_offset ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.width) / 2);
- if (_subtitle.image) {
- out->alpha_blend (_subtitle.image, _subtitle.position);
+ if (_subtitle_image) {
+ out->alpha_blend (_subtitle_image, _subtitle_position);
}
return out;
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 (_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));
- node->add_child ("SubtitleX")->add_child_text (raw_convert<string> (_subtitle.position.x));
- node->add_child ("SubtitleY")->add_child_text (raw_convert<string> (_subtitle.position.y));
+ if (_colour_conversion) {
+ _colour_conversion.get().as_xml (node);
+ }
+ if (_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));
+ node->add_child ("SubtitleX")->add_child_text (raw_convert<string> (_subtitle_position.x));
+ node->add_child ("SubtitleY")->add_child_text (raw_convert<string> (_subtitle_position.y));
}
}
PlayerVideoFrame::send_binary (shared_ptr<Socket> socket) const
{
_in->send_binary (socket);
- if (_subtitle.image) {
- _subtitle.image->write_to_socket (socket);
+ if (_subtitle_image) {
+ _subtitle_image->write_to_socket (socket);
}
}