X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=71e04df96053c7cf9e7b756421b9e658e925a797;hb=2f796cd531de522a3b7ed03a9942f3c55f3a0b5b;hp=d304133dcb98f2c3d380e191fda78d0d0eef61b1;hpb=ea6b2dae46caa1da829fbf499e83cd6ae3b3773a;p=dcpomatic.git

diff --git a/src/lib/writer.h b/src/lib/writer.h
index d304133dc..71e04df96 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,10 +22,12 @@
  *  @brief Writer class.
  */
 
+#include "atmos_metadata.h"
 #include "types.h"
 #include "player_text.h"
 #include "exception_store.h"
 #include "dcp_text_track.h"
+#include <dcp/atmos_frame.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/thread.hpp>
@@ -111,6 +113,7 @@ public:
 	void write (PlayerText text, TextType type, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod period);
 	void write (std::list<boost::shared_ptr<dcpomatic::Font> > fonts);
 	void write (ReferencedReelAsset asset);
+	void write (boost::shared_ptr<const dcp::AtmosFrame> atmos, dcpomatic::DCPTime time, AtmosMetadata metadata);
 	void finish ();
 
 	void set_encoder_threads (int threads);
@@ -130,6 +133,7 @@ private:
 	std::vector<ReelWriter>::iterator _audio_reel;
 	std::vector<ReelWriter>::iterator _subtitle_reel;
 	std::map<DCPTextTrack, std::vector<ReelWriter>::iterator> _caption_reels;
+	std::vector<ReelWriter>::iterator _atmos_reel;
 
 	/** our thread */
 	boost::thread _thread;
@@ -151,6 +155,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 */