X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fwriter.h;h=170307d8d5580862a2412995b9d29e5bd4f7711a;hp=a176eb191f99209112cc6c46c3703cc9a1afe26d;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=89b3ab9210af0888f7b4ce558869051a731d17e2 diff --git a/src/lib/writer.h b/src/lib/writer.h index a176eb191..170307d8d 100644 --- a/src/lib/writer.h +++ b/src/lib/writer.h @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2015 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 . */ @@ -21,36 +22,33 @@ * @brief Writer class. */ -#include "exceptions.h" #include "types.h" #include "player_subtitles.h" +#include "exception_store.h" #include #include #include #include #include +namespace dcp { + class Data; +} + class Film; -class EncodedData; class AudioBuffers; class Job; class Font; - -namespace dcp { - class MonoPictureAsset; - class MonoPictureAssetWriter; - class StereoPictureAsset; - class StereoPictureAssetWriter; - class PictureAsset; - class PictureAssetWriter; - class SoundAsset; - class SoundAssetWriter; - class SubtitleAsset; -} +class ReferencedReelAsset; +class ReelWriter; struct QueueItem { public: + QueueItem () + : size (0) + {} + enum Type { /** a normal frame with some JPEG200 data */ FULL, @@ -59,14 +57,18 @@ public: state but we use the data that is already on disk. */ FAKE, + REPEAT, } type; /** encoded data for FULL */ - boost::shared_ptr 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; }; @@ -76,11 +78,11 @@ bool operator== (QueueItem const & a, QueueItem const & b); /** @class Writer * @brief Class to manage writing JPEG2000 and audio data to assets on disk. * - * This class creates sound and picture assets, then takes EncodedData + * This class creates sound and picture assets, then takes Data * or AudioBuffers objects (containing image or sound data respectively) * and writes them to the assets. * - * ::write() for EncodedData 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. */ @@ -90,31 +92,34 @@ public: Writer (boost::shared_ptr, boost::weak_ptr); ~Writer (); - bool can_fake_write (int) const; - - void write (boost::shared_ptr, int, Eyes); - void fake_write (int, Eyes); + void start (); + + bool can_fake_write (Frame) const; + + void write (dcp::Data, Frame, Eyes); + void fake_write (Frame, Eyes); + bool can_repeat (Frame) const; + void repeat (Frame, Eyes); void write (boost::shared_ptr); void write (PlayerSubtitles subs); void write (std::list > fonts); - void repeat (int f, Eyes); + void write (ReferencedReelAsset asset); void finish (); void set_encoder_threads (int threads); private: - void thread (); void terminate_thread (bool); - void check_existing_picture_asset (); - bool check_existing_picture_asset_frame (FILE *, int, Eyes); bool have_sequenced_image_at_queue_head (); + size_t video_reel (int frame) const; /** our Film */ boost::shared_ptr _film; boost::weak_ptr _job; - /** the first frame index that does not already exist in our MXF */ - int _first_nonexistant_frame; + std::vector _reels; + std::vector::iterator _audio_reel; + std::vector::iterator _subtitle_reel; /** our thread, or 0 */ boost::thread* _thread; @@ -125,35 +130,27 @@ private: /** number of FULL frames whose JPEG200 data is currently held in RAM */ int _queued_full_in_memory; /** mutex for thread state */ - mutable boost::mutex _mutex; + mutable boost::mutex _state_mutex; /** condition to manage thread wakeups when we have nothing to do */ 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, or 0 if there isn't one */ - boost::shared_ptr _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; - + /** number of FULL written frames */ int _full_written; /** number of FAKE written frames */ int _fake_written; + int _repeat_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; - - 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; + + std::list _reel_assets; std::list > _fonts; };