/*
- Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+#include "atmos_metadata.h"
#include "types.h"
#include "dcpomatic_time.h"
#include "referenced_reel_asset.h"
#include "player_text.h"
#include "dcp_text_track.h"
#include <dcp/picture_asset_writer.h>
+#include <dcp/atmos_asset_writer.h>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
class SoundAsset;
class SoundAssetWriter;
class SubtitleAsset;
+ class AtmosAsset;
class ReelAsset;
class Reel;
}
);
void write (boost::optional<dcp::Data> encoded, Frame frame, Eyes eyes);
- void fake_write (Frame frame, Eyes eyes, int size);
+ void fake_write (int size);
void repeat_write (Frame frame, Eyes eyes);
void write (boost::shared_ptr<const AudioBuffers> audio);
void write (PlayerText text, TextType type, boost::optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period);
+ void write (boost::shared_ptr<const dcp::AtmosFrame> atmos, AtmosMetadata metadata);
void finish ();
boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<dcpomatic::Font> > const & fonts);
return _period;
}
- int last_written_video_frame () const {
- return _last_written_video_frame;
- }
-
- Eyes last_written_eyes () const {
- return _last_written_eyes;
- }
-
int first_nonexistant_frame () const {
return _first_nonexistant_frame;
}
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 ();
+ Frame check_existing_picture_asset (boost::filesystem::path asset);
bool existing_picture_frame_ok (FILE* asset_file, boost::shared_ptr<InfoFileHandle> info_file, Frame frame) const;
boost::shared_ptr<const Film> _film;
int _first_nonexistant_frame;
/** the data of the last written frame, if there is one */
boost::optional<dcp::Data> _last_written[EYES_COUNT];
- /** the index of the last written video frame within the reel */
- int _last_written_video_frame;
- Eyes _last_written_eyes;
/** index of this reel within the DCP (starting from 0) */
int _reel_index;
/** number of reels in the DCP */
boost::weak_ptr<Job> _job;
boost::shared_ptr<dcp::PictureAsset> _picture_asset;
+ /** picture asset writer, or 0 if we are not writing any picture because we already have one */
boost::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer;
boost::shared_ptr<dcp::SoundAsset> _sound_asset;
boost::shared_ptr<dcp::SoundAssetWriter> _sound_asset_writer;
boost::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;
std::map<DCPTextTrack, boost::shared_ptr<dcp::SubtitleAsset> > _closed_caption_assets;
+ boost::shared_ptr<dcp::AtmosAsset> _atmos_asset;
+ boost::shared_ptr<dcp::AtmosAssetWriter> _atmos_asset_writer;
static int const _info_size;
};