From 48be6c4251ed9ae5999ceca1268d2d82d58f5a8e Mon Sep 17 00:00:00 2001 From: Happy-Neko Date: Sat, 7 Jul 2012 20:00:00 +0400 Subject: [PATCH] Additional formats for SSA/ASS tracks matching --- src/main/java/net/pms/formats/SubtitleType.java | 2 +- src/test/java/net/pms/formats/SubtitleTypeTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/pms/formats/SubtitleType.java b/src/main/java/net/pms/formats/SubtitleType.java index 575bab066..ac1f375a4 100644 --- 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 index 28e168ca9..e1809c839 100644 --- 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);