#include "j2k_image_proxy.h"
#include "film.h"
#include "raw_convert.h"
+#include <libxml++/libxml++.h>
+#include <iostream>
using std::string;
using std::cout;
shared_ptr<const ImageProxy> in,
DCPTime time,
Crop crop,
- boost::optional<float> fade,
+ boost::optional<double> fade,
dcp::Size inter_size,
dcp::Size out_size,
Eyes eyes,
{
_time = DCPTime (node->number_child<DCPTime::Type> ("Time"));
_crop = Crop (node);
- _fade = node->optional_number_child<float> ("Fade");
+ _fade = node->optional_number_child<double> ("Fade");
_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"));
bool
PlayerVideo::has_j2k () const
{
- /* XXX: burnt-in subtitle; maybe other things */
+ /* XXX: maybe other things */
shared_ptr<const J2KImageProxy> j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
if (!j2k) {
return false;
}
- return _crop == Crop () && _inter_size == j2k->size();
+ return _crop == Crop () && _inter_size == j2k->size() && !_subtitle && !_fade && !_colour_conversion;
}
Data