Merge master and multifarious hackery.

[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 f5ffa467e81b8ef45de2b4941ff95940ae80f9df..ba49c95a43364a125452c8e515aa33c7d8737dda 100644 (file)
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -19,14 +19,14 @@
 */
 
 #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 EncodeOptions;
+class Film;
 class ServerDescription;
 class Scaler;
 class Image;
@@ -39,14 +39,16 @@ class Subtitle;
 class EncodedData
 {
 public:
-       /** @param s Size of data, in bytes.
-        */
+       /** @param s Size of data, in bytes */
        EncodedData (int s);
 
+       EncodedData (std::string f);
+
        virtual ~EncodedData ();
 
        void send (boost::shared_ptr<Socket> socket);
-       void write (boost::shared_ptr<const EncodeOptions>, SourceFrame);
+       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 {
@@ -104,8 +106,8 @@ class DCPVideoFrame
 {
 public:
        DCPVideoFrame (
-               boost::shared_ptr<const Image>, boost::shared_ptr<Subtitle>, Size,
-               int, int, float, Scaler const *, SourceFrame, float, std::string, int, int, Log *
+               boost::shared_ptr<const Image>, boost::shared_ptr<Subtitle>, libdcp::Size,
+               int, int, float, Scaler const *, int, int, int, int, boost::shared_ptr<Log>
                );
        
        virtual ~DCPVideoFrame ();
@@ -113,7 +115,7 @@ public:
        boost::shared_ptr<EncodedData> encode_locally ();
        boost::shared_ptr<EncodedData> encode_remotely (ServerDescription const *);
 
-       SourceFrame frame () const {
+       int frame () const {
                return _frame;
        }
        
@@ -122,18 +124,17 @@ private:
 
        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
+       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
-       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 ())
-       int _j2k_bandwidth;              ///< J2K bandwidth to use (see Config::j2k_bandwidth ())
+       int _frame;                      ///< frame index within the DCP's intrinsic duration
+       int _frames_per_second;          ///< Frames per second that we will use for the DCP
+       int _colour_lut;                 ///< Colour look-up table to use
+       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