shaka-player 4.2.0 → 4.2.1

package/lib/hls/hls_parser.js

@@ -180,10 +180,6 @@ shaka.hls.HlsParser = class {
      */
     this.groupIdToClosedCaptionsMap_ = new Map();
 
-    /** True if some of the variants in  the playlist is encrypted with AES-128.
-     * @private {boolean} */
-    this.aesEncrypted_ = false;
-
     /** @private {Map.<string, string>} */
     this.groupIdToCodecsMap_ = new Map();
 
@@ -576,7 +572,6 @@ shaka.hls.HlsParser = class {
           playlist, uri, uri, codecs, type, language, primary, name,
           channelsCount, closedCaptions, characteristics, forced, spatialAudio,
           mimeType);
-      goog.asserts.assert(streamInfo != null, 'StreamInfo is null!');
       this.uriToStreamInfosMap_.set(uri, streamInfo);
 
       // Wrap the stream from that stream info with a variant.
@@ -654,17 +649,6 @@ shaka.hls.HlsParser = class {
       this.syncStreamsWithProgramDateTime_();
     }
 
-    if (this.aesEncrypted_ && variants.length == 0) {
-      // We do not support AES-128 encryption with HLS yet. Variants is null
-      // when the playlist is encrypted with AES-128.
-      shaka.log.info('No stream is created, because we don\'t support AES-128',
-          'encryption yet');
-      throw new shaka.util.Error(
-          shaka.util.Error.Severity.CRITICAL,
-          shaka.util.Error.Category.MANIFEST,
-          shaka.util.Error.Code.HLS_AES_128_ENCRYPTION_NOT_SUPPORTED);
-    }
-
     // Find the min and max timestamp of the earliest segment in all streams.
     // Find the minimum duration of all streams as well.
     let minDuration = Infinity;
@@ -863,8 +847,6 @@ shaka.hls.HlsParser = class {
       }
       try {
         const streamInfo = await this.createStreamInfoFromMediaTag_(tag);
-        goog.asserts.assert(
-            streamInfo, 'Should always have a streamInfo for text');
         return streamInfo.stream;
       } catch (e) {
         if (this.config_.hls.ignoreTextStreamFailures) {
@@ -907,8 +889,6 @@ shaka.hls.HlsParser = class {
       }
       try {
         const streamInfo = await this.createStreamInfoFromImageTag_(tag);
-        goog.asserts.assert(
-            streamInfo, 'Should always have a streamInfo for image');
         return streamInfo.stream;
       } catch (e) {
         if (this.config_.hls.ignoreImageStreamFailures) {
@@ -960,22 +940,17 @@ shaka.hls.HlsParser = class {
       const streamInfos = await this.createStreamInfosForVariantTag_(tag,
           resolution, frameRate);
 
-      if (streamInfos) {
-        goog.asserts.assert(streamInfos.audio.length ||
-            streamInfos.video.length, 'We should have created a stream!');
-
-        return this.createVariants_(
-            streamInfos.audio,
-            streamInfos.video,
-            bandwidth,
-            width,
-            height,
-            frameRate,
-            videoRange);
-      }
-      // We do not support AES-128 encryption with HLS yet. If the streamInfos
-      // is null because of AES-128 encryption, do not create variants for that.
-      return [];
+      goog.asserts.assert(streamInfos.audio.length ||
+          streamInfos.video.length, 'We should have created a stream!');
+
+      return this.createVariants_(
+          streamInfos.audio,
+          streamInfos.video,
+          bandwidth,
+          width,
+          height,
+          frameRate,
+          videoRange);
     });
 
     const allVariants = await Promise.all(variantsPromises);
@@ -992,7 +967,7 @@ shaka.hls.HlsParser = class {
    * @param {!shaka.hls.Tag} tag
    * @param {?string} resolution
    * @param {?string} frameRate
-   * @return {!Promise.<?shaka.hls.HlsParser.StreamInfos>}
+   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfos>}
    * @private
    */
   async createStreamInfosForVariantTag_(tag, resolution, frameRate) {
@@ -1062,17 +1037,10 @@ shaka.hls.HlsParser = class {
       type = ContentType.VIDEO;
     }
 
-    let streamInfo;
     if (!ignoreStream) {
-      streamInfo =
+      const streamInfo =
           await this.createStreamInfoFromVariantTag_(tag, allCodecs, type);
-    }
-    if (streamInfo) {
       res[streamInfo.stream.type] = [streamInfo];
-    } else if (streamInfo === null) {
-      // Triple-equals for undefined.
-      shaka.log.debug('streamInfo is null');
-      return null;
     }
     this.filterLegacyCodecs_(res);
     return res;
@@ -1364,7 +1332,7 @@ shaka.hls.HlsParser = class {
    * Parse EXT-X-MEDIA media tag into a Stream object.
    *
    * @param {shaka.hls.Tag} tag
-   * @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
+   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
   async createStreamInfoFromMediaTag_(tag) {
@@ -1418,9 +1386,6 @@ shaka.hls.HlsParser = class {
     } else {
       this.groupIdToStreamInfosMap_.set(groupId, [streamInfo]);
     }
-    if (streamInfo == null) {
-      return null;
-    }
 
     // TODO: This check is necessary because of the possibility of multiple
     // calls to createStreamInfoFromMediaTag_ before either has resolved.
@@ -1435,7 +1400,7 @@ shaka.hls.HlsParser = class {
    * Parse EXT-X-MEDIA media tag into a Stream object.
    *
    * @param {shaka.hls.Tag} tag
-   * @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
+   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
   async createStreamInfoFromImageTag_(tag) {
@@ -1463,9 +1428,6 @@ shaka.hls.HlsParser = class {
         verbatimImagePlaylistUri, codecs, type, language, /* primary= */ false,
         name, /* channelsCount= */ null, /* closedCaptions= */ null,
         characteristics, /* forced= */ false, /* spatialAudio= */ false);
-    if (streamInfo == null) {
-      return null;
-    }
 
     // TODO: This check is necessary because of the possibility of multiple
     // calls to createStreamInfoFromImageTag_ before either has resolved.
@@ -1506,7 +1468,7 @@ shaka.hls.HlsParser = class {
    * @param {!shaka.hls.Tag} tag
    * @param {!Array.<string>} allCodecs
    * @param {string} type
-   * @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
+   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
   async createStreamInfoFromVariantTag_(tag, allCodecs, type) {
@@ -1526,9 +1488,6 @@ shaka.hls.HlsParser = class {
         /* name= */ null, /* channelcount= */ null, closedCaptions,
         /* characteristics= */ null, /* forced= */ false,
         /* spatialAudio= */ false);
-    if (streamInfo == null) {
-      return null;
-    }
     // TODO: This check is necessary because of the possibility of multiple
     // calls to createStreamInfoFromVariantTag_ before either has resolved.
     if (this.uriToStreamInfosMap_.has(verbatimMediaPlaylistUri)) {
@@ -1552,7 +1511,7 @@ shaka.hls.HlsParser = class {
    * @param {?string} characteristics
    * @param {boolean} forced
    * @param {boolean} spatialAudio
-   * @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
+   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
   async createStreamInfo_(verbatimMediaPlaylistUri, codecs, type, language,
@@ -1592,7 +1551,7 @@ shaka.hls.HlsParser = class {
    * @param {boolean} forced
    * @param {boolean} spatialAudio
    * @param {(string|undefined)} mimeType
-   * @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
+   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
   async convertParsedPlaylistIntoStreamInfo_(playlist, verbatimMediaPlaylistUri,
@@ -1635,6 +1594,8 @@ shaka.hls.HlsParser = class {
     }
 
     let encrypted = false;
+    let aesEncrypted = false;
+
     /** @type {!Array.<shaka.extern.DrmInfo>}*/
     const drmInfos = [];
     const keyIds = new Set();
@@ -1647,7 +1608,7 @@ shaka.hls.HlsParser = class {
 
         if (method == 'AES-128') {
           // These keys are handled separately.
-          this.aesEncrypted_ = true;
+          aesEncrypted = true;
         } else {
           const keyFormat = drmTag.getRequiredAttrValue('KEYFORMAT');
           const drmParser =
@@ -1668,7 +1629,7 @@ shaka.hls.HlsParser = class {
       }
     }
 
-    if (encrypted && !drmInfos.length && !this.aesEncrypted_) {
+    if (encrypted && !drmInfos.length && !aesEncrypted) {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MANIFEST,
@@ -1683,19 +1644,8 @@ shaka.hls.HlsParser = class {
     /** @type {!Map.<number, number>} */
     const mediaSequenceToStartTime = new Map();
 
-    let segments;
-    try {
-      segments = this.createSegments_(verbatimMediaPlaylistUri, playlist, type,
-          mimeType, mediaSequenceToStartTime, mediaVariables, codecs);
-    } catch (error) {
-      if (error.code == shaka.util.Error.Code.HLS_INTERNAL_SKIP_STREAM) {
-        shaka.log.alwaysWarn('Skipping unsupported HLS stream',
-            mimeType, verbatimMediaPlaylistUri);
-        return null;
-      }
-
-      throw error;
-    }
+    const segments = this.createSegments_(verbatimMediaPlaylistUri, playlist,
+        type, mimeType, mediaSequenceToStartTime, mediaVariables, codecs);
 
     const lastEndTime = segments[segments.length - 1].endTime;
     /** @type {!shaka.media.SegmentIndex} */

package/lib/player.js

@@ -4459,6 +4459,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.stats_.setBandwidthEstimate(estimate);
     }
 
+    if (this.loadMode_ == shaka.Player.LoadMode.SRC_EQUALS) {
+      this.stats_.setResolution(
+          /* width= */ element.videoWidth || NaN,
+          /* height= */ element.videoHeight || NaN);
+    }
+
     return this.stats_.getBlob();
   }
 
@@ -5625,6 +5631,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return false;
     }
 
+    if (!navigator.onLine) {
+      // Don't restrict variants if we're completely offline, or else we end up
+      // rapidly restricting all of them.
+      return false;
+    }
+
     let maxDisabledTime = this.config_.streaming.maxDisabledTime;
     if (maxDisabledTime == 0) {
       if (error.code == shaka.util.Error.Code.SEGMENT_MISSING) {
@@ -6558,7 +6570,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v4.2.0-uncompiled';
+shaka.Player.version = 'v4.2.1-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/ui_text_displayer.js

@@ -493,6 +493,14 @@ shaka.text.UITextDisplayer = class {
       style.backgroundRepeat = 'no-repeat';
       style.backgroundSize = 'contain';
       style.backgroundPosition = 'center';
+
+      // Quoting https://www.w3.org/TR/ttml-imsc1.2/:
+      // "The width and height (in pixels) of the image resource referenced by
+      // smpte:backgroundImage SHALL be equal to the width and height expressed
+      // by the tts:extent attribute of the region in which the div element is
+      // presented".
+      style.width = '100%';
+      style.height = '100%';
     } else {
       // If we have both text and nested cues, then style everything; otherwise
       // place the text in its own <span> so the background doesn't fill the

package/lib/util/error.js

@@ -656,16 +656,8 @@ shaka.util.Error.Code = {
    */
   'CANNOT_ADD_EXTERNAL_TEXT_TO_LIVE_STREAM': 4033,
 
-  /**
-   * We do not support AES-128 encryption with HLS yet.
-   */
-  'HLS_AES_128_ENCRYPTION_NOT_SUPPORTED': 4034,
-
-  /**
-   * An internal error code that should never be seen by applications, thrown
-   * to force the HLS parser to skip an unsupported stream.
-   */
-  'HLS_INTERNAL_SKIP_STREAM': 4035,
+  // RETIRED: 'HLS_AES_128_ENCRYPTION_NOT_SUPPORTED': 4034,
+  // RETIRED: 'HLS_INTERNAL_SKIP_STREAM': 4035,
 
   /** The Manifest contained no Variants. */
   'NO_VARIANTS': 4036,

package/lib/util/player_configuration.js

@@ -314,6 +314,7 @@ shaka.util.PlayerConfiguration = class {
    */
   static mergeConfigObjects(destination, updates, template) {
     const overrides = {
+      '.drm.keySystemsMapping': '',
       '.drm.servers': '',
       '.drm.clearKeys': '',
       '.drm.advanced': {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

package/test/hls/hls_parser_unit.js

@@ -2537,9 +2537,60 @@ describe('HlsParser', () => {
 
     const actual = await parser.start('test:/master', playerInterface);
     expect(actual).toEqual(manifest);
-    return actual;
   });
 
+  it('fails on AES-128 if WebCrypto APIs are not available', async () => {
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1,mp4a",',
+      'RESOLUTION=960x540,FRAME-RATE=60,AUDIO="aud1"\n',
+      'video\n',
+      '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="eng",',
+      'URI="audio"\n',
+    ].join('');
+
+    const mediaWithMp4AesEncryption = [
+      '#EXTM3U\n',
+      '#EXT-X-PLAYLIST-TYPE:VOD\n',
+      '#EXT-X-KEY:METHOD=AES-128,',
+      'URI="800k.key"\n',
+      '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+      '#EXTINF:5,\n',
+      '#EXT-X-BYTERANGE:121090@616\n',
+      'main.mp4',
+    ].join('');
+
+    fakeNetEngine
+        .setResponseText('test:/master', master)
+        .setResponseText('test:/audio', mediaWithMp4AesEncryption)
+        .setResponseText('test:/video', mediaWithMp4AesEncryption)
+        .setResponseValue('test:/init.mp4', initSegmentData)
+        .setResponseValue('test:/main.mp4', segmentData)
+        .setResponseValue('test:/800k.key', aes128Key);
+
+    let originalWebCrypto = null;
+    try {
+      originalWebCrypto = window.crypto;
+      Object.defineProperty(window, 'crypto', {
+        configurable: true,
+        value: null,
+      });
+
+      const expectedError = shaka.test.Util.jasmineError(new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MANIFEST,
+          shaka.util.Error.Code.NO_WEB_CRYPTO_API));
+      await expectAsync(parser.start('test:/master', playerInterface))
+          .toBeRejectedWith(expectedError);
+    } finally {
+      Object.defineProperty(window, 'crypto', {
+        configurable: true,
+        value: originalWebCrypto,
+      });
+    }
+  });
+
+
   it('constructs DrmInfo for Widevine', async () => {
     const master = [
       '#EXTM3U\n',

package/test/media/drm_engine_unit.js

@@ -677,6 +677,35 @@ describe('DrmEngine', () => {
           .toBeRejectedWith(expected);
     });
 
+    it('uses key system IDs from keySystemsMapping config', async () => {
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        manifest.addVariant(0, (variant) => {
+          variant.addVideo(1, (stream) => {
+            stream.encrypted = true;
+            stream.addDrmInfo('drm.abc');
+          });
+        });
+      });
+
+      setDecodingInfoSpy([]);
+
+      config.keySystemsMapping['drm.abc'] = 'drm.def';
+      drmEngine.configure(config);
+
+      const variants = manifest.variants;
+      await expectAsync(
+          drmEngine.initForPlayback(variants, manifest.offlineSessionIds))
+          .toBeRejected();
+
+      expect(drmEngine.initialized()).toBe(false);
+      expect(decodingInfoSpy).toHaveBeenCalledTimes(1);
+      expect(decodingInfoSpy).toHaveBeenCalledWith(containing({
+        keySystemConfiguration: containing({
+          keySystem: 'drm.def',
+        }),
+      }));
+    });
+
     it('maps TS MIME types through the transmuxer', async () => {
       const originalIsSupported = shaka.media.Transmuxer.isSupported;
 

package/test/player_src_equals_integration.js

@@ -305,6 +305,8 @@ describe('Player Src Equals', () => {
     expect(stats.loadLatency).toBeGreaterThan(0);
     expect(stats.manifestTimeSeconds).toBeNaN(); // There's no manifest.
     expect(stats.drmTimeSeconds).toBeNaN(); // There's no DRM.
+    expect(stats.height).toBe(110);
+    expect(stats.width).toBe(256);
   });
 
   it('plays with external text tracks', async () => {

package/test/player_unit.js

@@ -422,7 +422,6 @@ describe('Player', () => {
             dispatchEventSpy.calls.reset();
             player.configure({streaming: {maxDisabledTime}});
             player.setMaxHardwareResolution(123, 456);
-            onErrorCallback(httpError);
           });
 
           afterEach(() => {
@@ -434,14 +433,18 @@ describe('Player', () => {
           });
 
           it('handles HTTP_ERROR', () => {
+            onErrorCallback(httpError);
             expect(httpError.handled).toBeTruthy();
           });
 
           it('does not dispatch any error', () => {
+            onErrorCallback(httpError);
             expect(dispatchEventSpy).not.toHaveBeenCalled();
           });
 
           it('disables the current variant and applies restrictions', () => {
+            onErrorCallback(httpError);
+
             const foundDisabledVariant =
                 manifest.variants.some(({disabledUntilTime}) =>
                   disabledUntilTime == currentTime + maxDisabledTime);
@@ -453,11 +456,46 @@ describe('Player', () => {
           });
 
           it('switches the variant', () => {
+            onErrorCallback(httpError);
+
             expect(chooseVariantSpy).toHaveBeenCalled();
             expect(getBufferedInfoSpy).toHaveBeenCalled();
             expect(switchVariantSpy)
                 .toHaveBeenCalledWith(chosenVariant, false, true, 14);
           });
+
+          describe('but browser is truly offline', () => {
+            /** @type {!Object} */
+            let navigatorOnLineDescriptor;
+
+            // eslint-disable-next-line no-restricted-syntax
+            const navigatorPrototype = Navigator.prototype;
+
+            beforeAll(() => {
+              navigatorOnLineDescriptor =
+                /** @type {!Object} */(Object.getOwnPropertyDescriptor(
+                    navigatorPrototype, 'onLine'));
+            });
+
+            beforeEach(() => {
+              // Redefine the property, replacing only the getter.
+              Object.defineProperty(navigatorPrototype, 'onLine',
+                  Object.assign(navigatorOnLineDescriptor, {
+                    get: () => false,
+                  }));
+            });
+
+            afterEach(() => {
+              // Restore the original property definition.
+              Object.defineProperty(
+                  navigatorPrototype, 'onLine', navigatorOnLineDescriptor);
+            });
+
+            it('does not handle HTTP_ERROR', () => {
+              onErrorCallback(httpError);
+              expect(httpError.handled).toBe(false);
+            });
+          });
         });
       });
     });

package/ui/less/ad_controls.less

@@ -71,6 +71,10 @@
   .ad-text-shadow();
 }
 
+.shaka-ad-controls .shaka-ad-position:not(.shaka-hidden) + .shaka-ad-counter {
+  margin-left: 0.75em;
+}
+
 .shaka-skip-ad-container {
   /* Skip button is positioned at the very right edge of the
    * video container unlike the rest of the bottom controls. */