X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=1e25c3bdf644d455434622e761629af9fcc3cb90;hb=4bbcf55dc0e644c20b1eaabee2da3219c4e7635f;hp=52cb222e76c4c1bc2791340b9f1d4d2512204644;hpb=4ba4258d1a3c89aa1ec4bdcfacb3ceec18adb6b7;p=dcpomatic.git

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 52cb222e7..1e25c3bdf 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,10 +18,12 @@
 
 */
 
+
 /** @file  src/lib/writer.h
  *  @brief Writer class.
  */
 
+
 #include "atmos_metadata.h"
 #include "types.h"
 #include "player_text.h"
@@ -29,18 +31,17 @@
 #include "dcp_text_track.h"
 #include "weak_film.h"
 #include <dcp/atmos_frame.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;
 }
 
 namespace dcpomatic {
-	class Font;
+	class FontData;
 }
 
 class Film;
@@ -49,17 +50,13 @@ class Job;
 class ReferencedReelAsset;
 class ReelWriter;
 
+
 struct QueueItem
 {
 public:
-	QueueItem ()
-		: size (0)
-		, reel (0)
-		, frame (0)
-		, eyes (EYES_BOTH)
-	{}
-
-	enum Type {
+	QueueItem () {}
+
+	enum class Type {
 		/** a normal frame with some JPEG200 data */
 		FULL,
 		/** a frame whose data already exists in the MXF,
@@ -71,20 +68,22 @@ public:
 	} type;
 
 	/** encoded data for FULL */
-	boost::shared_ptr<const dcp::Data> encoded;
+	std::shared_ptr<const dcp::Data> encoded;
 	/** size of data for FAKE */
-	int size;
+	int size = 0;
 	/** reel index */
-	size_t reel;
+	size_t reel = 0;
 	/** frame index within the reel */
-	int frame;
+	int frame = 0;
 	/** eyes for FULL, FAKE and REPEAT */
-	Eyes eyes;
+	Eyes eyes = Eyes::BOTH;
 };
 
+
 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 assets on disk.
  *
@@ -96,25 +95,28 @@ 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, public WeakConstFilm
+class Writer : public ExceptionStore, public WeakConstFilm
 {
 public:
-	Writer (boost::weak_ptr<const Film>, boost::weak_ptr<Job>, bool text_only = false);
+	Writer (std::weak_ptr<const Film>, std::weak_ptr<Job>, bool text_only = false);
 	~Writer ();
 
+	Writer (Writer const &) = delete;
+	Writer& operator= (Writer const &) = delete;
+
 	void start ();
 
 	bool can_fake_write (Frame) const;
 
-	void write (boost::shared_ptr<const 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>, dcpomatic::DCPTime time);
+	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::list<boost::shared_ptr<dcpomatic::Font> > fonts);
+	void write (std::vector<dcpomatic::FontData> fonts);
 	void write (ReferencedReelAsset asset);
-	void write (boost::shared_ptr<const dcp::AtmosFrame> atmos, dcpomatic::DCPTime time, AtmosMetadata metadata);
+	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);
@@ -126,9 +128,11 @@ private:
 	size_t video_reel (int frame) const;
 	void set_digest_progress (Job* job, float progress);
 	void write_cover_sheet (boost::filesystem::path output_dcp);
-	void calculate_referenced_digests (boost::function<void (float)> set_progress);
+	void calculate_referenced_digests (std::function<void (float)> set_progress);
+	void write_hanging_text (ReelWriter& reel);
+	void calculate_digests ();
 
-	boost::weak_ptr<Job> _job;
+	std::weak_ptr<Job> _job;
 	std::vector<ReelWriter> _reels;
 	std::vector<ReelWriter>::iterator _audio_reel;
 	std::vector<ReelWriter>::iterator _subtitle_reel;
@@ -138,11 +142,11 @@ private:
 	/** our thread */
 	boost::thread _thread;
 	/** true if our thread should finish */
-	bool _finish;
+	bool _finish = false;
 	/** 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;
+	int _queued_full_in_memory = 0;
 	/** mutex for thread state */
 	mutable boost::mutex _state_mutex;
 	/** condition to manage thread wakeups when we have nothing to do  */
@@ -160,7 +164,7 @@ private:
 	public:
 		LastWritten()
 			: _frame(-1)
-			, _eyes(EYES_RIGHT)
+			, _eyes(Eyes::RIGHT)
 		{}
 
 		/** @return true if qi is the next item after this one */
@@ -180,14 +184,14 @@ private:
 	std::vector<LastWritten> _last_written;
 
 	/** number of FULL written frames */
-	int _full_written;
+	int _full_written = 0;
 	/** number of FAKE written frames */
-	int _fake_written;
-	int _repeat_written;
+	int _fake_written = 0;
+	int _repeat_written = 0;
 	/** number of frames pushed to disk and then recovered
 	    due to the limit of frames to be held in memory.
 	*/
-	int _pushed_to_disk;
+	int _pushed_to_disk = 0;
 
 	bool _text_only;
 
@@ -196,10 +200,19 @@ private:
 
 	std::list<ReferencedReelAsset> _reel_assets;
 
-	std::list<boost::shared_ptr<dcpomatic::Font> > _fonts;
+	std::vector<dcpomatic::FontData> _fonts;
 
 	/** true if any reel has any subtitles */
-	bool _have_subtitles;
+	bool _have_subtitles = false;
 	/** all closed caption tracks that we have on any reel */
 	std::set<DCPTextTrack> _have_closed_captions;
+
+	struct HangingText {
+		PlayerText text;
+		TextType type;
+		boost::optional<DCPTextTrack> track;
+		dcpomatic::DCPTimePeriod period;
+	};
+
+	std::vector<HangingText> _hanging_texts;
 };