projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix possible incorrect eye mapping with 3D-alternate sources.
[dcpomatic.git]
/
src
/
lib
/
dcp_decoder.cc
diff --git
a/src/lib/dcp_decoder.cc
b/src/lib/dcp_decoder.cc
index 17710a3bd093a0127af3aec339d33cff6de0ffa6..59b44ae975ee5080c48ec6599535bf21d390c915 100644
(file)
--- a/
src/lib/dcp_decoder.cc
+++ b/
src/lib/dcp_decoder.cc
@@
-49,7
+49,6
@@
#include <dcp/subtitle_image.h>
#include <dcp/decrypted_kdm.h>
#include <dcp/reel_atmos_asset.h>
#include <dcp/subtitle_image.h>
#include <dcp/decrypted_kdm.h>
#include <dcp/reel_atmos_asset.h>
-#include <boost/foreach.hpp>
#include <iostream>
#include "i18n.h"
#include <iostream>
#include "i18n.h"
@@
-59,29
+58,29
@@
using std::cout;
using std::map;
using std::string;
using std::vector;
using std::map;
using std::string;
using std::vector;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+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)
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) {
{
if (c->can_be_played()) {
if (c->video) {
- video
.reset (new VideoDecoder (this, c)
);
+ video
= make_shared<VideoDecoder>(this, c
);
}
if (c->audio) {
}
if (c->audio) {
- audio
.reset (new AudioDecoder (this, c->audio, fast)
);
+ audio
= make_shared<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 */
/* 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) {
}
if (c->atmos) {
- atmos
.reset (new AtmosDecoder (this, c)
);
+ atmos
= make_shared<AtmosDecoder>(this, c
);
}
}
}
}
@@
-99,14
+98,14
@@
DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent
_reels = old->_reels;
} else {
_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."));
}
shared_ptr<dcp::CPL> cpl;
if (cpl_list.empty()) {
throw DCPError (_("No CPLs found in DCP."));
}
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;
}
if (_dcp_content->cpl() && i->id() == _dcp_content->cpl().get()) {
cpl = i;
}
@@
-125,7
+124,6
@@
DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent
set_decode_referenced (false);
_reel = _reels.begin ();
set_decode_referenced (false);
_reel = _reels.begin ();
- _offset = 0;
get_readers ();
}
get_readers ();
}
@@
-162,41
+160,35
@@
DCPDecoder::pass ()
if (_mono_reader) {
video->emit (
film(),
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(),
),
_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(),
),
_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
);
),
_offset + frame
);
@@
-243,7
+235,7
@@
DCPDecoder::pass ()
void
DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
{
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.
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.
@@
-255,7
+247,7
@@
DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
pass_texts (
next,
(*_reel)->main_subtitle()->asset(),
pass_texts (
next,
(*_reel)->main_subtitle()->asset(),
- _dcp_content->reference_text(T
EXT_
OPEN_SUBTITLE),
+ _dcp_content->reference_text(T
extType::
OPEN_SUBTITLE),
(*_reel)->main_subtitle()->entry_point().get_value_or(0),
*decoder,
size
(*_reel)->main_subtitle()->entry_point().get_value_or(0),
*decoder,
size
@@
-263,9
+255,9
@@
DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
++decoder;
}
++decoder;
}
-
BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> i,
(*_reel)->closed_captions()) {
+
for (auto i:
(*_reel)->closed_captions()) {
pass_texts (
pass_texts (
- next, i->asset(), _dcp_content->reference_text(T
EXT_
CLOSED_CAPTION), i->entry_point().get_value_or(0), *decoder, size
+ next, i->asset(), _dcp_content->reference_text(T
extType::
CLOSED_CAPTION), i->entry_point().get_value_or(0), *decoder, size
);
++decoder;
}
);
++decoder;
}
@@
-281,7
+273,7
@@
DCPDecoder::pass_texts (
int64_t const frame = next.frames_round (vfr);
if (_decode_referenced || !reference) {
int64_t const frame = next.frames_round (vfr);
if (_decode_referenced || !reference) {
-
list<shared_ptr<dcp::Subtitle> >
subs = asset->subtitles_during (
+
auto
subs = asset->subtitles_during (
dcp::Time (entry_point + frame, vfr, vfr),
dcp::Time (entry_point + frame + 1, vfr, vfr),
true
dcp::Time (entry_point + frame, vfr, vfr),
dcp::Time (entry_point + frame + 1, vfr, vfr),
true
@@
-289,11
+281,11
@@
DCPDecoder::pass_texts (
list<dcp::SubtitleString> strings;
list<dcp::SubtitleString> strings;
-
BOOST_FOREACH (shared_ptr<dcp::Subtitle> i,
subs) {
-
shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString>
(i);
+
for (auto i:
subs) {
+
auto is = dynamic_pointer_cast<const dcp::SubtitleString>
(i);
if (is) {
if (!strings.empty() && (strings.back().in() != is->in() || strings.back().out() != is->out())) {
if (is) {
if (!strings.empty() && (strings.back().in() != is->in() || strings.back().out() != is->out())) {
-
dcp::SubtitleString
b = strings.back();
+
auto
b = strings.back();
decoder->emit_plain (
ContentTimePeriod (
ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
decoder->emit_plain (
ContentTimePeriod (
ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
@@
-311,7
+303,7
@@
DCPDecoder::pass_texts (
this would need to be done both here and in DCPSubtitleDecoder.
*/
this would need to be done both here and in DCPSubtitleDecoder.
*/
-
shared_ptr<dcp::SubtitleImage> ii = dynamic_pointer_cast<dcp::SubtitleImage>
(i);
+
auto ii = dynamic_pointer_cast<const dcp::SubtitleImage>
(i);
if (ii) {
emit_subtitle_image (
ContentTimePeriod (
if (ii) {
emit_subtitle_image (
ContentTimePeriod (
@@
-326,7
+318,7
@@
DCPDecoder::pass_texts (
}
if (!strings.empty()) {
}
if (!strings.empty()) {
-
dcp::SubtitleString
b = strings.back();
+
auto
b = strings.back();
decoder->emit_plain (
ContentTimePeriod (
ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
decoder->emit_plain (
ContentTimePeriod (
ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
@@
-365,9
+357,11
@@
DCPDecoder::get_readers ()
DCPOMATIC_ASSERT (mono || stereo);
if (mono) {
_mono_reader = mono->start_read ();
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.reset ();
} else {
_stereo_reader = stereo->start_read ();
+ _stereo_reader->set_check_hmac (false);
_mono_reader.reset ();
}
} else {
_mono_reader.reset ();
}
} else {
@@
-377,6
+371,7
@@
DCPDecoder::get_readers ()
if ((*_reel)->main_sound()) {
_sound_reader = (*_reel)->main_sound()->asset()->start_read ();
if ((*_reel)->main_sound()) {
_sound_reader = (*_reel)->main_sound()->asset()->start_read ();
+ _sound_reader->set_check_hmac (false);
} else {
_sound_reader.reset ();
}
} else {
_sound_reader.reset ();
}
@@
-384,6
+379,7
@@
DCPDecoder::get_readers ()
if ((*_reel)->atmos()) {
shared_ptr<dcp::AtmosAsset> asset = (*_reel)->atmos()->asset();
_atmos_reader = asset->start_read();
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 ();
_atmos_metadata = AtmosMetadata (asset);
} else {
_atmos_reader.reset ();
@@
-471,7
+467,7
@@
string
DCPDecoder::calculate_lazy_digest (shared_ptr<const DCPContent> c) const
{
Digester d;
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());
}
if (_dcp_content->kdm()) {
d.add (i.string());
}
if (_dcp_content->kdm()) {
@@
-495,7
+491,7
@@
vector<FontData>
DCPDecoder::fonts () const
{
vector<FontData> data;
DCPDecoder::fonts () const
{
vector<FontData> data;
-
BOOST_FOREACH (shared_ptr<dcp::Reel> i,
_reels) {
+
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) {
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) {