Logging improvements to allow prettier displays in the server GUI.

[dcpomatic.git] / src / lib / player_video.cc

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 4faed9da394017b21545629c01d730027bb3dda6..3e361e45de48dc001f5e2e860a694e3b642a5758 100644 (file)
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -23,6 +23,8 @@
 #include "j2k_image_proxy.h"
 #include "film.h"
 #include "raw_convert.h"
+#include <libxml++/libxml++.h>
+#include <iostream>
 
 using std::string;
 using std::cout;
@@ -34,7 +36,7 @@ PlayerVideo::PlayerVideo (
        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,
@@ -58,7 +60,7 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
 {
        _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"));
@@ -71,14 +73,14 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
        _in = image_proxy_factory (node->node_child ("In"), socket);
 
        if (node->optional_number_child<int> ("SubtitleX")) {
-               
-               _subtitle.position = Position<int> (node->number_child<int> ("SubtitleX"), node->number_child<int> ("SubtitleY"));
 
-               _subtitle.image.reset (
+               shared_ptr<Image> image (
                        new Image (PIX_FMT_RGBA, dcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true)
                        );
-               
-               _subtitle.image->read_from_socket (socket);
+
+               image->read_from_socket (socket);
+
+               _subtitle = PositionImage (image, Position<int> (node->number_child<int> ("SubtitleX"), node->number_child<int> ("SubtitleY")));
        }
 }
 
@@ -89,10 +91,10 @@ PlayerVideo::set_subtitle (PositionImage image)
 }
 
 shared_ptr<Image>
-PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle, dcp::NoteHandler note) const
+PlayerVideo::image (AVPixelFormat pixel_format, dcp::NoteHandler note) const
 {
        shared_ptr<Image> im = _in->image (optional<dcp::NoteHandler> (note));
-       
+
        Crop total_crop = _crop;
        switch (_part) {
        case PART_LEFT_HALF:
@@ -115,11 +117,11 @@ PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle, dcp::NoteHan
        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, yuv_to_rgb, pixel_format, true);
 
-       if (burn_subtitle && _subtitle.image) {
-               out->alpha_blend (_subtitle.image, _subtitle.position);
+       if (_subtitle) {
+               out->alpha_blend (_subtitle->image, _subtitle->position);
        }
 
        if (_fade) {
@@ -130,7 +132,7 @@ PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle, dcp::NoteHan
 }
 
 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<string> (_time.get ()));
        _crop.as_xml (node);
@@ -147,37 +149,37 @@ PlayerVideo::add_metadata (xmlpp::Node* node, bool send_subtitles) const
        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));
-               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 (_subtitle) {
+               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));
        }
 }
 
 void
-PlayerVideo::send_binary (shared_ptr<Socket> socket, bool send_subtitles) const
+PlayerVideo::send_binary (shared_ptr<Socket> 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<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;
 }
 
-shared_ptr<Data>
+Data
 PlayerVideo::j2k () const
 {
        shared_ptr<const J2KImageProxy> j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
@@ -203,11 +205,21 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
            _out_size != other->_out_size ||
            _eyes != other->_eyes ||
            _part != other->_part ||
-           _colour_conversion != other->_colour_conversion ||
-           !_subtitle.same (other->_subtitle)) {
+           _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);
 }