X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=17ce42572c52da3df2d9e1a2eea96dd182da2847;hb=c226f90a2c113b8bbc270f29e6aa035ae1229d57;hp=57609825d06bde2d1b8f85ea23d0a416ca1a3415;hpb=32fc1ddb0ee004d18c36155ddcf4d9b3998a7061;p=dcpomatic.git

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 57609825d..17ce42572 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -21,14 +21,21 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
+#include "exceptions.h"
+#include "types.h"
 
 class Film;
 class EncodedData;
 class AudioBuffers;
+class Job;
 
 namespace libdcp {
 	class MonoPictureAsset;
 	class MonoPictureAssetWriter;
+	class StereoPictureAsset;
+	class StereoPictureAssetWriter;
+	class PictureAsset;
+	class PictureAssetWriter;
 	class SoundAsset;
 	class SoundAssetWriter;
 }
@@ -37,8 +44,14 @@ struct QueueItem
 {
 public:
 	enum Type {
+		/** a normal frame with some JPEG200 data */
 		FULL,
+		/** a frame whose data already exists in the MXF,
+		    and we fake-write it; i.e. we update the writer's
+		    state but we use the data that is already on disk.
+		*/
 		FAKE,
+		/** this is a repeat of the last frame to be written */
 		REPEAT
 	} type;
 
@@ -48,44 +61,73 @@ public:
 	int size;
 	/** frame index */
 	int frame;
+	Eyes eyes;
 };
 
 bool operator< (QueueItem const & a, QueueItem const & b);
 bool operator== (QueueItem const & a, QueueItem const & b);
 
-class Writer
+class Writer : public ExceptionStore, public boost::noncopyable
 {
 public:
-	Writer (boost::shared_ptr<Film>);
+	Writer (boost::shared_ptr<const Film>, boost::weak_ptr<Job>);
 
 	bool can_fake_write (int) const;
 	
-	void write (boost::shared_ptr<const EncodedData>, int);
-	void fake_write (int);
+	void write (boost::shared_ptr<const EncodedData>, int, Eyes);
+	void fake_write (int, Eyes);
 	void write (boost::shared_ptr<const AudioBuffers>);
-	void repeat (int f);
+	void repeat (int f, Eyes);
 	void finish ();
 
 private:
 
 	void thread ();
 	void check_existing_picture_mxf ();
+	bool check_existing_picture_mxf_frame (FILE *, int, Eyes);
+	bool have_sequenced_image_at_queue_head () const;
 
-	boost::shared_ptr<Film> _film;
+	/** our Film */
+	boost::shared_ptr<const Film> _film;
+	boost::weak_ptr<Job> _job;
+	/** the first frame index that does not already exist in our MXF */
 	int _first_nonexistant_frame;
 
+	/** our thread, or 0 */
 	boost::thread* _thread;
+	/** true if our thread should finish */
 	bool _finish;
+	/** queue of things to write to disk */
 	std::list<QueueItem> _queue;
+	/** number of FULL frames whose JPEG200 data is currently held in RAM */
+	int _queued_full_in_memory;
+	/** mutex for thread state */
 	mutable boost::mutex _mutex;
+	/** condition to manage thread wakeups */
 	boost::condition _condition;
-	boost::shared_ptr<const EncodedData> _last_written;
-	std::list<QueueItem> _pending;
+	/** the data of the last written frame, or 0 if there isn't one */
+	boost::shared_ptr<const EncodedData> _last_written[EYES_COUNT];
+	/** the index of the last written frame */
 	int _last_written_frame;
-	static const unsigned int _maximum_frames_in_memory;
-
-	boost::shared_ptr<libdcp::MonoPictureAsset> _picture_asset;
-	boost::shared_ptr<libdcp::MonoPictureAssetWriter> _picture_asset_writer;
+	Eyes _last_written_eyes;
+	/** maximum number of frames to hold in memory, for when we are managing
+	    ordering
+	*/
+	static const int _maximum_frames_in_memory;
+
+	/** number of FULL written frames */
+	int _full_written;
+	/** number of FAKE written frames */
+	int _fake_written;
+	/** number of REPEAT written frames */
+	int _repeat_written;
+	/** number of frames pushed to disk and then recovered
+	    due to the limit of frames to be held in memory.
+	*/
+	int _pushed_to_disk;
+	
+	boost::shared_ptr<libdcp::PictureAsset> _picture_asset;
+	boost::shared_ptr<libdcp::PictureAssetWriter> _picture_asset_writer;
 	boost::shared_ptr<libdcp::SoundAsset> _sound_asset;
 	boost::shared_ptr<libdcp::SoundAssetWriter> _sound_asset_writer;
 };