Don't start thread in constructor. (Writer)

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

diff --git a/src/lib/writer.h b/src/lib/writer.h
index fe803d35e5c4d84fea5084ac98696cdecf43199e..cec6ba527b07a49f98ddcf4765e450c1a6ab4ae5 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -21,9 +21,11 @@
  *  @brief Writer class.
  */
 
-#include "exceptions.h"
 #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>
@@ -31,7 +33,7 @@
 #include <list>
 
 class Film;
-class EncodedData;
+class Data;
 class AudioBuffers;
 class Job;
 class Font;
@@ -45,12 +47,16 @@ namespace dcp {
        class PictureAssetWriter;
        class SoundAsset;
        class SoundAssetWriter;
-       class InteropSubtitleAsset;
+       class SubtitleAsset;
 }
 
 struct QueueItem
 {
 public:
+       QueueItem ()
+               : size (0)
+       {}
+
        enum Type {
                /** a normal frame with some JPEG200 data */
                FULL,
@@ -59,10 +65,11 @@ public:
                    state but we use the data that is already on disk.
                */
                FAKE,
+               REPEAT,
        } type;
 
        /** encoded data for FULL */
-       boost::shared_ptr<const EncodedData> encoded;
+       boost::optional<Data> encoded;
        /** size of data for FAKE */
        int size;
        /** frame index */
@@ -76,11 +83,11 @@ bool operator== (QueueItem const & a, QueueItem const & b);
 /** @class Writer
  *  @brief Class to manage writing JPEG2000 and audio data to assets on disk.
  *
- *  This class creates sound and picture assets, then takes EncodedData
+ *  This class creates sound and picture assets, then takes Data
  *  or AudioBuffers objects (containing image or sound data respectively)
  *  and writes them to the assets.
  *
- *  ::write() for EncodedData can be called out of order, and the Writer
+ *  ::write() for Data can be called out of order, and the Writer
  *  will sort it out.  write() for AudioBuffers must be called in order.
  */
 
@@ -90,14 +97,16 @@ public:
        Writer (boost::shared_ptr<const Film>, boost::weak_ptr<Job>);
        ~Writer ();
 
+       void start ();
+
        bool can_fake_write (int) const;
-       
-       void write (boost::shared_ptr<const EncodedData>, int, Eyes);
+
+       void write (Data, int, Eyes);
        void fake_write (int, Eyes);
+       void repeat (int, Eyes);
        void write (boost::shared_ptr<const AudioBuffers>);
        void write (PlayerSubtitles subs);
        void write (std::list<boost::shared_ptr<Font> > fonts);
-       void repeat (int f, Eyes);
        void finish ();
 
        void set_encoder_threads (int threads);
@@ -109,6 +118,9 @@ private:
        void check_existing_picture_asset ();
        bool check_existing_picture_asset_frame (FILE *, int, Eyes);
        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;
 
        /** our Film */
        boost::shared_ptr<const Film> _film;
@@ -125,13 +137,13 @@ private:
        /** number of FULL frames whose JPEG200 data is currently held in RAM */
        int _queued_full_in_memory;
        /** mutex for thread state */
-       mutable boost::mutex _mutex;
+       mutable boost::mutex _state_mutex;
        /** condition to manage thread wakeups when we have nothing to do  */
        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, or 0 if there isn't one */
-       boost::shared_ptr<const EncodedData> _last_written[EYES_COUNT];
+       /** 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;
@@ -139,21 +151,22 @@ private:
         *  ordering
         */
        int _maximum_frames_in_memory;
-       
+
        /** number of FULL written frames */
        int _full_written;
        /** number of FAKE written frames */
        int _fake_written;
+       int _repeat_written;
        /** number of frames pushed to disk and then recovered
            due to the limit of frames to be held in memory.
        */
        int _pushed_to_disk;
-       
+
        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::InteropSubtitleAsset> _subtitle_asset;
+       boost::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;
 
        std::list<boost::shared_ptr<Font> > _fonts;
 };