X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video_frame.h;h=f234b445abe00f9ba8cd169d1971b95882a76709;hb=f385ef03e5ea27519a31c0839447735a7fba0602;hp=ab458b58f8124953b8ba390d2fc5fb27d330f58a;hpb=38ab054c2ec22a853ee6abbe3f3683d153e9bb63;p=dcpomatic.git

diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index ab458b58f..f234b445a 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -105,12 +105,8 @@ public:
 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 *
-		);
-	
-	virtual ~DCPVideoFrame ();
+	DCPVideoFrame (boost::shared_ptr<const Image>, int, int, int, int, boost::shared_ptr<Log>);
+	~DCPVideoFrame ();
 
 	boost::shared_ptr<EncodedData> encode_locally ();
 	boost::shared_ptr<EncodedData> encode_remotely (ServerDescription const *);
@@ -122,23 +118,16 @@ 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 _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 
+	opj_image* _opj_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