WIP: stop using video directory and hard-linking (#2756).

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

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index 892d803a502f11458fc77308c52365469249c530..0b243b264405807bc84de4e9db338fc84aaeaecd 100644 (file)
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -27,10 +27,14 @@
 #include "player_text.h"
 #include "referenced_reel_asset.h"
 #include "render_text.h"
+#include "text_type.h"
 #include "weak_film.h"
 #include <dcp/atmos_asset_writer.h>
 #include <dcp/file.h>
-#include <dcp/picture_asset_writer.h>
+#include <dcp/ffmpeg_image.h>
+#include <dcp/j2k_picture_asset_writer.h>
+#include <dcp/mono_mpeg2_picture_frame.h>
+#include <dcp/mpeg2_picture_asset_writer.h>
 
 
 class AudioBuffers;
@@ -41,17 +45,18 @@ struct write_frame_info_test;
 
 namespace dcp {
        class AtmosAsset;
-       class MonoPictureAsset;
-       class MonoPictureAssetWriter;
-       class PictureAsset;
-       class PictureAssetWriter;
+       class MonoJ2KPictureAsset;
+       class MonoJ2KPictureAssetWriter;
+       class J2KPictureAsset;
+       class J2KPictureAssetWriter;
+       class MPEG2PictureAsset;
        class Reel;
        class ReelAsset;
        class ReelPictureAsset;
        class SoundAsset;
        class SoundAssetWriter;
-       class StereoPictureAsset;
-       class StereoPictureAssetWriter;
+       class StereoJ2KPictureAsset;
+       class StereoJ2KPictureAssetWriter;
        class SubtitleAsset;
 }
 
@@ -65,26 +70,26 @@ public:
                std::shared_ptr<Job> job,
                int reel_index,
                int reel_count,
-               bool text_only
+               bool text_only,
+               boost::filesystem::path output_dir
                );
 
        void write (std::shared_ptr<const dcp::Data> encoded, Frame frame, Eyes eyes);
-       void fake_write (int size);
+       void fake_write(dcp::J2KFrameInfo const& info);
        void repeat_write (Frame frame, Eyes eyes);
        void write (std::shared_ptr<const AudioBuffers> audio);
-       void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period, FontIdMap const& fonts);
+       void write(PlayerText text, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period, FontIdMap const& fonts, std::shared_ptr<dcpomatic::Font> chosen_interop_font);
        void write (std::shared_ptr<const dcp::AtmosFrame> atmos, AtmosMetadata metadata);
+       void write(std::shared_ptr<dcp::MonoMPEG2PictureFrame> image);
 
        void finish (boost::filesystem::path output_dcp);
        std::shared_ptr<dcp::Reel> create_reel (
                std::list<ReferencedReelAsset> const & refs,
-               FontIdMap const & fonts,
-               std::shared_ptr<dcpomatic::Font> chosen_interop_font,
                boost::filesystem::path output_dcp,
                bool ensure_subtitles,
                std::set<DCPTextTrack> ensure_closed_captions
                );
-       void calculate_digests (std::function<void (float)> set_progress);
+       void calculate_digests(std::function<void (int64_t, int64_t)> set_progress);
 
        Frame start () const;
 
@@ -96,14 +101,10 @@ public:
                return _first_nonexistent_frame;
        }
 
-       dcp::FrameInfo read_frame_info (std::shared_ptr<InfoFileHandle> info, Frame frame, Eyes eyes) const;
-
 private:
 
        friend struct ::write_frame_info_test;
 
-       void write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const;
-       long frame_info_position (Frame frame, Eyes eyes) const;
        Frame check_existing_picture_asset (boost::filesystem::path asset);
        bool existing_picture_frame_ok (dcp::File& asset_file, std::shared_ptr<InfoFileHandle> info_file, Frame frame) const;
        std::shared_ptr<dcp::SubtitleAsset> empty_text_asset (TextType type, boost::optional<DCPTextTrack> track, bool with_dummy) const;
@@ -113,8 +114,6 @@ private:
        void create_reel_text (
                std::shared_ptr<dcp::Reel> reel,
                std::list<ReferencedReelAsset> const & refs,
-               FontIdMap const& fonts,
-               std::shared_ptr<dcpomatic::Font> chosen_interop_font,
                int64_t duration,
                boost::filesystem::path output_dcp,
                bool ensure_subtitles,
@@ -123,9 +122,10 @@ private:
        void create_reel_markers (std::shared_ptr<dcp::Reel> reel) const;
        float convert_vertical_position(StringText const& subtitle, dcp::SubtitleStandard to) const;
 
+       boost::filesystem::path _output_dir;
        dcpomatic::DCPTimePeriod _period;
        /** the first picture frame index that does not already exist in our MXF */
-       int _first_nonexistent_frame;
+       int _first_nonexistent_frame = 0;
        /** the data of the last written frame, if there is one */
        EnumIndexedVector<std::shared_ptr<const dcp::Data>, Eyes> _last_written;
        /** index of this reel within the DCP (starting from 0) */
@@ -138,9 +138,11 @@ private:
 
        dcp::ArrayData _default_font;
 
-       std::shared_ptr<dcp::PictureAsset> _picture_asset;
+       std::shared_ptr<dcp::J2KPictureAsset> _j2k_picture_asset;
+       std::shared_ptr<dcp::MPEG2PictureAsset> _mpeg2_picture_asset;
        /** picture asset writer, or 0 if we are not writing any picture because we already have one */
-       std::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer;
+       std::shared_ptr<dcp::J2KPictureAssetWriter> _j2k_picture_asset_writer;
+       std::shared_ptr<dcp::MPEG2PictureAssetWriter> _mpeg2_picture_asset_writer;
        std::shared_ptr<dcp::SoundAsset> _sound_asset;
        std::shared_ptr<dcp::SoundAssetWriter> _sound_asset_writer;
        std::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;
@@ -149,6 +151,4 @@ private:
        std::shared_ptr<dcp::AtmosAssetWriter> _atmos_asset_writer;
 
        mutable FontMetrics _font_metrics;
-
-       static int const _info_size;
 };