diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-23 16:12:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-23 16:12:14 +0100 |
| commit | 526fd6de4c80a7ac9614a1cb0209efff7b171cd5 (patch) | |
| tree | a6da82bdd59d98f19661ab1da2415cbc37353b0f /src/lib/dcp_decoder.cc | |
| parent | f24452ee5fe7af655a16d4e1a3bb1c87a54596cc (diff) | |
Revert "Avoid decoding other packets when looking for subs."
This reverts commit 9e025d3f85f9d6d855b3d5e6c90bca0eac3a3d49.
It causes corruption in prophet_clip.xml for reasons that
are not yet known.
Diffstat (limited to 'src/lib/dcp_decoder.cc')
| -rw-r--r-- | src/lib/dcp_decoder.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index ada0d01d1..21eb2f7ea 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -59,7 +59,7 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, bool fast) } bool -DCPDecoder::pass (PassReason reason) +DCPDecoder::pass () { if (_reel == _reels.end () || !_dcp_content->can_be_played ()) { return true; @@ -68,7 +68,7 @@ DCPDecoder::pass (PassReason reason) double const vfr = _dcp_content->video_frame_rate (); int64_t const frame = _next.frames_round (vfr); - if ((*_reel)->main_picture () && reason != PASS_REASON_SUBTITLE) { + if ((*_reel)->main_picture ()) { shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset (); shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset); shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset); @@ -88,7 +88,7 @@ DCPDecoder::pass (PassReason reason) } } - if ((*_reel)->main_sound () && reason != PASS_REASON_SUBTITLE) { + if ((*_reel)->main_sound ()) { int64_t const entry_point = (*_reel)->main_sound()->entry_point (); shared_ptr<const dcp::SoundFrame> sf = (*_reel)->main_sound()->asset()->get_frame (entry_point + frame); uint8_t const * from = sf->data (); |