/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "types.h"
#include "dcpomatic_time.h"
#include "referenced_reel_asset.h"
-#include "player_subtitles.h"
+#include "player_caption.h"
#include <dcp/picture_asset_writer.h>
#include <boost/shared_ptr.hpp>
class ReelWriter
{
public:
- ReelWriter (boost::shared_ptr<const Film> film, DCPTimePeriod period, boost::shared_ptr<Job> job);
+ ReelWriter (
+ boost::shared_ptr<const Film> film,
+ DCPTimePeriod period,
+ boost::shared_ptr<Job> job,
+ int reel_index,
+ int reel_count,
+ boost::optional<std::string> content_summary
+ );
void write (boost::optional<dcp::Data> encoded, Frame frame, Eyes eyes);
void fake_write (Frame frame, Eyes eyes, int size);
void repeat_write (Frame frame, Eyes eyes);
void write (boost::shared_ptr<const AudioBuffers> audio);
- void write (PlayerSubtitles subs);
+ void write (PlayerCaption text, CaptionType type, DCPTimePeriod period);
void finish ();
boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<Font> > const & fonts);
- void calculate_digests (boost::shared_ptr<Job> job);
+ void calculate_digests (boost::function<void (float)> set_progress);
Frame start () const;
return _period;
}
- int total_written_audio_frames () const {
- return _total_written_audio_frames;
- }
-
int last_written_video_frame () const {
return _last_written_video_frame;
}
void write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const;
long frame_info_position (Frame frame, Eyes eyes) const;
- void check_existing_picture_asset ();
- bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file) const;
+ Frame check_existing_picture_asset ();
+ bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file, Frame frame) const;
boost::shared_ptr<const Film> _film;
DCPTimePeriod _period;
- /** the first frame index that does not already exist in our MXF */
+ /** 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::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;
- /** the number of audio frames that have been written to the reel */
- int _total_written_audio_frames;
+ /** index of this reel within the DCP (starting from 0) */
+ int _reel_index;
+ /** number of reels in the DCP */
+ int _reel_count;
+ boost::optional<std::string> _content_summary;
boost::shared_ptr<dcp::PictureAsset> _picture_asset;
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;
+ boost::shared_ptr<dcp::SubtitleAsset> _caption_asset[CAPTION_COUNT];
static int const _info_size;
};