#endif
using namespace dcpomatic;
+
/** Construct a DCP encoder.
* @param film Film that we are encoding.
* @param job Job that this encoder is being used in.
*/
DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
: Encoder (film, job)
+ , _writer(film, job)
+ , _j2k_encoder(film, _writer)
, _finishing (false)
, _non_burnt_subtitles (false)
{
- _player_video_connection = _player->Video.connect (bind (&DCPEncoder::video, this, _1, _2));
- _player_audio_connection = _player->Audio.connect (bind (&DCPEncoder::audio, this, _1, _2));
- _player_text_connection = _player->Text.connect (bind (&DCPEncoder::text, this, _1, _2, _3, _4));
- _player_atmos_connection = _player->Atmos.connect (bind (&DCPEncoder::atmos, this, _1, _2, _3));
+ _player_video_connection = _player.Video.connect(bind(&DCPEncoder::video, this, _1, _2));
+ _player_audio_connection = _player.Audio.connect(bind(&DCPEncoder::audio, this, _1, _2));
+ _player_text_connection = _player.Text.connect(bind(&DCPEncoder::text, this, _1, _2, _3, _4));
+ _player_atmos_connection = _player.Atmos.connect(bind(&DCPEncoder::atmos, this, _1, _2, _3));
for (auto c: film->content ()) {
for (auto i: c->text) {
void
DCPEncoder::go ()
{
- _writer = make_shared<Writer>(_film, _job);
- _writer->start ();
-
- _j2k_encoder = make_shared<J2KEncoder>(_film, _writer);
- _j2k_encoder->begin ();
+ _writer.start();
+ _j2k_encoder.begin();
{
auto job = _job.lock ();
}
if (_non_burnt_subtitles) {
- _writer->write(_player->get_subtitle_fonts());
+ _writer.write(_player.get_subtitle_fonts());
}
- while (!_player->pass ()) {}
+ while (!_player.pass()) {}
- for (auto i: _player->get_reel_assets()) {
- _writer->write (i);
+ for (auto i: get_referenced_reel_assets(_film, _film->playlist())) {
+ _writer.write(i);
}
_finishing = true;
- _j2k_encoder->end ();
- _writer->finish (_film->dir(_film->dcp_name()));
+ _j2k_encoder.end();
+ _writer.finish(_film->dir(_film->dcp_name()));
}
void
DCPEncoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
{
- _j2k_encoder->encode (data, time);
+ _j2k_encoder.encode(data, time);
}
void
DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
{
- _writer->write (data, time);
+ _writer.write(data, time);
auto job = _job.lock ();
DCPOMATIC_ASSERT (job);
DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
{
if (type == TextType::CLOSED_CAPTION || _non_burnt_subtitles) {
- _writer->write (data, type, track, period);
+ _writer.write(data, type, track, period);
}
}
void
DCPEncoder::atmos (shared_ptr<const dcp::AtmosFrame> data, DCPTime time, AtmosMetadata metadata)
{
- _writer->write (data, time, metadata);
+ _writer.write(data, time, metadata);
}
optional<float>
DCPEncoder::current_rate () const
{
- if (!_j2k_encoder) {
- return {};
- }
-
- return _j2k_encoder->current_encoding_rate ();
+ return _j2k_encoder.current_encoding_rate();
}
Frame
DCPEncoder::frames_done () const
{
- if (!_j2k_encoder) {
- return 0;
- }
-
- return _j2k_encoder->video_frames_enqueued ();
+ return _j2k_encoder.video_frames_enqueued();
}