From: Carl Hetherington <cth@carlh.net>
Date: Tue, 6 Oct 2015 08:17:17 +0000 (+0100)
Subject: Speculative support for multi-part subtitles (#709).
X-Git-Tag: v2.4.1~1
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=c53bf2c0860f6b0ff583ad9f4bc4c7e86d47fa94

Speculative support for multi-part subtitles (#709).
---

diff --git a/ChangeLog b/ChangeLog
index b3a58f1f7..598636ff1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-06  Carl Hetherington  <cth@carlh.net>
+
+	* Speculative support for multi-part
+	bitmap subtitles (#709).
+
 2015-10-05  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.4.0 released.
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index c23d56b42..3fdb2f2a9 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -412,8 +412,6 @@ FFmpegDecoder::decode_subtitle_packet ()
 		   indicate that the previous subtitle should stop.  We can ignore it here.
 		*/
 		return;
-	} else if (sub.num_rects > 1) {
-		throw DecodeError (_("multi-part subtitles not yet supported"));
 	}
 
 	/* Subtitle PTS (within the source, not taking into account any of the
@@ -430,20 +428,22 @@ FFmpegDecoder::decode_subtitle_packet ()
 		period.to = ffmpeg_content()->subtitle_stream()->find_subtitle_to (period.from);
 	}
 
-	AVSubtitleRect const * rect = sub.rects[0];
-
-	switch (rect->type) {
-	case SUBTITLE_NONE:
-		break;
-	case SUBTITLE_BITMAP:
-		decode_bitmap_subtitle (rect, period);
-		break;
-	case SUBTITLE_TEXT:
-		cout << "XXX: SUBTITLE_TEXT " << rect->text << "\n";
-		break;
-	case SUBTITLE_ASS:
-		cout << "XXX: SUBTITLE_ASS " << rect->ass << "\n";
-		break;
+	for (unsigned int i = 0; i < sub.num_rects; ++i) {
+		AVSubtitleRect const * rect = sub.rects[i];
+
+		switch (rect->type) {
+		case SUBTITLE_NONE:
+			break;
+		case SUBTITLE_BITMAP:
+			decode_bitmap_subtitle (rect, period);
+			break;
+		case SUBTITLE_TEXT:
+			cout << "XXX: SUBTITLE_TEXT " << rect->text << "\n";
+			break;
+		case SUBTITLE_ASS:
+			cout << "XXX: SUBTITLE_ASS " << rect->ass << "\n";
+			break;
+		}
 	}
 
 	avsubtitle_free (&sub);