X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video_frame.h;h=4ceb07d2649905a87a80ebf9daa6712e97fc8d96;hb=605355f3335d189f6243be42bf254df2ba0442f2;hp=b446352c798a1938acf37d3dc85102a98ffb81b2;hpb=cadd50fe2609a1ad9963389d65d8e91f85226752;p=dcpomatic.git

diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index b446352c7..4ceb07d26 100644
--- 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, std::string, int, int, boost::shared_ptr<Log>
 		);
 	
 	virtual ~DCPVideoFrame ();
@@ -130,12 +130,12 @@ 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)
+	int _frames_per_second;          ///< Frames per second that we will use for the DCP
 	std::string _post_process;       ///< FFmpeg post-processing string to use
 	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