/*
- 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 <dcp/sound_asset_reader.h>
#include <dcp/subtitle_image.h>
#include <dcp/decrypted_kdm.h>
-#include <boost/foreach.hpp>
+#include <dcp/reel_atmos_asset.h>
#include <iostream>
#include "i18n.h"
using std::list;
using std::cout;
+using std::map;
using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::vector;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
using boost::optional;
using namespace dcpomatic;
if (c->audio) {
audio.reset (new AudioDecoder (this, c->audio, fast));
}
- BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
+ for (auto i: c->text) {
/* 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
}
shared_ptr<dcp::CPL> cpl;
- BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpl_list) {
+ for (auto i: cpl_list) {
if (_dcp_content->cpl() && i->id() == _dcp_content->cpl().get()) {
cpl = i;
}
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 ()) {
++decoder;
}
- BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> i, (*_reel)->closed_captions()) {
+ for (auto i: (*_reel)->closed_captions()) {
pass_texts (
next, i->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), i->entry_point().get_value_or(0), *decoder, size
);
list<dcp::SubtitleString> strings;
- BOOST_FOREACH (shared_ptr<dcp::Subtitle> i, subs) {
+ for (auto i: subs) {
shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString> (i);
if (is) {
if (!strings.empty() && (strings.back().in() != is->in() || strings.back().out() != is->out())) {
_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
DCPDecoder::calculate_lazy_digest (shared_ptr<const DCPContent> c) const
{
Digester d;
- BOOST_FOREACH (boost::filesystem::path i, c->paths()) {
+ for (auto 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());
{
return ContentTime::from_frames(_offset, _dcp_content->active_video_frame_rate(film())) + _next;
}
+
+
+vector<FontData>
+DCPDecoder::fonts () const
+{
+ vector<FontData> data;
+ for (auto i: _reels) {
+ if (i->main_subtitle() && i->main_subtitle()->asset()) {
+ map<string, dcp::ArrayData> fm = i->main_subtitle()->asset()->font_data();
+ for (map<string, dcp::ArrayData>::const_iterator j = fm.begin(); j != fm.end(); ++j) {
+ data.push_back (FontData(j->first, j->second));
+ }
+ }
+ }
+ return data;
+}
+