test: Use MCap on StreamUtils tests (shaka-project#6604)

This prevents any tests from being skipped in Safari.
avelad · May 14, 2024 · 87de6e0 · 87de6e0
1 parent 024cb9b
commit 87de6e0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/test/test/util/util.js b/test/test/util/util.js
@@ -341,14 +341,18 @@ shaka.test.Util = class {
         // https://bugs.chromium.org/p/chromium/issues/detail?id=1450313
         return false;
       }
+      const baseMimeType = MimeUtils.getBasicType(mimetype);
       // AudioConfiguration
       mediaDecodingConfig.audio = {
-        contentType: mimetype,
+        contentType: MimeUtils.getFullType(baseMimeType, codecs),
       };
     } else {
+      const codecs = StreamUtils.getCorrectVideoCodecs(
+          MimeUtils.getCodecs(mimetype));
+      const baseMimeType = MimeUtils.getBasicType(mimetype);
       // VideoConfiguration
       mediaDecodingConfig.video = {
-        contentType: mimetype,
+        contentType: MimeUtils.getFullType(baseMimeType, codecs),
 
         // NOTE: Some decoders strictly check the width and height fields and
         // won't decode smaller than 64x64.  So if we don't have this info (as

diff --git a/test/util/stream_utils_unit.js b/test/util/stream_utils_unit.js
@@ -5,6 +5,7 @@
  */
 
 describe('StreamUtils', () => {
+  const Util = shaka.test.Util;
   const StreamUtils = shaka.util.StreamUtils;
 
   let manifest;
@@ -678,7 +679,7 @@ describe('StreamUtils', () => {
     });
 
     it('supports VP9 codec', async () => {
-      if (!MediaSource.isTypeSupported('video/webm; codecs="vp9"')) {
+      if (!await Util.isTypeSupported('video/webm; codecs="vp9"')) {
         pending('Codec VP9 is not supported by the platform.');
       }
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
@@ -695,7 +696,7 @@ describe('StreamUtils', () => {
     });
 
     it('supports fLaC codec', async () => {
-      if (!MediaSource.isTypeSupported('audio/mp4; codecs="flac"')) {
+      if (!await Util.isTypeSupported('audio/mp4; codecs="flac"')) {
         pending('Codec fLaC is not supported by the platform.');
       }
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
@@ -717,7 +718,7 @@ describe('StreamUtils', () => {
     });
 
     it('supports Opus codec', async () => {
-      if (!MediaSource.isTypeSupported('audio/mp4; codecs="opus"')) {
+      if (!await Util.isTypeSupported('audio/mp4; codecs="opus"')) {
         pending('Codec Opus is not supported by the platform.');
       }
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
@@ -739,7 +740,7 @@ describe('StreamUtils', () => {
     });
 
     it('supports legacy AVC1 codec', async () => {
-      if (!MediaSource.isTypeSupported('video/mp4; codecs="avc1.42001e"')) {
+      if (!await Util.isTypeSupported('video/mp4; codecs="avc1.42001e"')) {
         pending('Codec avc1.42001e is not supported by the platform.');
       }
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
@@ -886,11 +887,11 @@ describe('StreamUtils', () => {
           .toBeTruthy();
     });
 
-    it('should allow multiple codecs for codec switching', () => {
-      if (!MediaSource.isTypeSupported('video/webm; codecs="vp9"')) {
+    it('should allow multiple codecs for codec switching', async () => {
+      if (!await Util.isTypeSupported('video/webm; codecs="vp9"')) {
         pending('Codec VP9 is not supported by the platform.');
       }
-      if (!MediaSource.isTypeSupported('video/webm; codecs="vorbis"')) {
+      if (!await Util.isTypeSupported('audio/webm; codecs="vorbis"')) {
         pending('Codec vorbis is not supported by the platform.');
       }
       // This test is flaky in some Tizen devices, due to codec restrictions.
@@ -915,11 +916,11 @@ describe('StreamUtils', () => {
           .not.toBe(manifest.variants[1].video.codecs);
     });
 
-    it('chooses preferred audio and video codecs', () => {
-      if (!MediaSource.isTypeSupported('video/webm; codecs="vp9"')) {
+    it('chooses preferred audio and video codecs', async () => {
+      if (!await Util.isTypeSupported('video/webm; codecs="vp9"')) {
         pending('Codec VP9 is not supported by the platform.');
       }
-      if (!MediaSource.isTypeSupported('video/webm; codecs="vorbis"')) {
+      if (!await Util.isTypeSupported('audio/webm; codecs="vorbis"')) {
         pending('Codec vorbis is not supported by the platform.');
       }
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
@@ -937,11 +938,11 @@ describe('StreamUtils', () => {
       expect(variants[0].audio.codecs).toBe('mp4a.40.2');
     });
 
-    it('chooses preferred video codecs', () => {
-      if (!MediaSource.isTypeSupported('video/webm; codecs="vp9"')) {
+    it('chooses preferred video codecs', async () => {
+      if (!await Util.isTypeSupported('video/webm; codecs="vp9"')) {
         pending('Codec VP9 is not supported by the platform.');
       }
-      if (!MediaSource.isTypeSupported('video/webm; codecs="vorbis"')) {
+      if (!await Util.isTypeSupported('audio/webm; codecs="vorbis"')) {
         pending('Codec vorbis is not supported by the platform.');
       }
       // If no preferred audio codecs is specified or can be found, choose the
@@ -963,11 +964,11 @@ describe('StreamUtils', () => {
       expect(variants[1].audio.codecs).toBe('mp4a.40.2');
     });
 
-    it('chooses preferred audio codecs', () => {
-      if (!MediaSource.isTypeSupported('video/webm; codecs="vp9"')) {
+    it('chooses preferred audio codecs', async () => {
+      if (!await Util.isTypeSupported('video/webm; codecs="vp9"')) {
         pending('Codec VP9 is not supported by the platform.');
       }
-      if (!MediaSource.isTypeSupported('video/webm; codecs="vorbis"')) {
+      if (!await Util.isTypeSupported('audio/webm; codecs="vorbis"')) {
         pending('Codec vorbis is not supported by the platform.');
       }
       // If no preferred video codecs is specified or can be found, choose the