feat: use "audio/ogg; codecs=opus" as the MIME type for OPUS audio

rdeltour · rdeltour · commit 0759a82ae407 · 2023-01-11T09:19:44.000+01:00
Fix #1473
diff --git a/src/main/java/com/adobe/epubcheck/opf/OPFChecker30.java b/src/main/java/com/adobe/epubcheck/opf/OPFChecker30.java
@@ -565,7 +565,7 @@ public static boolean isAudioType(String type)
 
   public static boolean isBlessedAudioType(String type)
   {
-    return type.equals("audio/mpeg") || type.equals("audio/mp4") || type.equals("audio/opus");
+    return type.equals("audio/mpeg") || type.equals("audio/mp4") || type.matches("audio/ogg\\s*;\\s*codecs=opus");
   }
 
   public static boolean isVideoType(String type)
diff --git a/src/main/java/com/adobe/epubcheck/ops/OPSHandler30.java b/src/main/java/com/adobe/epubcheck/ops/OPSHandler30.java
@@ -644,6 +644,14 @@ protected String checkMimetypeMatches(URL resource, String mimetype)
       // remove any params from the given MIME type string
       mimetype = MIMEType.removeParams(mimetype);
 
+      // hack: remove the codecs parameter in the resource type for OPUS audio
+      // so that the equality check works
+      // TODO remove this when we implement proper MIME type parsing
+      if (resourceMimetype != null && resourceMimetype.matches("audio/ogg\\s*;\\s*codecs=opus"))
+      {
+        resourceMimetype = "audio/ogg";
+      }
+
       // report any MIME type mismatch as a warning
       if (resourceMimetype != null && !resourceMimetype.equals(mimetype))
       {
diff --git a/src/test/resources/epub3/03-resources/files/resources-cmt-audio-opus-valid/EPUB/content_001.xhtml b/src/test/resources/epub3/03-resources/files/resources-cmt-audio-opus-valid/EPUB/content_001.xhtml
@@ -7,6 +7,8 @@
 	<body>
 		<h1>Loomings</h1>
 		<p>Call me Ishmael.</p>
-		<audio src="audio.opus" />
+		<audio>
+			<source src="audio.opus" type="audio/ogg; codecs=opus"/>
+		</audio>
 	</body>
 </html>
diff --git a/src/test/resources/epub3/03-resources/files/resources-cmt-audio-opus-valid/EPUB/package.opf b/src/test/resources/epub3/03-resources/files/resources-cmt-audio-opus-valid/EPUB/package.opf
@@ -9,7 +9,7 @@
 <manifest>
   <item id="content_001"  href="content_001.xhtml" media-type="application/xhtml+xml"/>
   <item id="nav"  href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>
-  <item id="audio" href="audio.opus" media-type="audio/opus"/>
+  <item id="audio" href="audio.opus" media-type="audio/ogg ;  codecs=opus"/>
 </manifest>
 <spine>
   <itemref idref="content_001" />

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ public static boolean isAudioType(String type)`
`565`	`565`
`566`	`566`	`public static boolean isBlessedAudioType(String type)`
`567`	`567`	`{`
`568`		`- return type.equals("audio/mpeg") \|\| type.equals("audio/mp4") \|\| type.equals("audio/opus");`
	`568`	`+ return type.equals("audio/mpeg") \|\| type.equals("audio/mp4") \|\| type.matches("audio/ogg\\s;\\scodecs=opus");`
`569`	`569`	`}`
`570`	`570`
`571`	`571`	`public static boolean isVideoType(String type)`