/*
- Copyright (C) 2012-2018 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 "player_caption.h"
+#include "player_text.h"
+#include "dcp_text_track.h"
#include "encoder.h"
-#include <boost/weak_ptr.hpp>
+#include <dcp/atmos_frame.h>
class Film;
class J2KEncoder;
class DCPEncoder : public Encoder
{
public:
- DCPEncoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job);
+ DCPEncoder (std::shared_ptr<const Film> film, std::weak_ptr<Job> job);
~DCPEncoder ();
void go ();
- float current_rate () const;
+ boost::optional<float> current_rate () const;
Frame frames_done () const;
/** @return true if we are in the process of calling Encoder::process_end */
private:
- void video (boost::shared_ptr<PlayerVideo>, DCPTime);
- void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
- void text (PlayerCaption, TextType, DCPTimePeriod);
+ void video (std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime);
+ void audio (std::shared_ptr<AudioBuffers>, dcpomatic::DCPTime);
+ void text (PlayerText, TextType, boost::optional<DCPTextTrack>, dcpomatic::DCPTimePeriod);
+ void atmos (std::shared_ptr<const dcp::AtmosFrame>, dcpomatic::DCPTime, AtmosMetadata metadata);
- boost::shared_ptr<Writer> _writer;
- boost::shared_ptr<J2KEncoder> _j2k_encoder;
+ std::shared_ptr<Writer> _writer;
+ std::shared_ptr<J2KEncoder> _j2k_encoder;
bool _finishing;
bool _non_burnt_subtitles;
boost::signals2::scoped_connection _player_video_connection;
boost::signals2::scoped_connection _player_audio_connection;
boost::signals2::scoped_connection _player_text_connection;
+ boost::signals2::scoped_connection _player_atmos_connection;
};