X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=3e81b6448a6ce8d6c88940cee4f784c81f398ba3;hb=b76970eee97ab03741e4c0e1fb30b75f7991ef70;hp=459bc5a882e18e10bb541f4b33e91c7c65eda72c;hpb=2ea3a0d0e4066a166c0700bd1d53daa7f1c50dff;p=dcpomatic.git diff --git a/src/lib/writer.h b/src/lib/writer.h index 459bc5a88..3e81b6448 100644 --- a/src/lib/writer.h +++ b/src/lib/writer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2020 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,47 +18,45 @@ */ + /** @file src/lib/writer.h * @brief Writer class. */ + #include "atmos_metadata.h" -#include "types.h" -#include "player_text.h" -#include "exception_store.h" #include "dcp_text_track.h" +#include "exception_store.h" +#include "player_text.h" +#include "types.h" +#include "weak_film.h" #include -#include -#include #include #include #include + namespace dcp { class Data; } namespace dcpomatic { - class Font; + class FontData; } -class Film; class AudioBuffers; +class Film; class Job; -class ReferencedReelAsset; class ReelWriter; +class ReferencedReelAsset; + struct QueueItem { public: - QueueItem () - : size (0) - , reel (0) - , frame (0) - , eyes (EYES_BOTH) - {} - - enum Type { + QueueItem () {} + + enum class Type { /** a normal frame with some JPEG200 data */ FULL, /** a frame whose data already exists in the MXF, @@ -70,20 +68,22 @@ public: } type; /** encoded data for FULL */ - boost::shared_ptr encoded; + std::shared_ptr encoded; /** size of data for FAKE */ - int size; + int size = 0; /** reel index */ - size_t reel; + size_t reel = 0; /** frame index within the reel */ - int frame; + int frame = 0; /** eyes for FULL, FAKE and REPEAT */ - Eyes eyes; + Eyes eyes = Eyes::BOTH; }; + bool operator< (QueueItem const & a, QueueItem const & b); bool operator== (QueueItem const & a, QueueItem const & b); + /** @class Writer * @brief Class to manage writing JPEG2000 and audio data to assets on disk. * @@ -95,26 +95,29 @@ 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 WeakConstFilm { public: - Writer (boost::shared_ptr, boost::weak_ptr); + Writer (std::weak_ptr, std::weak_ptr, bool text_only = false); ~Writer (); + Writer (Writer const &) = delete; + Writer& operator= (Writer const &) = delete; + void start (); bool can_fake_write (Frame) const; - void write (boost::shared_ptr, Frame, Eyes); + void write (std::shared_ptr, Frame, Eyes); void fake_write (Frame, Eyes); bool can_repeat (Frame) const; void repeat (Frame, Eyes); - void write (boost::shared_ptr, dcpomatic::DCPTime time); + void write (std::shared_ptr, dcpomatic::DCPTime time); void write (PlayerText text, TextType type, boost::optional, dcpomatic::DCPTimePeriod period); - void write (std::list > fonts); + void write (std::vector fonts); void write (ReferencedReelAsset asset); - void write (boost::shared_ptr atmos, dcpomatic::DCPTime time, AtmosMetadata metadata); - void finish (); + void write (std::shared_ptr atmos, dcpomatic::DCPTime time, AtmosMetadata metadata); + void finish (boost::filesystem::path output_dcp); void set_encoder_threads (int threads); @@ -124,11 +127,12 @@ private: bool have_sequenced_image_at_queue_head (); size_t video_reel (int frame) const; void set_digest_progress (Job* job, float progress); - void write_cover_sheet (); + void write_cover_sheet (boost::filesystem::path output_dcp); + void calculate_referenced_digests (std::function set_progress); + void write_hanging_text (ReelWriter& reel); + void calculate_digests (); - /** our Film */ - boost::shared_ptr _film; - boost::weak_ptr _job; + std::weak_ptr _job; std::vector _reels; std::vector::iterator _audio_reel; std::vector::iterator _subtitle_reel; @@ -138,11 +142,11 @@ private: /** our thread */ boost::thread _thread; /** true if our thread should finish */ - bool _finish; + bool _finish = false; /** queue of things to write to disk */ std::list _queue; /** number of FULL frames whose JPEG200 data is currently held in RAM */ - int _queued_full_in_memory; + int _queued_full_in_memory = 0; /** mutex for thread state */ mutable boost::mutex _state_mutex; /** condition to manage thread wakeups when we have nothing to do */ @@ -160,7 +164,7 @@ private: public: LastWritten() : _frame(-1) - , _eyes(EYES_RIGHT) + , _eyes(Eyes::RIGHT) {} /** @return true if qi is the next item after this one */ @@ -180,19 +184,35 @@ private: std::vector _last_written; /** number of FULL written frames */ - int _full_written; + int _full_written = 0; /** number of FAKE written frames */ - int _fake_written; - int _repeat_written; + int _fake_written = 0; + int _repeat_written = 0; /** number of frames pushed to disk and then recovered due to the limit of frames to be held in memory. */ - int _pushed_to_disk; + int _pushed_to_disk = 0; + + bool _text_only; boost::mutex _digest_progresses_mutex; std::map _digest_progresses; std::list _reel_assets; - std::list > _fonts; + std::vector _fonts; + + /** true if any reel has any subtitles */ + bool _have_subtitles = false; + /** all closed caption tracks that we have on any reel */ + std::set _have_closed_captions; + + struct HangingText { + PlayerText text; + TextType type; + boost::optional track; + dcpomatic::DCPTimePeriod period; + }; + + std::vector _hanging_texts; };