X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video_frame.h;h=7393efde699d1a4ad1f6560c50a102dddcb0eb8e;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hp=e988b663a80493158b552a959d8b8ec09010fea3;hpb=b1873c51b2e8265a01a8f0eced7fc3465f1677dc;p=dcpomatic.git

diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
index e988b663a..7393efde6 100644
--- a/src/lib/dcp_video_frame.h
+++ b/src/lib/dcp_video_frame.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
     Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
 
     This program is free software; you can redistribute it and/or modify
@@ -18,37 +18,37 @@
 
 */
 
-#include <openjpeg.h>
+#include <dcp/picture_mxf_writer.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;
 class Image;
 class Log;
 class Subtitle;
+class PlayerVideoFrame;
 
 /** @class EncodedData
  *  @brief Container for J2K-encoded data.
  */
-class EncodedData
+class EncodedData : public boost::noncopyable
 {
 public:
 	/** @param s Size of data, in bytes */
 	EncodedData (int s);
 
-	EncodedData (std::string f);
+	EncodedData (boost::filesystem::path);
 
 	virtual ~EncodedData ();
 
 	void send (boost::shared_ptr<Socket> socket);
-	void write (boost::shared_ptr<const Film>, int) const;
-	void write_hash (boost::shared_ptr<const Film>, int) const;
+	void write (boost::shared_ptr<const Film>, int, Eyes) const;
+	void write_info (boost::shared_ptr<const Film>, int, Eyes, dcp::FrameInfo) const;
 
 	/** @return data */
 	uint8_t* data () const {
@@ -62,11 +62,7 @@ public:
 
 protected:
 	uint8_t* _data; ///< data
-	int _size;      ///< data size in bytes
-
-private:
-	/* No copy construction */
-	EncodedData (EncodedData const &);
+	int _size;	///< data size in bytes
 };
 
 /** @class LocallyEncodedData
@@ -102,44 +98,30 @@ public:
  *  Objects of this class are used for the queue that we keep
  *  of images that require encoding.
  */
-class DCPVideoFrame
+class DCPVideoFrame : public boost::noncopyable
 {
 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 PlayerVideoFrame>, int, int, int, Resolution, boost::shared_ptr<Log>);
+	DCPVideoFrame (boost::shared_ptr<const PlayerVideoFrame>, cxml::ConstNodePtr, boost::shared_ptr<Log>);
 
 	boost::shared_ptr<EncodedData> encode_locally ();
-	boost::shared_ptr<EncodedData> encode_remotely (ServerDescription const *);
+	boost::shared_ptr<EncodedData> encode_remotely (ServerDescription);
 
-	int frame () const {
-		return _frame;
+	int index () const {
+		return _index;
 	}
+
+	Eyes eyes () const;
 	
 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
-	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 _colour_lut;                 ///< Colour look-up table to use
-	int _j2k_bandwidth;              ///< J2K bandwidth to use
-
-	Log* _log; ///< log
-
-	opj_image_cmptparm_t _cmptparm[3]; ///< libopenjpeg's opj_image_cmptparm_t
-	opj_image* _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
+
+	void add_metadata (xmlpp::Element *) const;
+	
+	boost::shared_ptr<const PlayerVideoFrame> _frame;
+	int _index;			 ///< frame index within the DCP's intrinsic duration
+	int _frames_per_second;		 ///< Frames per second that we will use for the DCP
+	int _j2k_bandwidth;		 ///< J2K bandwidth to use
+	Resolution _resolution;          ///< Resolution (2K or 4K)
+
+	boost::shared_ptr<Log> _log; ///< log
 };