diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-30 21:39:58 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-10-30 22:43:55 +0100 |
| commit | 0486d4d94900c7f2a2cab7885b3f162d1ad8290c (patch) | |
| tree | b50f8551027f49ab72956e8295e50064cf8ee183 | |
| parent | 265acfe3f904b4af4c37f6f0898f7c10f146ca42 (diff) | |
Fix dying butler on changing CPL from one without to one withv2.15.28
subtitles (#1641).
Forward-port from da39ed1516f2463f8a9bf4795a94f23d420c9ca3 in master.
| -rw-r--r-- | src/lib/dcp_decoder.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 4b189189e..826b4e8d3 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -223,8 +223,14 @@ void DCPDecoder::pass_texts (ContentTime next, dcp::Size size) { list<shared_ptr<TextDecoder> >::const_iterator 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. + */ + return; + } + if ((*_reel)->main_subtitle()) { - DCPOMATIC_ASSERT (decoder != text.end ()); pass_texts ( next, (*_reel)->main_subtitle()->asset(), @@ -235,8 +241,8 @@ DCPDecoder::pass_texts (ContentTime next, dcp::Size size) ); ++decoder; } + BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> i, (*_reel)->closed_captions()) { - DCPOMATIC_ASSERT (decoder != text.end ()); pass_texts ( next, i->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), i->entry_point().get_value_or(0), *decoder, size ); |