Additional formats for SSA/ASS tracks matching

ps3mediaserver · Jul 7, 2012 · 48be6c4 · 48be6c4
1 parent 0534228
commit 48be6c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/net/pms/formats/SubtitleType.java b/src/main/java/net/pms/formats/SubtitleType.java
@@ -31,7 +31,7 @@ public enum SubtitleType {
 	SAMI ("SAMI", list("smi"), list()),
 	ASS ("(Advanced) SubStation Alpha",
 			list("ass", "ssa"),
-			list("S_TEXT/SSA", "S_TEXT/ASS", "S_SSA", "S_ASS")),
+			list("S_TEXT/SSA", "S_TEXT/ASS", "S_SSA", "S_ASS", "SSA", "ASS")),
 	VOBSUB ("VobSub", list("idx"), list("S_VOBSUB", "subp")),
 	UNSUPPORTED ("Unsupported", list(), list()),
 	USF ("Universal Subtitle Format", list(), list("S_TEXT/USF", "S_USF")),

diff --git a/src/test/java/net/pms/formats/SubtitleTypeTest.java b/src/test/java/net/pms/formats/SubtitleTypeTest.java
@@ -47,6 +47,8 @@ public void getSubtitleTypeByLibMediaInfoCodec_matchingCodecs() throws Exception
 		assertThat(SubtitleType.getSubtitleTypeByLibMediaInfoCodec("s_ass")).isEqualTo(SubtitleType.ASS);
 		assertThat(SubtitleType.getSubtitleTypeByLibMediaInfoCodec("S_TEXT/SSA")).isEqualTo(SubtitleType.ASS);
 		assertThat(SubtitleType.getSubtitleTypeByLibMediaInfoCodec("S_TEXT/ASS")).isEqualTo(SubtitleType.ASS);
+		assertThat(SubtitleType.getSubtitleTypeByLibMediaInfoCodec("SSA")).isEqualTo(SubtitleType.ASS);
+		assertThat(SubtitleType.getSubtitleTypeByLibMediaInfoCodec("ASS")).isEqualTo(SubtitleType.ASS);
 		assertThat(SubtitleType.getSubtitleTypeByLibMediaInfoCodec("subp")).isEqualTo(SubtitleType.VOBSUB);
 		assertThat(SubtitleType.getSubtitleTypeByLibMediaInfoCodec("S_VOBSUB")).isEqualTo(SubtitleType.VOBSUB);
 		assertThat(SubtitleType.getSubtitleTypeByLibMediaInfoCodec("s_usf")).isEqualTo(SubtitleType.USF);