X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Freel_writer.h;h=0308c64ecd1b753a4ca484768e73d3e7f5ea63d2;hp=2e5ad8975f16e8a780245df7e453e64ead06d075;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=ec97893127a2d59871d92c9e658b6b1ab3100b40

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index 2e5ad8975..0308c64ec 100644
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,17 +18,25 @@
 
 */
 
+#include "atmos_metadata.h"
 #include "types.h"
 #include "dcpomatic_time.h"
 #include "referenced_reel_asset.h"
 #include "player_text.h"
+#include "dcp_text_track.h"
+#include "weak_film.h"
 #include <dcp/picture_asset_writer.h>
-#include <boost/shared_ptr.hpp>
+#include <dcp/atmos_asset_writer.h>
+
+namespace dcpomatic {
+	class FontData;
+}
 
 class Film;
 class Job;
-class Font;
 class AudioBuffers;
+class InfoFileHandle;
+struct write_frame_info_test;
 
 namespace dcp {
 	class MonoPictureAsset;
@@ -40,80 +48,100 @@ namespace dcp {
 	class SoundAsset;
 	class SoundAssetWriter;
 	class SubtitleAsset;
+	class AtmosAsset;
 	class ReelAsset;
 	class Reel;
+	class ReelPictureAsset;
 }
 
-class ReelWriter
+class ReelWriter : public WeakConstFilm
 {
 public:
 	ReelWriter (
-		boost::shared_ptr<const Film> film,
-		DCPTimePeriod period,
-		boost::shared_ptr<Job> job,
+		std::weak_ptr<const Film> film,
+		dcpomatic::DCPTimePeriod period,
+		std::shared_ptr<Job> job,
 		int reel_index,
 		int reel_count,
-		boost::optional<std::string> content_summary
+		bool text_only
 		);
 
-	void write (boost::optional<dcp::Data> encoded, Frame frame, Eyes eyes);
-	void fake_write (Frame frame, Eyes eyes, int size);
+	void write (std::shared_ptr<const dcp::Data> encoded, Frame frame, Eyes eyes);
+	void fake_write (int size);
 	void repeat_write (Frame frame, Eyes eyes);
-	void write (boost::shared_ptr<const AudioBuffers> audio);
-	void write (PlayerText text, TextType type, DCPTimePeriod period);
-
-	void finish ();
-	boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<Font> > const & fonts);
-	void calculate_digests (boost::function<void (float)> set_progress);
+	void write (std::shared_ptr<const AudioBuffers> audio);
+	void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
+	void write (std::shared_ptr<const dcp::AtmosFrame> atmos, AtmosMetadata metadata);
+
+	void finish (boost::filesystem::path output_dcp);
+	std::shared_ptr<dcp::Reel> create_reel (
+		std::list<ReferencedReelAsset> const & refs,
+		std::vector<dcpomatic::FontData> const & fonts,
+		boost::filesystem::path output_dcp,
+		bool ensure_subtitles,
+		std::set<DCPTextTrack> ensure_closed_captions
+		);
+	void calculate_digests (std::function<void (float)> set_progress);
 
 	Frame start () const;
 
-	DCPTimePeriod period () const {
+	dcpomatic::DCPTimePeriod period () const {
 		return _period;
 	}
 
-	int last_written_video_frame () const {
-		return _last_written_video_frame;
-	}
-
-	Eyes last_written_eyes () const {
-		return _last_written_eyes;
-	}
-
 	int first_nonexistant_frame () const {
 		return _first_nonexistant_frame;
 	}
 
-	dcp::FrameInfo read_frame_info (FILE* file, Frame frame, Eyes eyes) const;
+	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 ();
-	bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame frame) const;
-
-	boost::shared_ptr<const Film> _film;
-
-	DCPTimePeriod _period;
+	Frame check_existing_picture_asset (boost::filesystem::path asset);
+	bool existing_picture_frame_ok (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;
+
+	std::shared_ptr<dcp::ReelPictureAsset> create_reel_picture (std::shared_ptr<dcp::Reel> reel, std::list<ReferencedReelAsset> const & refs) const;
+	void create_reel_sound (std::shared_ptr<dcp::Reel> reel, std::list<ReferencedReelAsset> const & refs) const;
+	void create_reel_text (
+		std::shared_ptr<dcp::Reel> reel,
+		std::list<ReferencedReelAsset> const & refs,
+		std::vector<dcpomatic::FontData> const& fonts,
+		int64_t duration,
+		boost::filesystem::path output_dcp,
+		bool ensure_subtitles,
+		std::set<DCPTextTrack> ensure_closed_captions
+		) const;
+	void create_reel_markers (std::shared_ptr<dcp::Reel> reel) const;
+
+	dcpomatic::DCPTimePeriod _period;
 	/** the first picture frame index that does not already exist in our MXF */
 	int _first_nonexistant_frame;
 	/** the data of the last written frame, if there is one */
-	boost::optional<dcp::Data> _last_written[EYES_COUNT];
-	/** the index of the last written video frame within the reel */
-	int _last_written_video_frame;
-	Eyes _last_written_eyes;
+	std::shared_ptr<const dcp::Data> _last_written[static_cast<int>(Eyes::COUNT)];
 	/** index of this reel within the DCP (starting from 0) */
 	int _reel_index;
 	/** number of reels in the DCP */
 	int _reel_count;
 	boost::optional<std::string> _content_summary;
-
-	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::SubtitleAsset> _text_asset[TEXT_COUNT];
+	std::weak_ptr<Job> _job;
+	bool _text_only;
+
+	dcp::ArrayData _default_font;
+
+	std::shared_ptr<dcp::PictureAsset> _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::SoundAsset> _sound_asset;
+	std::shared_ptr<dcp::SoundAssetWriter> _sound_asset_writer;
+	std::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;
+	std::map<DCPTextTrack, std::shared_ptr<dcp::SubtitleAsset>> _closed_caption_assets;
+	std::shared_ptr<dcp::AtmosAsset> _atmos_asset;
+	std::shared_ptr<dcp::AtmosAssetWriter> _atmos_asset_writer;
 
 	static int const _info_size;
 };