X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=5fe96a3ac94eee955cd9ac1429e86986e4da2f15;hb=f41818f14369f170475b7f2bde1a2dd856517b14;hp=95530a9d973587906af25a8ae290131bba5460a5;hpb=2c5398adaea8bc56fe196144a9a233981657fba0;p=dcpomatic.git diff --git a/src/lib/writer.h b/src/lib/writer.h index 95530a9d9..5fe96a3ac 100644 --- a/src/lib/writer.h +++ b/src/lib/writer.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -22,41 +23,37 @@ */ #include "types.h" -#include "player_subtitles.h" -#include "data.h" +#include "player_text.h" #include "exception_store.h" -#include +#include "dcp_text_track.h" #include #include #include #include #include +namespace dcp { + class Data; +} + +namespace dcpomatic { + class Font; +} + class Film; -class Data; class AudioBuffers; class Job; -class Font; class ReferencedReelAsset; - -namespace dcp { - class MonoPictureAsset; - class MonoPictureAssetWriter; - class StereoPictureAsset; - class StereoPictureAssetWriter; - class PictureAsset; - class PictureAssetWriter; - class SoundAsset; - class SoundAssetWriter; - class SubtitleAsset; - class ReelAsset; -} +class ReelWriter; struct QueueItem { public: QueueItem () : size (0) + , reel (0) + , frame (0) + , eyes (EYES_BOTH) {} enum Type { @@ -68,14 +65,15 @@ public: */ FAKE, REPEAT, - REF, } type; /** encoded data for FULL */ - boost::optional encoded; + boost::optional encoded; /** size of data for FAKE */ int size; - /** frame index */ + /** reel index */ + size_t reel; + /** frame index within the reel */ int frame; /** eyes for FULL, FAKE and REPEAT */ Eyes eyes; @@ -91,7 +89,7 @@ bool operator== (QueueItem const & a, QueueItem const & b); * or AudioBuffers objects (containing image or sound data respectively) * and writes them to the assets. * - * ::write() for Data can be called out of order, and the Writer + * write() for Data (picture) can be called out of order, and the Writer * will sort it out. write() for AudioBuffers must be called in order. */ @@ -105,54 +103,33 @@ public: bool can_fake_write (Frame) const; - void write (Data, Frame, Eyes); + void write (dcp::Data, Frame, Eyes); void fake_write (Frame, Eyes); - void ref_write (Frame); + bool can_repeat (Frame) const; void repeat (Frame, Eyes); - void write (boost::shared_ptr); - void write (PlayerSubtitles subs); - void write (std::list > fonts); + void write (boost::shared_ptr, dcpomatic::DCPTime time); + void write (PlayerText text, TextType type, boost::optional, dcpomatic::DCPTimePeriod period); + void write (std::list > fonts); void write (ReferencedReelAsset asset); void finish (); void set_encoder_threads (int threads); private: - - class Reel { - public: - Reel () - : first_nonexistant_frame (0) - , written (0) - {} - - DCPTimePeriod period; - /** the first frame index that does not already exist in our MXF */ - int first_nonexistant_frame; - Frame written; - - boost::shared_ptr picture_asset; - boost::shared_ptr picture_asset_writer; - boost::shared_ptr sound_asset; - boost::shared_ptr sound_asset_writer; - boost::shared_ptr subtitle_asset; - }; - void thread (); void terminate_thread (bool); - void check_existing_picture_asset (Reel& reel); 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; - Reel const & video_reel (int frame) const; + size_t video_reel (int frame) const; + void set_digest_progress (Job* job, float progress); + void write_cover_sheet (); /** our Film */ boost::shared_ptr _film; boost::weak_ptr _job; - std::list _reels; - std::list::iterator _audio_reel; - std::list::iterator _subtitle_reel; + std::vector _reels; + std::vector::iterator _audio_reel; + std::vector::iterator _subtitle_reel; + std::map::iterator> _caption_reels; /** our thread, or 0 */ boost::thread* _thread; @@ -168,30 +145,26 @@ private: boost::condition _empty_condition; /** condition to manage thread wakeups when we have too much to do */ boost::condition _full_condition; - /** the data of the last written frame, if there is one */ - boost::optional _last_written[EYES_COUNT]; - /** the index of the last written frame */ - int _last_written_frame; - Eyes _last_written_eyes; /** maximum number of frames to hold in memory, for when we are managing * ordering */ int _maximum_frames_in_memory; + unsigned int _maximum_queue_size; /** number of FULL written frames */ int _full_written; /** number of FAKE written frames */ int _fake_written; int _repeat_written; - int _ref_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; - std::list _reel_assets; + boost::mutex _digest_progresses_mutex; + std::map _digest_progresses; - std::list > _fonts; + std::list _reel_assets; - static int const _info_size; + std::list > _fonts; };