Merge master.

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

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index d1b394933b67dc6e9fe70c278d06d6a8be9d5610..8e6fcd5f3524f8baf4e00c54f791cc92bf4778a7 100644 (file)
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -21,17 +21,20 @@
 #include "player_video.h"
 #include "image.h"
 #include "image_proxy.h"
+#include "j2k_image_proxy.h"
 #include "scaler.h"
 
 using std::string;
 using std::cout;
-using boost::shared_ptr;
 using dcp::raw_convert;
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 PlayerVideo::PlayerVideo (
        shared_ptr<const ImageProxy> in,
        DCPTime time,
        Crop crop,
+       boost::optional<float> fade,
        dcp::Size inter_size,
        dcp::Size out_size,
        Scaler const * scaler,
@@ -42,6 +45,7 @@ PlayerVideo::PlayerVideo (
        : _in (in)
        , _time (time)
        , _crop (crop)
+       , _fade (fade)
        , _inter_size (inter_size)
        , _out_size (out_size)
        , _scaler (scaler)
@@ -56,6 +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");
 
        _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"));
@@ -85,7 +90,7 @@ PlayerVideo::set_subtitle (PositionImage image)
 }
 
 shared_ptr<Image>
-PlayerVideo::image (bool burn_subtitle) const
+PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle) const
 {
        shared_ptr<Image> im = _in->image ();
        
@@ -107,14 +112,16 @@ PlayerVideo::image (bool burn_subtitle) const
                break;
        }
                
-       shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, PIX_FMT_RGB24, true);
-
-       Position<int> const container_offset ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.width) / 2);
+       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);
        }
 
+       if (_fade) {
+               out->fade (_fade.get ());
+       }
+
        return out;
 }
 
@@ -123,6 +130,9 @@ PlayerVideo::add_metadata (xmlpp::Node* node, bool send_subtitles) const
 {
        node->add_child("Time")->add_child_text (raw_convert<string> (_time.get ()));
        _crop.as_xml (node);
+       if (_fade) {
+               node->add_child("Fade")->add_child_text (raw_convert<string> (_fade.get ()));
+       }
        _in->add_metadata (node->add_child ("In"));
        node->add_child("InterWidth")->add_child_text (raw_convert<string> (_inter_size.width));
        node->add_child("InterHeight")->add_child_text (raw_convert<string> (_inter_size.height));
@@ -148,3 +158,52 @@ PlayerVideo::send_binary (shared_ptr<Socket> socket, bool send_subtitles) const
                _subtitle.image->write_to_socket (socket);
        }
 }
+
+bool
+PlayerVideo::has_j2k () const
+{
+       /* XXX: burnt-in subtitle; 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();
+}
+
+shared_ptr<EncodedData>
+PlayerVideo::j2k () const
+{
+       shared_ptr<const J2KImageProxy> j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
+       assert (j2k);
+       return j2k->j2k ();
+}
+
+Position<int>
+PlayerVideo::inter_position () const
+{
+       return Position<int> ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.height) / 2);
+}
+
+/** @return true if this PlayerVideo is definitely the same as another
+ * (apart from _time), false if it is probably not
+ */
+bool
+PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
+{
+       if (_in != other->_in ||
+           _crop != other->_crop ||
+           _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 ||
+           !_subtitle.same (other->_subtitle)) {
+               return false;
+       }
+
+       return _in->same (other->_in);
+}