X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdcp_video_frame.h;h=4ceb07d2649905a87a80ebf9daa6712e97fc8d96;hb=d40ebb82f62ab3d826e43e8d1187be9b768e535f;hp=c0eff3f358a2581565266c4b37695577e1831a76;hpb=d1b20374b1bd02b2929c9c3080c006874b525ef5;p=dcpomatic.git

diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index c0eff3f35..4ceb07d26 100644
--- 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,18 +39,16 @@ class Subtitle;
 class EncodedData
 {
 public:
-	/** @param d Data (will not be freed by this class, but may be by subclasses)
-	 *  @param s libdcp::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);
+
+	EncodedData (std::string f);
 
-	virtual ~EncodedData () {}
+	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 {
@@ -65,6 +63,10 @@ public:
 protected:
 	uint8_t* _data; ///< data
 	int _size;      ///< data size in bytes
+
+private:
+	/* No copy construction */
+	EncodedData (EncodedData const &);
 };
 
 /** @class LocallyEncodedData
@@ -75,12 +77,10 @@ protected:
 class LocallyEncodedData : public EncodedData
 {
 public:
-	/** @param d Data (which will not be freed by this class)
-	 *  @param s libdcp::Size of data, in bytes.
+	/** @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
@@ -91,7 +91,6 @@ class RemotelyEncodedData : public EncodedData
 {
 public:
 	RemotelyEncodedData (int s);
-	~RemotelyEncodedData ();
 };
 
 /** @class DCPVideoFrame
@@ -108,7 +107,7 @@ class DCPVideoFrame
 public:
 	DCPVideoFrame (
 		boost::shared_ptr<const Image>, boost::shared_ptr<Subtitle>, libdcp::Size,
-		int, int, float, Scaler const *, SourceFrame, float, std::string, int, int, Log *
+		int, int, float, Scaler const *, int, int, std::string, int, int, boost::shared_ptr<Log>
 		);
 	
 	virtual ~DCPVideoFrame ();
@@ -116,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;
 	}
 	
@@ -125,18 +124,18 @@ private:
 
 	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
+	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)
+	int _frame;                      ///< frame index within the DCP's intrinsic duration
+	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