/*
- Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+#include "atmos_decoder.h"
#include "dcp_decoder.h"
#include "dcp_content.h"
#include "audio_content.h"
#include "image.h"
#include "config.h"
#include "digester.h"
+#include "frame_interval_checker.h"
#include <dcp/dcp.h>
#include <dcp/cpl.h>
#include <dcp/reel.h>
#include <dcp/sound_asset_reader.h>
#include <dcp/subtitle_image.h>
#include <dcp/decrypted_kdm.h>
+#include <dcp/reel_atmos_asset.h>
#include <boost/foreach.hpp>
#include <iostream>
/* XXX: this time here should be the time of the first subtitle, not 0 */
text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, i, ContentTime())));
}
+ if (c->atmos) {
+ atmos.reset (new AtmosDecoder (this, c));
+ }
}
/* We try to avoid re-scanning the DCP's files every time we make a new DCPDecoder; we do this
audio->emit (film(), _dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next);
}
+ if (_atmos_reader) {
+ DCPOMATIC_ASSERT (_atmos_metadata);
+ int64_t const entry_point = (*_reel)->atmos()->entry_point().get_value_or(0);
+ atmos->emit (film(), _atmos_reader->get_frame(entry_point + frame), _offset + frame, *_atmos_metadata);
+ }
+
_next += ContentTime::from_frames (1, vfr);
if ((*_reel)->main_picture ()) {
_mono_reader.reset ();
_stereo_reader.reset ();
_sound_reader.reset ();
+ _atmos_reader.reset ();
return;
}
} else {
_sound_reader.reset ();
}
+
+ if ((*_reel)->atmos()) {
+ shared_ptr<dcp::AtmosAsset> asset = (*_reel)->atmos()->asset();
+ _atmos_reader = asset->start_read();
+ _atmos_metadata = AtmosMetadata (asset);
+ } else {
+ _atmos_reader.reset ();
+ _atmos_metadata = boost::none;
+ }
}
void
BOOST_FOREACH (boost::filesystem::path i, c->paths()) {
d.add (i.string());
}
- d.add (static_cast<bool>(_dcp_content->kdm()));
+ if (_dcp_content->kdm()) {
+ d.add(_dcp_content->kdm()->id());
+ }
d.add (static_cast<bool>(c->cpl()));
if (c->cpl()) {
d.add (c->cpl().get());