projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Actually use YUV->RGB setting when converting.
[dcpomatic.git]
/
src
/
lib
/
player_video.cc
diff --git
a/src/lib/player_video.cc
b/src/lib/player_video.cc
index 8e6fcd5f3524f8baf4e00c54f791cc92bf4778a7..81e01329a5b641ac1869d2f158b645375d364bd1 100644
(file)
--- a/
src/lib/player_video.cc
+++ b/
src/lib/player_video.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
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
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,18
+17,18
@@
*/
*/
-#include <dcp/raw_convert.h>
#include "player_video.h"
#include "image.h"
#include "image_proxy.h"
#include "j2k_image_proxy.h"
#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"
using std::string;
using std::cout;
using std::string;
using std::cout;
-using dcp::raw_convert;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
+using boost::optional;
PlayerVideo::PlayerVideo (
shared_ptr<const ImageProxy> in,
PlayerVideo::PlayerVideo (
shared_ptr<const ImageProxy> in,
@@
-37,10
+37,9
@@
PlayerVideo::PlayerVideo (
boost::optional<float> fade,
dcp::Size inter_size,
dcp::Size out_size,
boost::optional<float> fade,
dcp::Size inter_size,
dcp::Size out_size,
- Scaler const * scaler,
Eyes eyes,
Part part,
Eyes eyes,
Part part,
-
ColourConversion
colour_conversion
+
optional<ColourConversion>
colour_conversion
)
: _in (in)
, _time (time)
)
: _in (in)
, _time (time)
@@
-48,7
+47,6
@@
PlayerVideo::PlayerVideo (
, _fade (fade)
, _inter_size (inter_size)
, _out_size (out_size)
, _fade (fade)
, _inter_size (inter_size)
, _out_size (out_size)
- , _scaler (scaler)
, _eyes (eyes)
, _part (part)
, _colour_conversion (colour_conversion)
, _eyes (eyes)
, _part (part)
, _colour_conversion (colour_conversion)
@@
-56,7
+54,7
@@
PlayerVideo::PlayerVideo (
}
}
-PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
, shared_ptr<Log> log
)
+PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket)
{
_time = DCPTime (node->number_child<DCPTime::Type> ("Time"));
_crop = Crop (node);
{
_time = DCPTime (node->number_child<DCPTime::Type> ("Time"));
_crop = Crop (node);
@@
-64,12
+62,13
@@
PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
_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 = 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"));
- _scaler = Scaler::from_id (node->string_child ("Scaler"));
_eyes = (Eyes) node->number_child<int> ("Eyes");
_part = (Part) node->number_child<int> ("Part");
_eyes = (Eyes) node->number_child<int> ("Eyes");
_part = (Part) node->number_child<int> ("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<int> ("SubtitleX")) {
if (node->optional_number_child<int> ("SubtitleX")) {
@@
-90,9
+89,9
@@
PlayerVideo::set_subtitle (PositionImage image)
}
shared_ptr<Image>
}
shared_ptr<Image>
-PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle) const
+PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle
, dcp::NoteHandler note
) const
{
{
- shared_ptr<Image> im = _in->image ();
+ shared_ptr<Image> im = _in->image (
optional<dcp::NoteHandler> (note)
);
Crop total_crop = _crop;
switch (_part) {
Crop total_crop = _crop;
switch (_part) {
@@
-111,8
+110,13
@@
PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle) const
default:
break;
}
default:
break;
}
+
+ dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
+ if (_colour_conversion) {
+ yuv_to_rgb = _colour_conversion.get().yuv_to_rgb();
+ }
- shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size,
_scaler
, pixel_format, true);
+ shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size,
yuv_to_rgb
, pixel_format, true);
if (burn_subtitle && _subtitle.image) {
out->alpha_blend (_subtitle.image, _subtitle.position);
if (burn_subtitle && _subtitle.image) {
out->alpha_blend (_subtitle.image, _subtitle.position);
@@
-138,10
+142,11
@@
PlayerVideo::add_metadata (xmlpp::Node* node, bool send_subtitles) const
node->add_child("InterHeight")->add_child_text (raw_convert<string> (_inter_size.height));
node->add_child("OutWidth")->add_child_text (raw_convert<string> (_out_size.width));
node->add_child("OutHeight")->add_child_text (raw_convert<string> (_out_size.height));
node->add_child("InterHeight")->add_child_text (raw_convert<string> (_inter_size.height));
node->add_child("OutWidth")->add_child_text (raw_convert<string> (_out_size.width));
node->add_child("OutHeight")->add_child_text (raw_convert<string> (_out_size.height));
- 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));
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));
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));
@@
-176,7
+181,7
@@
shared_ptr<EncodedData>
PlayerVideo::j2k () const
{
shared_ptr<const J2KImageProxy> j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
PlayerVideo::j2k () const
{
shared_ptr<const J2KImageProxy> j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
-
assert
(j2k);
+
DCPOMATIC_ASSERT
(j2k);
return j2k->j2k ();
}
return j2k->j2k ();
}
@@
-197,7
+202,6
@@
PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
_fade.get_value_or(0) != other->_fade.get_value_or(0) ||
_inter_size != other->_inter_size ||
_out_size != other->_out_size ||
_fade.get_value_or(0) != other->_fade.get_value_or(0) ||
_inter_size != other->_inter_size ||
_out_size != other->_out_size ||
- _scaler != other->_scaler ||
_eyes != other->_eyes ||
_part != other->_part ||
_colour_conversion != other->_colour_conversion ||
_eyes != other->_eyes ||
_part != other->_part ||
_colour_conversion != other->_colour_conversion ||