Merge master.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index e06e5f45e183f1cad603a7b14f4fc38e03c4cae7..0f5e83b10298ff93c85f0b1dee3ee5dc388d282e 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -28,6 +28,7 @@ class ImageProxy;
 class Scaler;
 class Socket;
 class Log;
+class EncodedData;
 
 /** Everything needed to describe a video frame coming out of the player, but with the
  *  bits still their raw form.  We may want to combine the bits on a remote machine,
@@ -36,7 +37,19 @@ class Log;
 class PlayerVideo
 {
 public:
-       PlayerVideo (boost::shared_ptr<const ImageProxy>, DCPTime, Crop, dcp::Size, dcp::Size, Scaler const *, Eyes, Part, ColourConversion);
+       PlayerVideo (
+               boost::shared_ptr<const ImageProxy>,
+               DCPTime,
+               Crop,
+               boost::optional<float>,
+               dcp::Size,
+               dcp::Size,
+               Scaler const *,
+               Eyes,
+               Part,
+               ColourConversion
+               );
+       
        PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>, boost::shared_ptr<Log>);
 
        void set_subtitle (PositionImage);
@@ -46,6 +59,9 @@ public:
        void add_metadata (xmlpp::Node* node, bool send_subtitles) const;
        void send_binary (boost::shared_ptr<Socket> socket, bool send_subtitles) const;
 
+       bool has_j2k () const;
+       boost::shared_ptr<EncodedData> j2k () const;
+
        DCPTime time () const {
                return _time;
        }
@@ -58,10 +74,21 @@ public:
                return _colour_conversion;
        }
 
+       /** @return Position of the content within the overall image once it has been scaled up */
+       Position<int> inter_position () const;
+
+       /** @return Size of the content within the overall image once it has been scaled up */
+       dcp::Size inter_size () const {
+               return _inter_size;
+       }
+
+       bool same (boost::shared_ptr<const PlayerVideo> other) const;
+
 private:
        boost::shared_ptr<const ImageProxy> _in;
        DCPTime _time;
        Crop _crop;
+       boost::optional<float> _fade;
        dcp::Size _inter_size;
        dcp::Size _out_size;
        Scaler const * _scaler;