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 b446352c798a1938acf37d3dc85102a98ffb81b2..ba49c95a43364a125452c8e515aa33c7d8737dda 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;
@@ -39,8 +39,7 @@ 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);
@@ -48,7 +47,8 @@ public:
        virtual ~EncodedData ();
 
        void send (boost::shared_ptr<Socket> socket);
-       void write (boost::shared_ptr<const Film>, int);
+       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 {
@@ -107,7 +107,7 @@ class DCPVideoFrame
 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 *
+               int, int, float, Scaler const *, int, int, int, int, boost::shared_ptr<Log>
                );
        
        virtual ~DCPVideoFrame ();
@@ -130,12 +130,11 @@ private:
        float _subtitle_scale;
        Scaler const * _scaler;          ///< scaler to use
        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 _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