Merge branch 'master' into speed-up

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

diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index 464d4851550430b1234fb430b169f78ed9a17ad9..5ae53f1e8743b3ce711521502c192ef0ba67e9ca 100644 (file)
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -27,10 +27,11 @@
 
 class FilmState;
 class Options;
-class Server;
+class ServerDescription;
 class Scaler;
 class Image;
 class Log;
+class Subtitle;
 
 /** @class EncodedData
  *  @brief Container for J2K-encoded data.
@@ -48,12 +49,8 @@ public:
 
        virtual ~EncodedData () {}
 
-       void send (boost::shared_ptr<boost::asio::ip::tcp::socket>);
-       void write (boost::shared_ptr<const Options>, int);
-
-#ifdef DEBUG_HASH
-       void hash (std::string) const;
-#endif 
+       void send (boost::shared_ptr<Socket> socket);
+       void write (boost::shared_ptr<const Options>, SourceFrame);
 
        /** @return data */
        uint8_t* data () const {
@@ -109,13 +106,17 @@ public:
 class DCPVideoFrame
 {
 public:
-       DCPVideoFrame (boost::shared_ptr<Image>, Size, int, Scaler const *, int, float, std::string, int, int, Log *);
+       DCPVideoFrame (
+               boost::shared_ptr<const Image>, boost::shared_ptr<Subtitle>, Size,
+               int, int, float, Scaler const *, SourceFrame, float, std::string, int, int, Log *
+               );
+       
        virtual ~DCPVideoFrame ();
 
        boost::shared_ptr<EncodedData> encode_locally ();
-       boost::shared_ptr<EncodedData> encode_remotely (Server const *);
+       boost::shared_ptr<EncodedData> encode_remotely (ServerDescription const *);
 
-       int frame () const {
+       SourceFrame frame () const {
                return _frame;
        }
        
@@ -123,11 +124,14 @@ private:
        void create_openjpeg_container ();
        void write_encoded (boost::shared_ptr<const Options>, uint8_t *, int);
 
-       boost::shared_ptr<Image> _input; ///< the input image
+       boost::shared_ptr<const Image> _input; ///< the input image
+       boost::shared_ptr<Subtitle> _subtitle; ///< any subtitle that should be on the image
        Size _out_size;                  ///< the required size of the output, in pixels
        int _padding;
+       int _subtitle_offset;
+       float _subtitle_scale;
        Scaler const * _scaler;          ///< scaler to use
-       int _frame;                      ///< frame index within the Film
+       SourceFrame _frame;              ///< frame index within the Film's source
        int _frames_per_second;          ///< Frames per second that we will use for the DCP (rounded)
        std::string _post_process;       ///< FFmpeg post-processing string to use
        int _colour_lut_index;           ///< Colour look-up table to use (see Config::colour_lut_index ())