X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=1ae761dea83656073d4d03abb45c1ef6b8a9e5f7;hp=e7409de3117ebc362f4f0507c0e6b3186f362f97;hb=HEAD;hpb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8 diff --git a/src/lib/writer.h b/src/lib/writer.h index e7409de31..f0f1fe69a 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,46 +18,51 @@ */ + +#ifndef DCPOMATIC_WRITER_H +#define DCPOMATIC_WRITER_H + + /** @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 "dcpomatic_time.h" +#include "exception_store.h" +#include "font_id_map.h" +#include "player_text.h" +#include "text_type.h" +#include "types.h" #include "weak_film.h" #include #include #include #include + namespace dcp { class Data; } -namespace dcpomatic { - class FontData; -} - -class Film; class AudioBuffers; +class Film; class Job; -class ReferencedReelAsset; class ReelWriter; +class ReferencedReelAsset; +struct writer_disambiguate_font_ids1; +struct writer_disambiguate_font_ids2; +struct writer_disambiguate_font_ids3; + 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, @@ -71,18 +76,20 @@ public: /** encoded data for FULL */ 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. * @@ -94,12 +101,15 @@ 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, public WeakConstFilm +class Writer : public ExceptionStore, public WeakConstFilm { public: 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; @@ -110,21 +120,29 @@ public: void repeat (Frame, Eyes); void write (std::shared_ptr, dcpomatic::DCPTime time); void write (PlayerText text, TextType type, boost::optional, dcpomatic::DCPTimePeriod period); - void write (std::vector fonts); + void write (std::vector> fonts); void write (ReferencedReelAsset asset); void write (std::shared_ptr atmos, dcpomatic::DCPTime time, AtmosMetadata metadata); void finish (boost::filesystem::path output_dcp); void set_encoder_threads (int threads); + void zombify(); + private: + friend struct ::writer_disambiguate_font_ids1; + friend struct ::writer_disambiguate_font_ids2; + friend struct ::writer_disambiguate_font_ids3; + void thread (); void terminate_thread (bool); bool have_sequenced_image_at_queue_head (); size_t video_reel (int frame) const; - void set_digest_progress (Job* job, float progress); + void set_digest_progress(Job* job, int id, int64_t done, int64_t size); void write_cover_sheet (boost::filesystem::path output_dcp); - void calculate_referenced_digests (boost::function set_progress); + void calculate_referenced_digests(std::function set_progress); + void write_hanging_text (ReelWriter& reel); + void calculate_digests (); std::weak_ptr _job; std::vector _reels; @@ -136,11 +154,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 */ @@ -178,26 +196,45 @@ 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::map> _digest_progresses; std::list _reel_assets; - std::vector _fonts; + FontIdMap _fonts; + /** If we are given many fonts, but we're making an Interop DCP, we'll choose a single + * one that we'll use everywher. This is that chosen font. + */ + std::shared_ptr _chosen_interop_font; /** true if any reel has any subtitles */ - bool _have_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; + + bool _zombie = false; }; + + +#endif +