X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=2a78637e570c0a68d00d8303b85431b93f772cca;hb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;hp=8f1e7127852116665e8f2e33b20b0029f3861052;hpb=f9068dcbfbb09082e29e2a779ef1a7a2f6ee849e;p=dcpomatic.git

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 8f1e71278..2a78637e5 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,34 +24,23 @@
 
 #include "types.h"
 #include "player_subtitles.h"
-#include "data.h"
 #include "exception_store.h"
-#include <dcp/picture_asset_writer.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #include <list>
 
+namespace dcp {
+	class Data;
+}
+
 class Film;
-class Data;
 class AudioBuffers;
 class Job;
 class Font;
 class ReferencedReelAsset;
-
-namespace dcp {
-	class MonoPictureAsset;
-	class MonoPictureAssetWriter;
-	class StereoPictureAsset;
-	class StereoPictureAssetWriter;
-	class PictureAsset;
-	class PictureAssetWriter;
-	class SoundAsset;
-	class SoundAssetWriter;
-	class SubtitleAsset;
-	class ReelAsset;
-}
+class ReelWriter;
 
 struct QueueItem
 {
@@ -71,11 +61,14 @@ public:
 	} type;
 
 	/** encoded data for FULL */
-	boost::optional<Data> encoded;
+	boost::optional<dcp::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;
 };
 
@@ -89,7 +82,7 @@ bool operator== (QueueItem const & a, QueueItem const & b);
  *  or AudioBuffers objects (containing image or sound data respectively)
  *  and writes them to the assets.
  *
- *  ::write() for Data 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.
  */
 
@@ -101,13 +94,14 @@ public:
 
 	void start ();
 
-	bool can_fake_write (int) const;
+	bool can_fake_write (Frame) const;
 
-	void write (Data, int, Eyes);
-	void fake_write (int, Eyes);
-	void repeat (int, Eyes);
+	void write (dcp::Data, Frame, Eyes);
+	void fake_write (Frame, Eyes);
+	bool can_repeat (Frame) const;
+	void repeat (Frame, Eyes);
 	void write (boost::shared_ptr<const AudioBuffers>);
-	void write (PlayerSubtitles subs);
+	void write (PlayerSubtitles subs, DCPTimePeriod period);
 	void write (std::list<boost::shared_ptr<Font> > fonts);
 	void write (ReferencedReelAsset asset);
 	void finish ();
@@ -115,39 +109,18 @@ public:
 	void set_encoder_threads (int threads);
 
 private:
-
-	class Reel {
-	public:
-		Reel ()
-			: first_nonexistant_frame (0)
-		{}
-
-		DCPTimePeriod period;
-		/** the first frame index that does not already exist in our MXF */
-		int first_nonexistant_frame;
-
-		boost::shared_ptr<dcp::PictureAsset> picture_asset;
-		boost::shared_ptr<dcp::PictureAssetWriter> picture_asset_writer;
-		boost::shared_ptr<dcp::SoundAsset> sound_asset;
-		boost::shared_ptr<dcp::SoundAssetWriter> sound_asset_writer;
-		boost::shared_ptr<dcp::SubtitleAsset> subtitle_asset;
-	};
-
 	void thread ();
 	void terminate_thread (bool);
-	void check_existing_picture_asset (Reel& reel);
 	bool have_sequenced_image_at_queue_head ();
-	void write_frame_info (int frame, Eyes eyes, dcp::FrameInfo info) const;
-	long frame_info_position (int frame, Eyes eyes) const;
-	dcp::FrameInfo read_frame_info (FILE* file, int frame, Eyes eyes) const;
-	Reel const & video_reel (int frame) const;
+	size_t video_reel (int frame) const;
+	void set_digest_progress (Job* job, float progress);
 
 	/** our Film */
 	boost::shared_ptr<const Film> _film;
 	boost::weak_ptr<Job> _job;
-	std::list<Reel> _reels;
-	std::list<Reel>::iterator _audio_reel;
-	std::list<Reel>::iterator _subtitle_reel;
+	std::vector<ReelWriter> _reels;
+	std::vector<ReelWriter>::iterator _audio_reel;
+	std::vector<ReelWriter>::iterator _subtitle_reel;
 
 	/** our thread, or 0 */
 	boost::thread* _thread;
@@ -163,11 +136,6 @@ private:
 	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, if there is one */
-	boost::optional<Data> _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
 	 */
@@ -183,9 +151,10 @@ private:
 	*/
 	int _pushed_to_disk;
 
+	boost::mutex _digest_progresses_mutex;
+	std::map<boost::thread::id, float> _digest_progresses;
+
 	std::list<ReferencedReelAsset> _reel_assets;
 
 	std::list<boost::shared_ptr<Font> > _fonts;
-
-	static int const _info_size;
 };