More noncopyable.

[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 2ad2b0d444e9c5bd8631c7c9513cdef7930c9941..9929b9a8a22ab0b7e0bc796466db5ca02b720b40 100644 (file)
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -19,13 +19,13 @@
 */
 
 #include <openjpeg.h>
+#include <libdcp/picture_asset.h>
 #include "util.h"
 
 /** @file  src/dcp_video_frame.h
  *  @brief A single frame of video destined for a DCP.
  */
 
-class FilmState;
 class Film;
 class ServerDescription;
 class Scaler;
@@ -36,11 +36,10 @@ class Subtitle;
 /** @class EncodedData
  *  @brief Container for J2K-encoded data.
  */
-class EncodedData
+class EncodedData : public boost::noncopyable
 {
 public:
-       /** @param s Size of data, in bytes.
-        */
+       /** @param s Size of data, in bytes */
        EncodedData (int s);
 
        EncodedData (std::string f);
@@ -49,6 +48,7 @@ public:
 
        void send (boost::shared_ptr<Socket> socket);
        void write (boost::shared_ptr<const Film>, int) const;
+       void write_info (boost::shared_ptr<const Film>, int, libdcp::FrameInfo) const;
 
        /** @return data */
        uint8_t* data () const {
@@ -63,10 +63,6 @@ public:
 protected:
        uint8_t* _data; ///< data
        int _size;      ///< data size in bytes
-
-private:
-       /* No copy construction */
-       EncodedData (EncodedData const &);
 };
 
 /** @class LocallyEncodedData
@@ -102,15 +98,11 @@ public:
  *  Objects of this class are used for the queue that we keep
  *  of images that require encoding.
  */
-class DCPVideoFrame
+class DCPVideoFrame : public boost::noncopyable
 {
 public:
-       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 ();
+       DCPVideoFrame (boost::shared_ptr<const Image>, int, int, int, boost::shared_ptr<Log>);
+       ~DCPVideoFrame ();
 
        boost::shared_ptr<EncodedData> encode_locally ();
        boost::shared_ptr<EncodedData> encode_remotely (ServerDescription const *);
@@ -120,25 +112,13 @@ public:
        }
        
 private:
-       void create_openjpeg_container ();
-
-       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
+       boost::shared_ptr<const Image> _image;
        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;                 ///< Colour look-up table to use
+       int _frames_per_second;          ///< Frames per second that we will use for the DCP
        int _j2k_bandwidth;              ///< J2K bandwidth to use
 
-       Log* _log; ///< log
+       boost::shared_ptr<Log> _log; ///< log
 
-       opj_image_cmptparm_t _cmptparm[3]; ///< libopenjpeg's opj_image_cmptparm_t
-       opj_image* _image;                 ///< libopenjpeg's image container 
        opj_cparameters_t* _parameters;    ///< libopenjpeg's parameters
        opj_cinfo_t* _cinfo;               ///< libopenjpeg's opj_cinfo_t
        opj_cio_t* _cio;                   ///< libopenjpeg's opj_cio_t