Merge master branch.

[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 da4e0c30168da272dbab043abc76655ed147fb86..e988b663a80493158b552a959d8b8ec09010fea3 100644 (file)
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -26,11 +26,12 @@
  */
 
 class FilmState;
-class Options;
+class Film;
 class ServerDescription;
 class Scaler;
 class Image;
 class Log;
+class Subtitle;
 
 /** @class EncodedData
  *  @brief Container for J2K-encoded data.
@@ -38,22 +39,16 @@ class Log;
 class EncodedData
 {
 public:
-       /** @param d Data (will not be freed by this class, but may be by subclasses)
-        *  @param s Size of data, in bytes.
-        */
-       EncodedData (uint8_t* d, int s)
-               : _data (d)
-               , _size (s)
-       {}
+       /** @param s Size of data, in bytes */
+       EncodedData (int s);
 
-       virtual ~EncodedData () {}
+       EncodedData (std::string f);
 
-       void send (boost::shared_ptr<Socket> socket);
-       void write (boost::shared_ptr<const Options>, int);
+       virtual ~EncodedData ();
 
-#ifdef DEBUG_HASH
-       void hash (std::string) const;
-#endif 
+       void send (boost::shared_ptr<Socket> socket);
+       void write (boost::shared_ptr<const Film>, int) const;
+       void write_hash (boost::shared_ptr<const Film>, int) const;
 
        /** @return data */
        uint8_t* data () const {
@@ -68,6 +63,10 @@ public:
 protected:
        uint8_t* _data; ///< data
        int _size;      ///< data size in bytes
+
+private:
+       /* No copy construction */
+       EncodedData (EncodedData const &);
 };
 
 /** @class LocallyEncodedData
@@ -78,12 +77,10 @@ protected:
 class LocallyEncodedData : public EncodedData
 {
 public:
-       /** @param d Data (which will not be freed by this class)
+       /** @param d Data (which will be copied by this class)
         *  @param s Size of data, in bytes.
         */
-       LocallyEncodedData (uint8_t* d, int s)
-               : EncodedData (d, s)
-       {}
+       LocallyEncodedData (uint8_t* d, int s);
 };
 
 /** @class RemotelyEncodedData
@@ -94,7 +91,6 @@ class RemotelyEncodedData : public EncodedData
 {
 public:
        RemotelyEncodedData (int s);
-       ~RemotelyEncodedData ();
 };
 
 /** @class DCPVideoFrame
@@ -109,7 +105,11 @@ 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>, libdcp::Size,
+               int, int, float, Scaler const *, int, float, std::string, int, int, Log *
+               );
+       
        virtual ~DCPVideoFrame ();
 
        boost::shared_ptr<EncodedData> encode_locally ();
@@ -121,17 +121,19 @@ public:
        
 private:
        void create_openjpeg_container ();
-       void write_encoded (boost::shared_ptr<const Options>, uint8_t *, int);
 
-       boost::shared_ptr<Image> _input; ///< the input image
-       Size _out_size;                  ///< the required size of the output, in pixels
+       boost::shared_ptr<const Image> _input; ///< the input image
+       boost::shared_ptr<Subtitle> _subtitle; ///< any subtitle that should be on the image
+       libdcp::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
+       int _frame;                      ///< frame index within the DCP's intrinsic duration
        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 ())
-       int _j2k_bandwidth;              ///< J2K bandwidth to use (see Config::j2k_bandwidth ())
+       int _colour_lut;                 ///< Colour look-up table to use
+       int _j2k_bandwidth;              ///< J2K bandwidth to use
 
        Log* _log; ///< log