shaka-player 4.4.2 → 4.5.0

package/test/transmuxer/transmuxer_integration.js

@@ -36,8 +36,8 @@ describe('Transmuxer Player', () => {
     // We must enable this, once it is resolved:
     // https://bugs.chromium.org/p/chromium/issues/detail?id=1450313
     const chromeVersion = shaka.util.Platform.chromeVersion();
-    if (shaka.util.Platform.isEdge() &&
-        chromeVersion && chromeVersion <= 116) {
+    if (shaka.util.Platform.isWindows() && shaka.util.Platform.isEdge() &&
+        chromeVersion && chromeVersion <= 118) {
       return false;
     }
     return true;
@@ -57,8 +57,8 @@ describe('Transmuxer Player', () => {
     // We must enable this, once it is resolved:
     // https://bugs.chromium.org/p/chromium/issues/detail?id=1450313
     const chromeVersion = shaka.util.Platform.chromeVersion();
-    if (shaka.util.Platform.isEdge() &&
-        chromeVersion && chromeVersion <= 116) {
+    if (shaka.util.Platform.isWindows() && shaka.util.Platform.isEdge() &&
+        chromeVersion && chromeVersion <= 118) {
       return false;
     }
     return true;
@@ -273,6 +273,33 @@ describe('Transmuxer Player', () => {
 
       await player.unload();
     });
+
+    it('H.265 in TS', async () => {
+      const chromeVersion = shaka.util.Platform.chromeVersion();
+      if (shaka.util.Platform.isWindows() &&
+          chromeVersion && chromeVersion === 117) {
+        // It appears that Chrome 117 beta in Windows is incorrectly reporting
+        // H.265 in MediaCapabilities
+        pending('Codec H.265 is not supported by the platform.');
+      }
+      const mimeType = 'video/mp4; codecs="hvc1.2.4.L123.B0"';
+      if (!MediaSource.isTypeSupported(mimeType)) {
+        pending('Codec H.265 is not supported by the platform.');
+      }
+      await player.load('/base/test/test/assets/hls-ts-h265/hevc.m3u8');
+      await video.play();
+      expect(player.isLive()).toBe(false);
+
+      // Wait for the video to start playback.  If it takes longer than 10
+      // seconds, fail the test.
+      await waiter.waitForMovementOrFailOnTimeout(video, 10);
+
+      // Play for 15 seconds, but stop early if the video ends.  If it takes
+      // longer than 45 seconds, fail the test.
+      await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 15, 45);
+
+      await player.unload();
+    });
   });
 
   describe('for muxed content', () => {
@@ -292,5 +319,95 @@ describe('Transmuxer Player', () => {
 
       await player.unload();
     });
+
+    it('H.265+AAC in TS', async () => {
+      const chromeVersion = shaka.util.Platform.chromeVersion();
+      if (shaka.util.Platform.isWindows() &&
+          chromeVersion && chromeVersion === 117) {
+        // It appears that Chrome 117 beta in Windows is incorrectly reporting
+        // H.265 in MediaCapabilities
+        pending('Codec H.265 is not supported by the platform.');
+      }
+      if (!MediaSource.isTypeSupported('video/mp4; codecs="hvc1.1.6.L93.90"')) {
+        pending('Codec H.265 is not supported by the platform.');
+      }
+      // eslint-disable-next-line max-len
+      await player.load('/base/test/test/assets/hls-ts-muxed-aac-h265/media.m3u8');
+      await video.play();
+      expect(player.isLive()).toBe(false);
+
+      // Wait for the video to start playback.  If it takes longer than 10
+      // seconds, fail the test.
+      await waiter.waitForMovementOrFailOnTimeout(video, 10);
+
+      // Play for 15 seconds, but stop early if the video ends.  If it takes
+      // longer than 45 seconds, fail the test.
+      await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 15, 45);
+
+      await player.unload();
+    });
+
+    it('H.264+MP3 in TS', async () => {
+      if (!MediaSource.isTypeSupported('audio/mp4; codecs="mp3"')) {
+        pending('Codec MP3 in MP4 is not supported by the platform.');
+      }
+
+      // eslint-disable-next-line max-len
+      await player.load('/base/test/test/assets/hls-ts-muxed-mp3-h264/index.m3u8');
+      await video.play();
+      expect(player.isLive()).toBe(false);
+
+      // Wait for the video to start playback.  If it takes longer than 10
+      // seconds, fail the test.
+      await waiter.waitForMovementOrFailOnTimeout(video, 10);
+
+      // Play for 15 seconds, but stop early if the video ends.  If it takes
+      // longer than 45 seconds, fail the test.
+      await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 15, 45);
+
+      await player.unload();
+    });
+
+    it('H.264+AC3 in TS', async () => {
+      if (!isAc3Supported()) {
+        pending('Codec AC-3 is not supported by the platform.');
+      }
+
+      // eslint-disable-next-line max-len
+      await player.load('/base/test/test/assets/hls-ts-muxed-ac3-h264/media.m3u8');
+      await video.play();
+      expect(player.isLive()).toBe(false);
+
+      // Wait for the video to start playback.  If it takes longer than 10
+      // seconds, fail the test.
+      await waiter.waitForMovementOrFailOnTimeout(video, 10);
+
+      // Play for 15 seconds, but stop early if the video ends.  If it takes
+      // longer than 45 seconds, fail the test.
+      await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 15, 45);
+
+      await player.unload();
+    });
+
+    it('H.264+EC3 in TS', async () => {
+      if (!isEc3Supported()) {
+        pending('Codec EC-3 is not supported by the platform.');
+      }
+
+      // eslint-disable-next-line max-len
+      await player.load('/base/test/test/assets/hls-ts-muxed-ec3-h264/prog_index.m3u8');
+      await video.play();
+      expect(player.isLive()).toBe(false);
+
+      // Wait for the video to start playback.  If it takes longer than 10
+      // seconds, fail the test.
+      await waiter.waitForMovementOrFailOnTimeout(video, 10);
+
+      // Play for 15 seconds, but stop early if the video ends.  If it takes
+      // longer than 45 seconds, fail the test.
+      await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 15, 45);
+
+      await player.unload();
+    });
   });
 });

package/test/ui/ui_unit.js

@@ -616,19 +616,10 @@ describe('UI', () => {
         player.configure('abr.enabled', false);
 
         const tracks = player.getVariantTracks();
-        const en2 =
-            tracks.find((t) => t.language == 'en' && t.channelsCount == 2);
         const en1 =
             tracks.find((t) => t.language == 'en' && t.channelsCount == 1);
         const es = tracks.find((t) => t.language == 'es');
 
-        // There are 3 variants with English 2-channel, but one is a duplicate
-        // and shouldn't appear in the list.
-        goog.asserts.assert(en2, 'Unable to find tracks');
-        player.selectVariantTrack(en2, true);
-        await updateResolutionMenu();
-        expect(getResolutions()).toEqual(['240p', '480p']);
-
         // There is 1 variant with English 1-channel.
         goog.asserts.assert(en1, 'Unable to find tracks');
         player.selectVariantTrack(en1, true);
@@ -646,7 +637,9 @@ describe('UI', () => {
         const manifest =
           shaka.test.ManifestGenerator.generate((manifest) => {
             manifest.addVariant(0, (variant) => {
-              variant.addAudio(0);
+              variant.addAudio(0, (stream) => {
+                stream.roles = ['main'];
+              });
               variant.bandwidth = 100000;
             });
             manifest.addVariant(1, (variant) => {

package/test/util/stream_utils_unit.js

@@ -636,7 +636,8 @@ describe('StreamUtils', () => {
 
       const noVariant = null;
       await shaka.util.StreamUtils.filterManifest(
-          fakeDrmEngine, noVariant, manifest);
+          fakeDrmEngine, noVariant, manifest,
+          shaka.config.CodecSwitchingStrategy.RELOAD);
 
       // Covers a regression in which we would remove streams with codecs.
       // The last two streams should be removed because their full MIME types
@@ -673,7 +674,8 @@ describe('StreamUtils', () => {
 
       const noVariant = null;
       await shaka.util.StreamUtils.filterManifest(
-          fakeDrmEngine, noVariant, manifest);
+          fakeDrmEngine, noVariant, manifest,
+          shaka.config.CodecSwitchingStrategy.RELOAD);
 
       // Covers a regression in which we would remove streams with codecs.
       // The first 4 streams should be there because they are always supported.
@@ -691,6 +693,38 @@ describe('StreamUtils', () => {
           jasmine.objectContaining({id: 5}));
     });
 
+    it('does not filter manifest when codec switching is enabled', async () => {
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        manifest.addVariant(1, (variant) => {
+          variant.addAudio(10, (stream) => {
+            stream.codecs = 'mp4a.69';
+          });
+          variant.addVideo(11, (stream) => {
+            stream.codecs = 'avc1';
+          });
+        });
+      });
+
+      const originalFilterManifestByCurrentVariant =
+          shaka.util.StreamUtils.filterManifestByCurrentVariant;
+
+      try {
+        const filterManifestByCurrentVariantSpy =
+          jasmine.createSpy('filterManifestByCurrentVariant');
+        shaka.util.StreamUtils.filterManifestByCurrentVariant =
+          shaka.test.Util.spyFunc(filterManifestByCurrentVariantSpy);
+
+        await shaka.util.StreamUtils.filterManifest(
+            fakeDrmEngine, /* currentVariant= */ null, manifest,
+            shaka.config.CodecSwitchingStrategy.RELOAD);
+
+        expect(filterManifestByCurrentVariantSpy).not.toHaveBeenCalled();
+      } finally {
+        shaka.util.StreamUtils.filterManifestByCurrentVariant =
+          originalFilterManifestByCurrentVariant;
+      }
+    });
+
     it('filters transport streams', async () => {
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(0, (variant) => {
@@ -705,7 +739,8 @@ describe('StreamUtils', () => {
       });
 
       await shaka.util.StreamUtils.filterManifest(
-          fakeDrmEngine, /* currentVariant= */ null, manifest);
+          fakeDrmEngine, /* currentVariant= */ null, manifest,
+          shaka.config.CodecSwitchingStrategy.RELOAD);
 
       // Covers a regression in which we would remove streams with codecs.
       // The last two streams should be removed because their full MIME types
@@ -732,7 +767,8 @@ describe('StreamUtils', () => {
       });
 
       await shaka.util.StreamUtils.filterManifest(
-          fakeDrmEngine, /* currentVariant= */ null, manifest);
+          fakeDrmEngine, /* currentVariant= */ null, manifest,
+          shaka.config.CodecSwitchingStrategy.RELOAD);
       expect(manifest.variants.length).toBe(1);
     });
 
@@ -749,7 +785,8 @@ describe('StreamUtils', () => {
       });
 
       await shaka.util.StreamUtils.filterManifest(
-          fakeDrmEngine, /* currentVariant= */ null, manifest);
+          fakeDrmEngine, /* currentVariant= */ null, manifest,
+          shaka.config.CodecSwitchingStrategy.RELOAD);
 
       expect(manifest.variants.length).toBe(1);
     });
@@ -813,148 +850,245 @@ describe('StreamUtils', () => {
       });
 
       await shaka.util.StreamUtils.filterManifest(
-          fakeDrmEngine, /* currentVariant= */ null, manifest);
+          fakeDrmEngine, /* currentVariant= */ null, manifest,
+          shaka.config.CodecSwitchingStrategy.RELOAD);
 
       expect(manifest.variants.length).toBe(1);
     });
   });
 
   describe('chooseCodecsAndFilterManifest', () => {
-    const avc1Codecs = 'avc1.640028';
-    const vp09Codecs = 'vp09.00.40.08.00.02.02.02.00';
-
-    const addVariant1080Avc1 = (manifest) => {
+    const addVariant720Avc1 = (manifest) => {
       manifest.addVariant(0, (variant) => {
         variant.bandwidth = 5058558;
         variant.addAudio(1, (stream) => {
           stream.bandwidth = 129998;
-          stream.codecs = 'opus';
+          stream.mime('audio/mp4', 'mp4a.40.2');
         });
         variant.addVideo(2, (stream) => {
           stream.bandwidth = 4928560;
-          stream.codecs = avc1Codecs;
-          stream.size(1920, 1080);
+          stream.size(1280, 720);
+          stream.mime('video/mp4', 'avc1.640028');
         });
       });
     };
 
-    const addVariant1080Vp9 = (manifest) => {
+    const addVariant720Vp9 = (manifest) => {
       manifest.addVariant(3, (variant) => {
         variant.bandwidth = 4911000;
         variant.addAudio(4, (stream) => {
           stream.bandwidth = 129998;
-          stream.codecs = 'vorbis';
+          stream.mime('audio/webm', 'vorbis');
         });
         variant.addVideo(5, (stream) => {
           stream.bandwidth = 4781002;
-          stream.codecs = vp09Codecs;
-          stream.size(1920, 1080);
+          stream.size(1280, 720);
+          stream.mime('video/webm', 'vp9');
         });
       });
     };
 
-    const addVariant2160Vp9 = (manifest) => {
+    const addVariant1080Vp9 = (manifest) => {
       manifest.addVariant(6, (variant) => {
         variant.bandwidth = 10850316;
-        variant.addAudio(7, (stream) => {
+        variant.addAudio(1, (stream) => {
           stream.bandwidth = 129998;
-          stream.codecs = 'opus';
+          stream.mime('audio/mp4', 'mp4a.40.2');
         });
         variant.addVideo(8, (stream) => {
           stream.bandwidth = 10784324;
-          stream.codecs = vp09Codecs;
-          stream.size(3840, 2160);
+          stream.size(1920, 1080);
+          stream.mime('video/webm', 'vp9');
         });
       });
     };
 
+    it('should filter variants by the best available bandwidth' +
+        ' for video resolution', () => {
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        manifest.addVariant(0, (variant) => {
+          variant.bandwidth = 4058558;
+          variant.addVideo(1, (stream) => {
+            stream.bandwidth = 300000;
+            stream.size(10, 10);
+          });
+        });
+        manifest.addVariant(2, (variant) => {
+          variant.bandwidth = 4781002;
+          variant.addVideo(3, (stream) => {
+            stream.bandwidth = 400000;
+            stream.size(10, 10);
+          });
+        });
+        manifest.addVariant(4, (variant) => {
+          variant.addVideo(5, (stream) => {
+            stream.bandwidth = 500000;
+            stream.size(20, 20);
+          });
+        });
+        manifest.addVariant(6, (variant) => {
+          variant.addVideo(7, (stream) => {
+            stream.bandwidth = 600000;
+            stream.size(20, 20);
+          });
+        });
+      });
+
+      shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest,
+          /* preferredVideoCodecs= */[],
+          /* preferredAudioCodecs= */[],
+          /* preferredAudioChannelCount= */2,
+          /* preferredDecodingAttributes= */[]);
+
+      expect(manifest.variants.length).toBe(2);
+      expect(manifest.variants.every((v) => [300000, 500000].includes(
+          v.video.bandwidth))).toBeTruthy();
+    });
+
+    it('should filter variants by the best available bandwidth' +
+    ' for audio language', () => {
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        manifest.addVariant(0, (variant) => {
+          variant.bandwidth = 4058558;
+          variant.addAudio(1, (stream) => {
+            stream.bandwidth = 100000;
+            stream.language = 'en';
+          });
+        });
+        manifest.addVariant(2, (variant) => {
+          variant.bandwidth = 4781002;
+          variant.addAudio(3, (stream) => {
+            stream.bandwidth = 200000;
+            stream.language = 'en';
+          });
+        });
+        manifest.addVariant(4, (variant) => {
+          variant.addAudio(5, (stream) => {
+            stream.bandwidth = 100000;
+            stream.language = 'es';
+          });
+        });
+        manifest.addVariant(6, (variant) => {
+          variant.addAudio(7, (stream) => {
+            stream.bandwidth = 500000;
+            stream.language = 'es';
+          });
+        });
+      });
+
+      shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest,
+      /* preferredVideoCodecs= */[],
+          /* preferredAudioCodecs= */[],
+          /* preferredAudioChannelCount= */2,
+          /* preferredDecodingAttributes= */[]);
+
+      expect(manifest.variants.length).toBe(2);
+      expect(manifest.variants.every((v) => v.audio.bandwidth == 100000))
+          .toBeTruthy();
+    });
+
+    it('should allow multiple codecs for codec switching', () => {
+      if (!MediaSource.isTypeSupported('video/webm; codecs="vp9"')) {
+        pending('Codec VP9 is not supported by the platform.');
+      }
+      if (!MediaSource.isTypeSupported('video/webm; codecs="vorbis"')) {
+        pending('Codec vorbis is not supported by the platform.');
+      }
+      // This test is flaky in some Tizen devices, due to codec restrictions.
+      if (shaka.util.Platform.isTizen()) {
+        pending('Skip flaky test in Tizen');
+      }
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        addVariant720Avc1(manifest);
+        addVariant720Vp9(manifest);
+        addVariant1080Vp9(manifest);
+      });
+
+      manifest.variants[0].video.bandwidth = 1;
+
+      shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest,
+          /* preferredVideoCodecs= */[],
+          /* preferredAudioCodecs= */[],
+          /* preferredAudioChannelCount= */2,
+          /* preferredDecodingAttributes= */[]);
+
+      expect(manifest.variants.length).toBe(2);
+      expect(manifest.variants[0].video.codecs)
+          .not.toBe(manifest.variants[1].video.codecs);
+    });
+
     it('chooses preferred audio and video codecs', () => {
+      if (!MediaSource.isTypeSupported('video/webm; codecs="vp9"')) {
+        pending('Codec VP9 is not supported by the platform.');
+      }
+      if (!MediaSource.isTypeSupported('video/webm; codecs="vorbis"')) {
+        pending('Codec vorbis is not supported by the platform.');
+      }
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-        addVariant1080Avc1(manifest);
+        addVariant720Avc1(manifest);
+        addVariant720Vp9(manifest);
         addVariant1080Vp9(manifest);
-        addVariant2160Vp9(manifest);
       });
       const variants =
           shaka.util.StreamUtils.choosePreferredCodecs(manifest.variants,
-              /* preferredVideoCodecs= */['vp09'],
-              /* preferredAudioCodecs= */['opus']);
+              /* preferredVideoCodecs= */['vp9'],
+              /* preferredAudioCodecs= */['mp4a']);
 
       expect(variants.length).toBe(1);
-      expect(variants[0].video.codecs).toBe(vp09Codecs);
-      expect(variants[0].audio.codecs).toBe('opus');
+      expect(variants[0].video.codecs).toBe('vp9');
+      expect(variants[0].audio.codecs).toBe('mp4a.40.2');
     });
 
     it('chooses preferred video codecs', () => {
+      if (!MediaSource.isTypeSupported('video/webm; codecs="vp9"')) {
+        pending('Codec VP9 is not supported by the platform.');
+      }
+      if (!MediaSource.isTypeSupported('video/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
       // variants with preferred video codecs.
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-        addVariant1080Avc1(manifest);
+        addVariant720Avc1(manifest);
+        addVariant720Vp9(manifest);
         addVariant1080Vp9(manifest);
-        addVariant2160Vp9(manifest);
       });
       const variants =
           shaka.util.StreamUtils.choosePreferredCodecs(manifest.variants,
-              /* preferredVideoCodecs= */['vp09'],
+              /* preferredVideoCodecs= */['vp9'],
               /* preferredAudioCodecs= */[]);
 
       expect(variants.length).toBe(2);
-      expect(variants[0].video.codecs).toBe(vp09Codecs);
+      expect(variants[0].video.codecs).toBe('vp9');
       expect(variants[0].audio.codecs).toBe('vorbis');
-      expect(variants[1].video.codecs).toBe(vp09Codecs);
-      expect(variants[1].audio.codecs).toBe('opus');
+      expect(variants[1].video.codecs).toBe('vp9');
+      expect(variants[1].audio.codecs).toBe('mp4a.40.2');
     });
 
     it('chooses preferred audio codecs', () => {
+      if (!MediaSource.isTypeSupported('video/webm; codecs="vp9"')) {
+        pending('Codec VP9 is not supported by the platform.');
+      }
+      if (!MediaSource.isTypeSupported('video/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
       // variants with preferred audio codecs.
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-        addVariant1080Avc1(manifest);
+        addVariant720Avc1(manifest);
+        addVariant720Vp9(manifest);
         addVariant1080Vp9(manifest);
-        addVariant2160Vp9(manifest);
       });
       const variants =
           shaka.util.StreamUtils.choosePreferredCodecs(manifest.variants,
               /* preferredVideoCodecs= */['foo'],
-              /* preferredAudioCodecs= */['opus']);
+              /* preferredAudioCodecs= */['mp4a.40.2']);
 
       expect(variants.length).toBe(2);
-      expect(variants[0].video.codecs).toBe(avc1Codecs);
-      expect(variants[0].audio.codecs).toBe('opus');
-      expect(variants[1].video.codecs).toBe(vp09Codecs);
-      expect(variants[1].audio.codecs).toBe('opus');
-    });
-
-    it('chooses variants with different sizes (density) by codecs', () => {
-      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-        addVariant1080Avc1(manifest);
-        addVariant1080Vp9(manifest);
-        addVariant2160Vp9(manifest);
-      });
-
-      shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest,
-          /* preferredVideoCodecs= */[],
-          /* preferredAudioCodecs= */[],
-          /* preferredAudioChannelCount= */2,
-          /* preferredDecodingAttributes= */[]);
-
-      expect(manifest.variants.length).toBe(1);
-      expect(manifest.variants[0].video.codecs).toBe(vp09Codecs);
-    });
-
-    it('chooses variants with same sizes (density) by codecs', () => {
-      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-        addVariant1080Avc1(manifest);
-        addVariant1080Vp9(manifest);
-      });
-
-      shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest,
-          /* preferredVideoCodecs= */[],
-          /* preferredAudioCodecs= */[],
-          /* preferredAudioChannelCount= */2,
-          /* preferredDecodingAttributes= */[]);
-
-      expect(manifest.variants.length).toBe(1);
-      expect(manifest.variants[0].video.codecs).toBe(vp09Codecs);
+      expect(variants[0].video.codecs).toBe('avc1.640028');
+      expect(variants[0].audio.codecs).toBe('mp4a.40.2');
+      expect(variants[1].video.codecs).toBe('vp9');
+      expect(variants[1].audio.codecs).toBe('mp4a.40.2');
     });
 
     it('chooses variants by decoding attributes', async () => {

package/test/util/ts_parser_unit.js

@@ -72,6 +72,6 @@ describe('TsParser', () => {
     const codecs = new shaka.util.TsParser().parse(tsSegment)
         .getCodecs();
     expect(codecs.audio).toBe('aac');
-    expect(codecs.video).toBe('');
+    expect(codecs.video).toBe(null);
   });
 });