X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=c8a007f78aa5aff7454686d1382c96134c9ede45;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=8fc0ce29ebb926ee2a8e5b8b6ebdc4afdb289bda;hpb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb;p=dcpomatic.git

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 8fc0ce29e..c8a007f78 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,11 +22,13 @@
  *  @brief Writer class.
  */
 
+#include "atmos_metadata.h"
 #include "types.h"
 #include "player_text.h"
 #include "exception_store.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include "dcp_text_track.h"
+#include "weak_film.h"
+#include <dcp/atmos_frame.h>
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #include <list>
@@ -35,10 +37,13 @@ namespace dcp {
 	class Data;
 }
 
+namespace dcpomatic {
+	class FontData;
+}
+
 class Film;
 class AudioBuffers;
 class Job;
-class Font;
 class ReferencedReelAsset;
 class ReelWriter;
 
@@ -64,7 +69,7 @@ public:
 	} type;
 
 	/** encoded data for FULL */
-	boost::optional<dcp::Data> encoded;
+	std::shared_ptr<const dcp::Data> encoded;
 	/** size of data for FAKE */
 	int size;
 	/** reel index */
@@ -89,25 +94,26 @@ bool operator== (QueueItem const & a, QueueItem const & b);
  *  will sort it out.  write() for AudioBuffers must be called in order.
  */
 
-class Writer : public ExceptionStore, public boost::noncopyable
+class Writer : public ExceptionStore, public boost::noncopyable, public WeakConstFilm
 {
 public:
-	Writer (boost::shared_ptr<const Film>, boost::weak_ptr<Job>);
+	Writer (std::weak_ptr<const Film>, std::weak_ptr<Job>, bool text_only = false);
 	~Writer ();
 
 	void start ();
 
 	bool can_fake_write (Frame) const;
 
-	void write (dcp::Data, Frame, Eyes);
+	void write (std::shared_ptr<const 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>, DCPTime time);
-	void write (PlayerText text, TextType type, DCPTimePeriod period);
-	void write (std::list<boost::shared_ptr<Font> > fonts);
+	void write (std::shared_ptr<const AudioBuffers>, dcpomatic::DCPTime time);
+	void write (PlayerText text, TextType type, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod period);
+	void write (std::vector<dcpomatic::FontData> fonts);
 	void write (ReferencedReelAsset asset);
-	void finish ();
+	void write (std::shared_ptr<const dcp::AtmosFrame> atmos, dcpomatic::DCPTime time, AtmosMetadata metadata);
+	void finish (boost::filesystem::path output_dcp);
 
 	void set_encoder_threads (int threads);
 
@@ -117,17 +123,18 @@ private:
 	bool have_sequenced_image_at_queue_head ();
 	size_t video_reel (int frame) const;
 	void set_digest_progress (Job* job, float progress);
-	void write_cover_sheet ();
+	void write_cover_sheet (boost::filesystem::path output_dcp);
+	void calculate_referenced_digests (boost::function<void (float)> set_progress);
 
-	/** our Film */
-	boost::shared_ptr<const Film> _film;
-	boost::weak_ptr<Job> _job;
+	std::weak_ptr<Job> _job;
 	std::vector<ReelWriter> _reels;
 	std::vector<ReelWriter>::iterator _audio_reel;
-	std::vector<ReelWriter>::iterator _caption_reel[TEXT_COUNT];
+	std::vector<ReelWriter>::iterator _subtitle_reel;
+	std::map<DCPTextTrack, std::vector<ReelWriter>::iterator> _caption_reels;
+	std::vector<ReelWriter>::iterator _atmos_reel;
 
-	/** our thread, or 0 */
-	boost::thread* _thread;
+	/** our thread */
+	boost::thread _thread;
 	/** true if our thread should finish */
 	bool _finish;
 	/** queue of things to write to disk */
@@ -146,6 +153,30 @@ private:
 	int _maximum_frames_in_memory;
 	unsigned int _maximum_queue_size;
 
+	class LastWritten
+	{
+	public:
+		LastWritten()
+			: _frame(-1)
+			, _eyes(EYES_RIGHT)
+		{}
+
+		/** @return true if qi is the next item after this one */
+		bool next (QueueItem qi) const;
+		void update (QueueItem qi);
+
+		int frame () const {
+			return _frame;
+		}
+
+	private:
+		int _frame;
+		Eyes _eyes;
+	};
+
+	/** The last frame written to each reel */
+	std::vector<LastWritten> _last_written;
+
 	/** number of FULL written frames */
 	int _full_written;
 	/** number of FAKE written frames */
@@ -156,10 +187,17 @@ private:
 	*/
 	int _pushed_to_disk;
 
+	bool _text_only;
+
 	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;
+	std::vector<dcpomatic::FontData> _fonts;
+
+	/** true if any reel has any subtitles */
+	bool _have_subtitles;
+	/** all closed caption tracks that we have on any reel */
+	std::set<DCPTextTrack> _have_closed_captions;
 };