shaka-player 4.6.2 → 4.6.4

package/test/media/drm_engine_unit.js

@@ -2390,6 +2390,33 @@ describe('DrmEngine', () => {
           [drmInfoAudio]);
       expect(returned).toEqual([drmInfoDesired]);
     });
+
+    it('does not match incompatible drmInfos', () => {
+      // Different key systems do not match.
+      const drmInfo1 = {
+        keySystem: 'drm.abc',
+        licenseServerUri: undefined,
+        distinctiveIdentifierRequired: false,
+        persistentStateRequired: false,
+        serverCertificate: undefined,
+        serverCertificateUri: '',
+        initData: [],
+        keyIds: new Set(),
+      };
+      const drmInfo2 = {
+        keySystem: 'drm.foobar',
+        licenseServerUri: undefined,
+        distinctiveIdentifierRequired: false,
+        persistentStateRequired: false,
+        serverCertificate: undefined,
+        serverCertificateUri: '',
+        initData: [],
+        keyIds: new Set(),
+      };
+      const returned1 = shaka.media.DrmEngine.getCommonDrmInfos(
+          [drmInfo1], [drmInfo2]);
+      expect(returned1).toEqual([]);
+    });
   }); // describe('getCommonDrmInfos')
 
   describe('configure', () => {

package/test/test/util/layout_tests.js

@@ -377,7 +377,8 @@ shaka.test.NativeTextLayoutTests = class extends shaka.test.TextLayoutTests {
 
   /** @override */
   recreateTextDisplayer() {
-    this.textDisplayer = new shaka.text.SimpleTextDisplayer(this.video);
+    this.textDisplayer = new shaka.text.SimpleTextDisplayer(
+        this.video, shaka.Player.TextTrackLabel);
     this.textDisplayer.setTextVisibility(true);
   }
 

package/test/text/simple_text_displayer_unit.js

@@ -18,7 +18,7 @@ describe('SimpleTextDisplayer', () => {
 
   beforeEach(() => {
     video = new shaka.test.FakeVideo();
-    displayer = new SimpleTextDisplayer(video);
+    displayer = new SimpleTextDisplayer(video, shaka.Player.TextTrackLabel);
 
     expect(video.textTracks.length).toBe(1);
     mockTrack = /** @type {!shaka.test.FakeTextTrack} */ (video.textTracks[0]);

package/test/text/web_vtt_generator_unit.js

@@ -18,11 +18,11 @@ describe('WebVttGenerator', () => {
     const shakaCue2 = new shaka.text.Cue(40, 50, 'Test2');
     shakaCue2.textAlign = shaka.text.Cue.textAlign.RIGHT;
     shakaCue2.writingMode = shaka.text.Cue.writingMode.VERTICAL_RIGHT_TO_LEFT;
-    shakaCue2.color = '#0f0';
-    shakaCue2.backgroundColor = 'lime';
+    shakaCue2.color = '#00ff00ff';
+    shakaCue2.backgroundColor = 'rgba(0,255,0,1)';
     const shakaCue3 = new shaka.text.Cue(50, 51, 'Test3');
     shakaCue3.textAlign = shaka.text.Cue.textAlign.CENTER;
-    shakaCue3.color = '#ffff00';
+    shakaCue3.color = 'rgb(255,255,0)';
     shakaCue3.backgroundColor = '#00ffff';
     const shakaCue4 = new shaka.text.Cue(52, 53, 'Test4');
     shakaCue4.textAlign = shaka.text.Cue.textAlign.START;

package/test/transmuxer/transmuxer_integration.js

@@ -15,7 +15,7 @@
 function checkNoBrokenEdge() {
   const chromeVersion = shaka.util.Platform.chromeVersion();
   if (shaka.util.Platform.isWindows() && shaka.util.Platform.isEdge() &&
-      chromeVersion && chromeVersion <= 118) {
+      chromeVersion && chromeVersion <= 122) {
     // When the tests fail, it's due to the manifest parser failing to find a
     // factory. Attempt to find a factory first, to avoid filtering the tests
     // when running in a non-broken Edge environment.
@@ -66,7 +66,7 @@ filterDescribe('Transmuxer Player', checkNoBrokenEdge, () => {
     // https://bugs.chromium.org/p/chromium/issues/detail?id=1450313
     const chromeVersion = shaka.util.Platform.chromeVersion();
     if (shaka.util.Platform.isWindows() && shaka.util.Platform.isEdge() &&
-        chromeVersion && chromeVersion <= 118) {
+        chromeVersion && chromeVersion <= 122) {
       return false;
     }
     return true;
@@ -87,7 +87,7 @@ filterDescribe('Transmuxer Player', checkNoBrokenEdge, () => {
     // https://bugs.chromium.org/p/chromium/issues/detail?id=1450313
     const chromeVersion = shaka.util.Platform.chromeVersion();
     if (shaka.util.Platform.isWindows() && shaka.util.Platform.isEdge() &&
-        chromeVersion && chromeVersion <= 118) {
+        chromeVersion && chromeVersion <= 122) {
       return false;
     }
     return true;

package/test/util/mp4_box_parsers_unit.js

@@ -8,18 +8,24 @@ describe('Mp4BoxParsers', () => {
   const videoInitSegmentUri = '/base/test/test/assets/sintel-video-init.mp4';
   const videoSegmentUri = '/base/test/test/assets/sintel-video-segment.mp4';
 
+  const audioInitSegmentXheAacUri = '/base/test/test/assets/audio-xhe-aac.mp4';
+
   /** @type {!ArrayBuffer} */
   let videoInitSegment;
   /** @type {!ArrayBuffer} */
   let videoSegment;
+  /** @type {!ArrayBuffer} */
+  let audioInitSegmentXheAac;
 
   beforeAll(async () => {
     const responses = await Promise.all([
       shaka.test.Util.fetch(videoInitSegmentUri),
       shaka.test.Util.fetch(videoSegmentUri),
+      shaka.test.Util.fetch(audioInitSegmentXheAacUri),
     ]);
     videoInitSegment = responses[0];
     videoSegment = responses[1];
+    audioInitSegmentXheAac = responses[2];
   });
 
   it('parses init segment', () => {
@@ -157,6 +163,36 @@ describe('Mp4BoxParsers', () => {
     expect(baseMediaDecodeTime).toBe(expectedBaseMediaDecodeTime);
   });
 
+  it('parses ESDS box for xHE-AAC segment', () => {
+    let channelCount;
+    let sampleRate;
+    let codec;
+
+    const Mp4Parser = shaka.util.Mp4Parser;
+    new Mp4Parser()
+        .box('moov', Mp4Parser.children)
+        .box('trak', Mp4Parser.children)
+        .box('mdia', Mp4Parser.children)
+        .box('minf', Mp4Parser.children)
+        .box('stbl', Mp4Parser.children)
+        .fullBox('stsd', Mp4Parser.sampleDescription)
+        .box('mp4a', (box) => {
+          const parsedMP4ABox = shaka.util.Mp4BoxParsers.parseMP4A(box.reader);
+          channelCount = parsedMP4ABox.channelCount;
+          sampleRate = parsedMP4ABox.sampleRate;
+          if (box.reader.hasMoreData()) {
+            Mp4Parser.children(box);
+          }
+        })
+        .box('esds', (box) => {
+          const parsedESDSBox = shaka.util.Mp4BoxParsers.parseESDS(box.reader);
+          codec = parsedESDSBox.codec;
+        }).parse(audioInitSegmentXheAac, /* partialOkay= */ false);
+    expect(channelCount).toBe(2);
+    expect(sampleRate).toBe(48000);
+    expect(codec).toBe('mp4a.40.42');
+  });
+
   /**
    *
    * Explanation on the Uint8Array: