Optimise checking of existing image data.

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

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 1094dee3cc70505ab3ba982a8e5b07d421b065cf..120e1f338fb8b32e885bf214010d91d614e755a5 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -21,10 +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>
@@ -52,6 +53,10 @@ namespace dcp {
 struct QueueItem
 {
 public:
+       QueueItem ()
+               : size (0)
+       {}
+
        enum Type {
                /** a normal frame with some JPEG200 data */
                FULL,
@@ -60,6 +65,7 @@ public:
                    state but we use the data that is already on disk.
                */
                FAKE,
+               REPEAT,
        } type;
 
        /** encoded data for FULL */
@@ -91,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 (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);
@@ -108,8 +116,10 @@ private:
        void thread ();
        void terminate_thread (bool);
        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;
@@ -126,7 +136,7 @@ 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 */
@@ -140,16 +150,17 @@ 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;
@@ -157,4 +168,6 @@ private:
        boost::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;
 
        std::list<boost::shared_ptr<Font> > _fonts;
+
+       static int const _info_size;
 };