using std::vector;
using std::shared_ptr;
using std::dynamic_pointer_cast;
+using std::make_shared;
using boost::optional;
using namespace dcpomatic;
DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent> c, bool fast, bool tolerant, shared_ptr<DCPDecoder> old)
: DCP (c, tolerant)
, Decoder (film)
- , _decode_referenced (false)
{
if (c->can_be_played()) {
if (c->video) {
- video.reset (new VideoDecoder (this, c));
+ video = make_shared<VideoDecoder>(this, c);
}
if (c->audio) {
- audio.reset (new AudioDecoder (this, c->audio, fast));
+ audio = make_shared<AudioDecoder>(this, c->audio, fast);
}
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())));
+ text.push_back (make_shared<TextDecoder>(this, i, ContentTime()));
}
if (c->atmos) {
- atmos.reset (new AtmosDecoder (this, c));
+ atmos = make_shared<AtmosDecoder>(this, c);
}
}
_reels = old->_reels;
} else {
- list<shared_ptr<dcp::CPL> > cpl_list = cpls ();
+ auto cpl_list = cpls ();
if (cpl_list.empty()) {
throw DCPError (_("No CPLs found in DCP."));
set_decode_referenced (false);
_reel = _reels.begin ();
- _offset = 0;
get_readers ();
}
if (_mono_reader) {
video->emit (
film(),
- shared_ptr<ImageProxy> (
- new J2KImageProxy (
- _mono_reader->get_frame (entry_point + frame),
- picture_asset->size(),
- AV_PIX_FMT_XYZ12LE,
- _forced_reduction
- )
+ std::make_shared<J2KImageProxy>(
+ _mono_reader->get_frame (entry_point + frame),
+ picture_asset->size(),
+ AV_PIX_FMT_XYZ12LE,
+ _forced_reduction
),
_offset + frame
);
} else {
video->emit (
film(),
- shared_ptr<ImageProxy> (
- new J2KImageProxy (
- _stereo_reader->get_frame (entry_point + frame),
- picture_asset->size(),
- dcp::Eye::LEFT,
- AV_PIX_FMT_XYZ12LE,
- _forced_reduction
- )
+ std::make_shared<J2KImageProxy>(
+ _stereo_reader->get_frame (entry_point + frame),
+ picture_asset->size(),
+ dcp::Eye::LEFT,
+ AV_PIX_FMT_XYZ12LE,
+ _forced_reduction
),
_offset + frame
);
video->emit (
film(),
- shared_ptr<ImageProxy> (
- new J2KImageProxy (
- _stereo_reader->get_frame (entry_point + frame),
- picture_asset->size(),
- dcp::Eye::RIGHT,
- AV_PIX_FMT_XYZ12LE,
- _forced_reduction
- )
+ std::make_shared<J2KImageProxy>(
+ _stereo_reader->get_frame (entry_point + frame),
+ picture_asset->size(),
+ dcp::Eye::RIGHT,
+ AV_PIX_FMT_XYZ12LE,
+ _forced_reduction
),
_offset + frame
);
void
DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
{
- list<shared_ptr<TextDecoder> >::const_iterator decoder = text.begin ();
+ auto decoder = text.begin ();
if (decoder == text.end()) {
/* It's possible that there is now a main subtitle but no TextDecoders, for example if
the CPL has just changed but the TextContent's texts have not been recreated yet.
pass_texts (
next,
(*_reel)->main_subtitle()->asset(),
- _dcp_content->reference_text(TEXT_OPEN_SUBTITLE),
+ _dcp_content->reference_text(TextType::OPEN_SUBTITLE),
(*_reel)->main_subtitle()->entry_point().get_value_or(0),
*decoder,
size
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
+ next, i->asset(), _dcp_content->reference_text(TextType::CLOSED_CAPTION), i->entry_point().get_value_or(0), *decoder, size
);
++decoder;
}
DCPOMATIC_ASSERT (mono || stereo);
if (mono) {
_mono_reader = mono->start_read ();
+ _mono_reader->set_check_hmac (false);
_stereo_reader.reset ();
} else {
_stereo_reader = stereo->start_read ();
+ _stereo_reader->set_check_hmac (false);
_mono_reader.reset ();
}
} else {
if ((*_reel)->main_sound()) {
_sound_reader = (*_reel)->main_sound()->asset()->start_read ();
+ _sound_reader->set_check_hmac (false);
} else {
_sound_reader.reset ();
}
if ((*_reel)->atmos()) {
shared_ptr<dcp::AtmosAsset> asset = (*_reel)->atmos()->asset();
_atmos_reader = asset->start_read();
+ _atmos_reader->set_check_hmac (false);
_atmos_metadata = AtmosMetadata (asset);
} else {
_atmos_reader.reset ();