diff options
| -rw-r--r-- | src/lib/dcp_decoder.cc | 28 | ||||
| m--------- | test/data | 0 |
2 files changed, 23 insertions, 5 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 0250fa9fe..ad5beeba8 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -194,16 +194,34 @@ DCPDecoder::pass_subtitles (ContentTime next) true ); + list<dcp::SubtitleString> strings; + BOOST_FOREACH (dcp::SubtitleString i, subs) { - list<dcp::SubtitleString> s; - s.push_back (i); + if (!strings.empty() && (strings.back().in() != i.in() || strings.back().out() != i.out())) { + dcp::SubtitleString b = strings.back(); + subtitle->emit_text ( + ContentTimePeriod ( + ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()), + ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.out().as_seconds()) + ), + strings + ); + strings.clear (); + } + + strings.push_back (i); + } + + if (!strings.empty()) { + dcp::SubtitleString b = strings.back(); subtitle->emit_text ( ContentTimePeriod ( - ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i.in().as_seconds ()), - ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i.out().as_seconds ()) + ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()), + ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.out().as_seconds()) ), - s + strings ); + strings.clear (); } } } diff --git a/test/data b/test/data -Subproject e5472ceee4b68737cdf10157c6a5d2018c98e66 +Subproject 8e5bb30bd87cc81d55da1653301c9b338a54622 |