/*
- Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
* @brief A decoder of existing DCPs.
*/
+#include "atmos_metadata.h"
#include "decoder.h"
#include "dcp.h"
#include <dcp/mono_picture_asset_reader.h>
class DCPDecoder : public DCP, public Decoder
{
public:
- DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log, bool fast);
+ DCPDecoder (
+ boost::shared_ptr<const Film> film,
+ boost::shared_ptr<const DCPContent>,
+ bool fast,
+ bool tolerant,
+ boost::shared_ptr<DCPDecoder> old
+ );
std::list<boost::shared_ptr<dcp::Reel> > reels () const {
return _reels;
void set_forced_reduction (boost::optional<int> reduction);
bool pass ();
- void seek (ContentTime t, bool accurate);
+ void seek (dcpomatic::ContentTime t, bool accurate);
+
+ std::string lazy_digest () const {
+ return _lazy_digest;
+ }
+
+ dcpomatic::ContentTime position () const;
private:
friend struct dcp_subtitle_within_dcp_test;
void next_reel ();
void get_readers ();
- void pass_texts (ContentTime next);
- void pass_texts (ContentTime next, boost::shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, boost::shared_ptr<TextDecoder> decoder);
+ void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
+ void pass_texts (
+ dcpomatic::ContentTime next,
+ boost::shared_ptr<dcp::SubtitleAsset> asset,
+ bool reference,
+ int64_t entry_point,
+ boost::shared_ptr<TextDecoder> decoder,
+ dcp::Size size
+ );
+ std::string calculate_lazy_digest (boost::shared_ptr<const DCPContent>) const;
/** Time of next thing to return from pass relative to the start of _reel */
- ContentTime _next;
+ dcpomatic::ContentTime _next;
std::list<boost::shared_ptr<dcp::Reel> > _reels;
std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
boost::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
/** Reader for current sound asset, if applicable */
boost::shared_ptr<dcp::SoundAssetReader> _sound_reader;
+ boost::shared_ptr<dcp::AtmosAssetReader> _atmos_reader;
+ boost::optional<AtmosMetadata> _atmos_metadata;
bool _decode_referenced;
boost::optional<int> _forced_reduction;
+
+ std::string _lazy_digest;
};