X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_asset_writer.h;h=a815fbcda405bd3696ae753dc45f6cc5d883e234;hb=273fd9a4f1b43ae0de0071e5efd3b6347b166ff1;hp=b6d2e92c8cca02fa0f4bde9ec4db4ed0b739581f;hpb=b3e7a9625f860e7d83c4077b24fe811eb9941456;p=libdcp.git

diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h
index b6d2e92c..a815fbcd 100644
--- a/src/picture_asset_writer.h
+++ b/src/picture_asset_writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,126 +17,67 @@
 
 */
 
+/** @file  src/picture_asset_writer.h
+ *  @brief PictureAssetWriter and FrameInfo classes.
+ */
+
+#ifndef LIBDCP_PICTURE_ASSET_WRITER_H
+#define LIBDCP_PICTURE_ASSET_WRITER_H
+
+#include "metadata.h"
+#include "types.h"
+#include "asset_writer.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/utility.hpp>
 #include <stdint.h>
 #include <string>
 #include <fstream>
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
-#include "metadata.h"
-#include "types.h"
 
-namespace libdcp {
+namespace dcp {
 
-class PictureAsset;	
+class PictureAsset;
 
+/** @class FrameInfo
+ *  @brief Information about a single frame (either a monoscopic frame or a left *or* right eye stereoscopic frame)
+ */
 struct FrameInfo
 {
+	FrameInfo ()
+		: offset (0)
+		, size (0)
+	{}
+
 	FrameInfo (uint64_t o, uint64_t s, std::string h)
 		: offset (o)
 		, size (s)
 		, hash (h)
 	{}
 
-	FrameInfo (std::istream& s);
-
-	void write (std::ostream& s);
-	
 	uint64_t offset;
 	uint64_t size;
 	std::string hash;
 };
 
-class PictureAssetWriter : public boost::noncopyable
+/** @class PictureAssetWriter
+ *  @brief Parent class for classes which write picture assets.
+ */
+class PictureAssetWriter : public AssetWriter
 {
 public:
-	virtual ~PictureAssetWriter () {}
 	virtual FrameInfo write (uint8_t *, int) = 0;
-	virtual void finalize () = 0;
 	virtual void fake_write (int) = 0;
-	
+
 protected:
 	template <class P, class Q>
-	friend void start (PictureAssetWriter *, boost::shared_ptr<P>, Q *, uint8_t *, int);
-
-	PictureAssetWriter (PictureAsset *, bool, bool, MXFMetadata const &);
-
-	PictureAsset* _asset;
-	
-	/** Number of picture frames written to the asset so far.  For stereo assets
-	 *  this will be incremented for each eye (i.e. there will be twice the number
-	 *  of frames as in a mono asset).
-	 */
-	int _frames_written;
-	bool _started;
-	/** true if finalize() has been called */
-	bool _finalized;
-	bool _overwrite;
-	bool _interop;
-	MXFMetadata _metadata;
-};
-
-/** A helper class for writing to MonoPictureAssets progressively (i.e. writing frame-by-frame,
- *  rather than giving libdcp all the frames in one go).
- *
- *  Objects of this class can only be created with MonoPictureAsset::start_write().
- *
- *  Frames can be written to the MonoPictureAsset by calling write() with a JPEG2000 image
- *  (a verbatim .j2c file).  finalize() must be called after the last frame has been written.
- *  The action of finalize() can't be done in MonoPictureAssetWriter's destructor as it may
- *  throw an exception.
- */
-class MonoPictureAssetWriter : public PictureAssetWriter
-{
-public:
-	FrameInfo write (uint8_t *, int);
-	void fake_write (int size);
-	void finalize ();
-
-private:
-	friend class MonoPictureAsset;
-
-	MonoPictureAssetWriter (PictureAsset *, bool, bool, MXFMetadata const &);
-	void start (uint8_t *, int);
-
-	/* do this with an opaque pointer so we don't have to include
-	   ASDCP headers
-	*/
-	   
-	struct ASDCPState;
-	boost::shared_ptr<ASDCPState> _state;
-};
+	friend void start (PictureAssetWriter *, boost::shared_ptr<P>, Standard, Q *, uint8_t *, int);
 
-/** A helper class for writing to StereoPictureAssets progressively (i.e. writing frame-by-frame,
- *  rather than giving libdcp all the frames in one go).
- *
- *  Objects of this class can only be created with StereoPictureAsset::start_write().
- *
- *  Frames can be written to the MonoPictureAsset by calling write() with a JPEG2000 image
- *  (a verbatim .j2c file).  finalize() must be called after the last frame has been written.
- *  The action of finalize() can't be done in MonoPictureAssetWriter's destructor as it may
- *  throw an exception.
- */
-class StereoPictureAssetWriter : public PictureAssetWriter
-{
-public:
-	FrameInfo write (uint8_t *, int);
-	void fake_write (int size);
-	void finalize ();
-
-private:
-	friend class StereoPictureAsset;
+	PictureAssetWriter (PictureAsset *, boost::filesystem::path, Standard standard, bool);
 
-	StereoPictureAssetWriter (PictureAsset *, bool, bool, MXFMetadata const &);
-	void start (uint8_t *, int);
-
-	/* do this with an opaque pointer so we don't have to include
-	   ASDCP headers
-	*/
-	   
-	struct ASDCPState;
-	boost::shared_ptr<ASDCPState> _state;
-
-	libdcp::Eye _next_eye;
+	PictureAsset* _picture_asset;
+	Standard _standard;
+	bool _overwrite;
 };
 
 }
+
+#endif