X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=28e243c352a87247e731b33aac6d67a991dd825c;hb=69f25e496ba409c02aa27b1e07dfcde34c86a32b;hp=e817b1ca205beadc9d7ebbfe256ba2d04183a963;hpb=854f2e5bbb7ffb9758b823af87034033033f3cb8;p=dcpomatic.git

diff --git a/src/lib/writer.h b/src/lib/writer.h
index e817b1ca2..28e243c35 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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
@@ -21,32 +21,31 @@
  *  @brief Writer class.
  */
 
-#include <list>
+#include "types.h"
+#include "player_subtitles.h"
+#include "data.h"
+#include "exception_store.h"
 #include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
-#include "exceptions.h"
-#include "types.h"
+#include <list>
 
 class Film;
-class EncodedData;
+class Data;
 class AudioBuffers;
 class Job;
-
-namespace dcp {
-	class MonoPictureMXF;
-	class MonoPictureMXFWriter;
-	class StereoPictureMXF;
-	class StereoPictureMXFWriter;
-	class PictureMXF;
-	class PictureMXFWriter;
-	class SoundMXF;
-	class SoundMXFWriter;
-}
+class Font;
+class ReferencedReelAsset;
+class ReelWriter;
 
 struct QueueItem
 {
 public:
+	QueueItem ()
+		: size (0)
+	{}
+
 	enum Type {
 		/** a normal frame with some JPEG200 data */
 		FULL,
@@ -55,14 +54,18 @@ public:
 		    state but we use the data that is already on disk.
 		*/
 		FAKE,
+		REPEAT,
 	} type;
 
 	/** encoded data for FULL */
-	boost::shared_ptr<const EncodedData> encoded;
+	boost::optional<Data> encoded;
 	/** size of data for FAKE */
 	int size;
-	/** frame index */
+	/** reel index */
+	size_t reel;
+	/** frame index within the reel */
 	int frame;
+	/** eyes for FULL, FAKE and REPEAT */
 	Eyes eyes;
 };
 
@@ -70,13 +73,13 @@ bool operator< (QueueItem const & a, QueueItem const & b);
 bool operator== (QueueItem const & a, QueueItem const & b);
 
 /** @class Writer
- *  @brief Class to manage writing JPEG2000 and audio data to MXFs on disk.
+ *  @brief Class to manage writing JPEG2000 and audio data to assets on disk.
  *
- *  This class creates sound and picture MXFs, then takes EncodedData
+ *  This class creates sound and picture assets, then takes Data
  *  or AudioBuffers objects (containing image or sound data respectively)
- *  and writes them to the MXFs.
+ *  and writes them to the assets.
  *
- *  ::write() for EncodedData can be called out of order, and the Writer
+ *  ::write() for Data (picture) can be called out of order, and the Writer
  *  will sort it out.  write() for AudioBuffers must be called in order.
  */
 
@@ -86,27 +89,33 @@ public:
 	Writer (boost::shared_ptr<const Film>, boost::weak_ptr<Job>);
 	~Writer ();
 
-	bool can_fake_write (int) const;
-	
-	void write (boost::shared_ptr<const EncodedData>, int, Eyes);
-	void fake_write (int, Eyes);
+	void start ();
+
+	bool can_fake_write (Frame) const;
+
+	void write (Data, Frame, Eyes);
+	void fake_write (Frame, Eyes);
+	void repeat (Frame, Eyes);
 	void write (boost::shared_ptr<const AudioBuffers>);
-	void repeat (int f, Eyes);
+	void write (PlayerSubtitles subs);
+	void write (std::list<boost::shared_ptr<Font> > fonts);
+	void write (ReferencedReelAsset asset);
 	void finish ();
 
-private:
+	void set_encoder_threads (int threads);
 
+private:
 	void thread ();
 	void terminate_thread (bool);
-	void check_existing_picture_mxf ();
-	bool check_existing_picture_mxf_frame (FILE *, int, Eyes);
 	bool have_sequenced_image_at_queue_head ();
+	size_t video_reel (int frame) const;
 
 	/** 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;
+	std::vector<ReelWriter> _reels;
+	std::vector<ReelWriter>::iterator _audio_reel;
+	std::vector<ReelWriter>::iterator _subtitle_reel;
 
 	/** our thread, or 0 */
 	boost::thread* _thread;
@@ -117,32 +126,27 @@ private:
 	/** 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;
+	mutable boost::mutex _state_mutex;
 	/** condition to manage thread wakeups when we have nothing to do  */
 	boost::condition _empty_condition;
 	/** condition to manage thread wakeups when we have too much to do */
 	boost::condition _full_condition;
-	/** 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;
-	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;
+	 *  ordering
+	 */
+	int _maximum_frames_in_memory;
 
 	/** number of FULL written frames */
 	int _full_written;
 	/** number of FAKE written frames */
 	int _fake_written;
+	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<dcp::PictureMXF> _picture_mxf;
-	boost::shared_ptr<dcp::PictureMXFWriter> _picture_mxf_writer;
-	boost::shared_ptr<dcp::SoundMXF> _sound_mxf;
-	boost::shared_ptr<dcp::SoundMXFWriter> _sound_mxf_writer;
+
+	std::list<ReferencedReelAsset> _reel_assets;
+
+	std::list<boost::shared_ptr<Font> > _fonts;
 };