X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Freel_writer.h;h=0308c64ecd1b753a4ca484768e73d3e7f5ea63d2;hb=0330b684fe616b465e65b67f7d995e659fa83fca;hp=09c29adae05a1e7efacdf22448ed81ac0e6ce31e;hpb=2ea3a0d0e4066a166c0700bd1d53daa7f1c50dff;p=dcpomatic.git diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h index 09c29adae..0308c64ec 100644 --- a/src/lib/reel_writer.h +++ b/src/lib/reel_writer.h @@ -24,13 +24,12 @@ #include "referenced_reel_asset.h" #include "player_text.h" #include "dcp_text_track.h" +#include "weak_film.h" #include #include -#include -#include namespace dcpomatic { - class Font; + class FontData; } class Film; @@ -52,30 +51,37 @@ namespace dcp { class AtmosAsset; class ReelAsset; class Reel; + class ReelPictureAsset; } -class ReelWriter +class ReelWriter : public WeakConstFilm { public: ReelWriter ( - boost::shared_ptr film, + std::weak_ptr film, dcpomatic::DCPTimePeriod period, - boost::shared_ptr job, + std::shared_ptr job, int reel_index, int reel_count, - boost::optional content_summary + bool text_only ); - void write (boost::shared_ptr encoded, Frame frame, Eyes eyes); + void write (std::shared_ptr encoded, Frame frame, Eyes eyes); void fake_write (int size); void repeat_write (Frame frame, Eyes eyes); - void write (boost::shared_ptr audio); + void write (std::shared_ptr audio); void write (PlayerText text, TextType type, boost::optional track, dcpomatic::DCPTimePeriod period); - void write (boost::shared_ptr atmos, AtmosMetadata metadata); - - void finish (); - boost::shared_ptr create_reel (std::list const & refs, std::list > const & fonts); - void calculate_digests (boost::function set_progress); + void write (std::shared_ptr atmos, AtmosMetadata metadata); + + void finish (boost::filesystem::path output_dcp); + std::shared_ptr create_reel ( + std::list const & refs, + std::vector const & fonts, + boost::filesystem::path output_dcp, + bool ensure_subtitles, + std::set ensure_closed_captions + ); + void calculate_digests (std::function set_progress); Frame start () const; @@ -87,7 +93,7 @@ public: return _first_nonexistant_frame; } - dcp::FrameInfo read_frame_info (boost::shared_ptr info, Frame frame, Eyes eyes) const; + dcp::FrameInfo read_frame_info (std::shared_ptr info, Frame frame, Eyes eyes) const; private: @@ -96,31 +102,46 @@ private: 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 (boost::filesystem::path asset); - bool existing_picture_frame_ok (FILE* asset_file, boost::shared_ptr info_file, Frame frame) const; - - boost::shared_ptr _film; + bool existing_picture_frame_ok (FILE* asset_file, std::shared_ptr info_file, Frame frame) const; + std::shared_ptr empty_text_asset (TextType type, boost::optional track, bool with_dummy) const; + + std::shared_ptr create_reel_picture (std::shared_ptr reel, std::list const & refs) const; + void create_reel_sound (std::shared_ptr reel, std::list const & refs) const; + void create_reel_text ( + std::shared_ptr reel, + std::list const & refs, + std::vector const& fonts, + int64_t duration, + boost::filesystem::path output_dcp, + bool ensure_subtitles, + std::set ensure_closed_captions + ) const; + void create_reel_markers (std::shared_ptr 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::shared_ptr _last_written[EYES_COUNT]; + std::shared_ptr _last_written[static_cast(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 _content_summary; - boost::weak_ptr _job; + std::weak_ptr _job; + bool _text_only; + + dcp::ArrayData _default_font; - boost::shared_ptr _picture_asset; + std::shared_ptr _picture_asset; /** picture asset writer, or 0 if we are not writing any picture because we already have one */ - boost::shared_ptr _picture_asset_writer; - boost::shared_ptr _sound_asset; - boost::shared_ptr _sound_asset_writer; - boost::shared_ptr _subtitle_asset; - std::map > _closed_caption_assets; - boost::shared_ptr _atmos_asset; - boost::shared_ptr _atmos_asset_writer; + std::shared_ptr _picture_asset_writer; + std::shared_ptr _sound_asset; + std::shared_ptr _sound_asset_writer; + std::shared_ptr _subtitle_asset; + std::map> _closed_caption_assets; + std::shared_ptr _atmos_asset; + std::shared_ptr _atmos_asset_writer; static int const _info_size; };