Backport of c75484af73d38b00a4f27143f8e434b6f25bf355 from master; fix for overlaid in partially-marked-up subtitle lines.

1 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 ();
 		}
 	}
 }