Use a weak_ptr<Film> in Writer.

[dcpomatic.git] / src / lib / writer.h

diff --git a/src/lib/writer.h b/src/lib/writer.h
index d304133dcb98f2c3d380e191fda78d0d0eef61b1..085cd2a32d1302afc2208bb1ecf6cfdc10ea0f0c 100644 (file)
--- 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,13 @@
  *  @brief Writer class.
  */
 
+#include "atmos_metadata.h"
 #include "types.h"
 #include "player_text.h"
 #include "exception_store.h"
 #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>
@@ -68,7 +71,7 @@ public:
        } type;
 
        /** encoded data for FULL */
-       boost::optional<dcp::Data> encoded;
+       boost::shared_ptr<const dcp::Data> encoded;
        /** size of data for FAKE */
        int size;
        /** reel index */
@@ -93,17 +96,17 @@ 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 (boost::weak_ptr<const Film>, boost::weak_ptr<Job>);
        ~Writer ();
 
        void start ();
 
        bool can_fake_write (Frame) const;
 
-       void write (dcp::Data, Frame, Eyes);
+       void write (boost::shared_ptr<const dcp::Data>, Frame, Eyes);
        void fake_write (Frame, Eyes);
        bool can_repeat (Frame) const;
        void repeat (Frame, Eyes);
@@ -111,6 +114,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);
@@ -122,14 +126,14 @@ private:
        size_t video_reel (int frame) const;
        void set_digest_progress (Job* job, float progress);
        void write_cover_sheet ();
+       void calculate_referenced_digests (boost::function<void (float)> set_progress);
 
-       /** our Film */
-       boost::shared_ptr<const Film> _film;
        boost::weak_ptr<Job> _job;
        std::vector<ReelWriter> _reels;
        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 */