shaka-player 4.9.0 → 4.9.2

package/lib/transmuxer/mp3_transmuxer.js

@@ -128,7 +128,8 @@ shaka.transmuxer.Mp3Transmuxer = class {
         return Promise.reject(new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED));
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null));
       }
       if (!firstHeader) {
         firstHeader = header;
@@ -155,7 +156,8 @@ shaka.transmuxer.Mp3Transmuxer = class {
       return Promise.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED));
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null));
     }
     /** @type {number} */
     const sampleRate = firstHeader.sampleRate;

package/lib/transmuxer/mpeg_ts_transmuxer.js

@@ -147,7 +147,8 @@ shaka.transmuxer.MpegTsTransmuxer = class {
       return Promise.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED));
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null));
     }
 
     let transmuxData = new Uint8Array([]);

package/lib/transmuxer/mss_transmuxer.js

@@ -226,7 +226,8 @@ shaka.transmuxer.MssTransmuxer = class {
       return Promise.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.MSS_MISSING_DATA_FOR_TRANSMUXING));
+          shaka.util.Error.Code.MSS_MISSING_DATA_FOR_TRANSMUXING,
+          reference ? reference.getUris()[0] : null));
     }
     try {
       const transmuxedData = this.processMediaSegment_(
@@ -239,7 +240,8 @@ shaka.transmuxer.MssTransmuxer = class {
       return Promise.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.MSS_TRANSMUXING_FAILED));
+          shaka.util.Error.Code.MSS_TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null));
     }
   }
 

package/lib/transmuxer/ts_transmuxer.js

@@ -192,7 +192,8 @@ shaka.transmuxer.TsTransmuxer = class {
           return Promise.reject(new shaka.util.Error(
               shaka.util.Error.Severity.CRITICAL,
               shaka.util.Error.Category.MEDIA,
-              shaka.util.Error.Code.TRANSMUXING_FAILED));
+              shaka.util.Error.Code.TRANSMUXING_FAILED,
+              reference ? reference.getUris()[0] : null));
         }
       }
       offset = id3Data.length;
@@ -209,7 +210,8 @@ shaka.transmuxer.TsTransmuxer = class {
       return Promise.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED));
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null));
     }
 
     if (!this.tsParser_) {
@@ -247,19 +249,19 @@ shaka.transmuxer.TsTransmuxer = class {
             break;
           case 'ac3':
             streamInfo =
-              this.getAc3StreamInfo_(tsParser, stream, duration);
+              this.getAc3StreamInfo_(tsParser, stream, duration, reference);
             break;
           case 'ec3':
             streamInfo =
-              this.getEc3StreamInfo_(tsParser, stream, duration);
+              this.getEc3StreamInfo_(tsParser, stream, duration, reference);
             break;
           case 'mp3':
             streamInfo =
-              this.getMp3StreamInfo_(tsParser, stream, duration);
+              this.getMp3StreamInfo_(tsParser, stream, duration, reference);
             break;
           case 'opus':
             streamInfo =
-              this.getOpusStreamInfo_(tsParser, stream, duration);
+              this.getOpusStreamInfo_(tsParser, stream, duration, reference);
             break;
         }
         if (streamInfo) {
@@ -278,7 +280,8 @@ shaka.transmuxer.TsTransmuxer = class {
       return Promise.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED));
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null));
     }
 
     const mp4Generator = new shaka.util.Mp4Generator(streamInfos);
@@ -327,7 +330,8 @@ shaka.transmuxer.TsTransmuxer = class {
         throw new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED);
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null);
       }
       stream.audioSamplingRate = info.sampleRate;
       stream.channelsCount = info.channelCount;
@@ -370,7 +374,8 @@ shaka.transmuxer.TsTransmuxer = class {
         throw new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED);
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null);
       }
 
       firstPts = reference.startTime * timescale;
@@ -382,7 +387,8 @@ shaka.transmuxer.TsTransmuxer = class {
         throw new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED);
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null);
       }
       info = {
         sampleRate: stream.audioSamplingRate,
@@ -395,7 +401,8 @@ shaka.transmuxer.TsTransmuxer = class {
         throw new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED);
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null);
       }
       const segmentDuration =
           (reference.endTime - reference.startTime) * timescale;
@@ -451,10 +458,11 @@ shaka.transmuxer.TsTransmuxer = class {
    * @param {shaka.util.TsParser} tsParser
    * @param {shaka.extern.Stream} stream
    * @param {number} duration
+   * @param {?shaka.media.SegmentReference} reference
    * @return {shaka.util.Mp4Generator.StreamInfo}
    * @private
    */
-  getAc3StreamInfo_(tsParser, stream, duration) {
+  getAc3StreamInfo_(tsParser, stream, duration, reference) {
     const Ac3 = shaka.transmuxer.Ac3;
     const timescale = shaka.util.TsParser.Timescale;
 
@@ -511,7 +519,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
 
 
@@ -544,10 +553,11 @@ shaka.transmuxer.TsTransmuxer = class {
    * @param {shaka.util.TsParser} tsParser
    * @param {shaka.extern.Stream} stream
    * @param {number} duration
+   * @param {?shaka.media.SegmentReference} reference
    * @return {shaka.util.Mp4Generator.StreamInfo}
    * @private
    */
-  getEc3StreamInfo_(tsParser, stream, duration) {
+  getEc3StreamInfo_(tsParser, stream, duration, reference) {
     const Ec3 = shaka.transmuxer.Ec3;
     const timescale = shaka.util.TsParser.Timescale;
 
@@ -604,7 +614,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
 
 
@@ -637,10 +648,11 @@ shaka.transmuxer.TsTransmuxer = class {
    * @param {shaka.util.TsParser} tsParser
    * @param {shaka.extern.Stream} stream
    * @param {number} duration
+   * @param {?shaka.media.SegmentReference} reference
    * @return {shaka.util.Mp4Generator.StreamInfo}
    * @private
    */
-  getMp3StreamInfo_(tsParser, stream, duration) {
+  getMp3StreamInfo_(tsParser, stream, duration, reference) {
     const MpegAudio = shaka.transmuxer.MpegAudio;
     const timescale = shaka.util.TsParser.Timescale;
 
@@ -692,7 +704,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
     /** @type {number} */
     const sampleRate = firstHeader.sampleRate;
@@ -725,10 +738,11 @@ shaka.transmuxer.TsTransmuxer = class {
    * @param {shaka.util.TsParser} tsParser
    * @param {shaka.extern.Stream} stream
    * @param {number} duration
+   * @param {?shaka.media.SegmentReference} reference
    * @return {shaka.util.Mp4Generator.StreamInfo}
    * @private
    */
-  getOpusStreamInfo_(tsParser, stream, duration) {
+  getOpusStreamInfo_(tsParser, stream, duration, reference) {
     const Opus = shaka.transmuxer.Opus;
     const timescale = shaka.util.TsParser.Timescale;
 
@@ -744,7 +758,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
 
     /** @type {!Uint8Array} */
@@ -798,7 +813,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
 
     stream.audioSamplingRate = opusMetadata.sampleRate;
@@ -854,7 +870,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA);
+          shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA,
+          reference ? reference.getUris()[0] : null);
     }
     for (let i = 0; i < videoData.length; i++) {
       const pes = videoData[i];
@@ -897,7 +914,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
     stream.height = info.height;
     stream.width = info.width;
@@ -948,7 +966,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA);
+          shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA,
+          reference ? reference.getUris()[0] : null);
     }
     for (let i = 0; i < videoData.length; i++) {
       const pes = videoData[i];
@@ -991,7 +1010,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
     stream.height = info.height;
     stream.width = info.width;

package/lib/util/config_utils.js

@@ -211,6 +211,8 @@ shaka.util.ConfigUtils = class {
           delete obj[key];
         } else if (isArrayEmpty(obj[key])) {
           delete obj[key];
+        } else if (typeof obj[key] == 'function') {
+          delete obj[key];
         } else if (isObject(obj[key])) {
           removeEmpty(obj[key]);
         }

package/lib/util/error.js

@@ -456,6 +456,7 @@ shaka.util.Error.Code = {
   /**
    * A MediaSource operation failed.
    * <br> error.data[0] is a MediaError code from the video element.
+   * <br> error.data[1] is the segment URI that triggered the error, if any.
    */
   'MEDIA_SOURCE_OPERATION_FAILED': 3014,
 
@@ -463,6 +464,7 @@ shaka.util.Error.Code = {
    * A MediaSource operation threw an exception.
    * <br> error.data[0] is the exception that was thrown.
    * <br> error.data[1] is the error object from the video element.
+   * <br> error.data[2] is the segment URI that triggered the error, if any.
    */
   'MEDIA_SOURCE_OPERATION_THREW': 3015,
 
@@ -485,37 +487,37 @@ shaka.util.Error.Code = {
   'QUOTA_EXCEEDED_ERROR': 3017,
 
   /**
-   * Mux.js did not invoke the callback signifying successful transmuxing.
+   * Transmuxing with our internal transmuxer failed.
+   * <br> error.data[0] is the segment URI that triggered the error, if any.
    */
   'TRANSMUXING_FAILED': 3018,
 
   /**
    * Content transformations required by the platform could not be performed for
    * some reason (unsupported container, etc.)
-   *
-   * @see https://github.com/shaka-project/shaka-player/issues/2759
+   * <br> @see https://github.com/shaka-project/shaka-player/issues/2759
+   * <br> error.data[0] is the segment URI that triggered the error, if any.
    */
   'CONTENT_TRANSFORMATION_FAILED': 3019,
 
   /**
    * Important data is missing to be able to do the transmuxing of MSS.
+   * <br> error.data[0] is the segment URI that triggered the error, if any.
    */
   'MSS_MISSING_DATA_FOR_TRANSMUXING': 3020,
 
-  /**
-   * MSS transmuing failed for unknown codec.
-   * <br> error.data[0] is a unknown codec.
-   */
-  'MSS_TRANSMUXING_CODEC_UNKNOWN': 3021,
+  // RETIRED: 'MSS_TRANSMUXING_CODEC_UNKNOWN': 3021,
 
   /**
    * MSS transmuing failed for unknown reason.
+   * <br> error.data[0] is the segment URI that triggered the error, if any.
    */
   'MSS_TRANSMUXING_FAILED': 3022,
 
   /**
    * An internal error which indicates that transmuxing operation has no video
    * data. This should not be seen by applications.
+   * <br> error.data[0] is the segment URI that triggered the error, if any.
    */
   'TRANSMUXING_NO_VIDEO_DATA': 3023,
 

package/lib/util/object_utils.js

@@ -41,8 +41,7 @@ shaka.util.ObjectUtils = class {
 
           // This covers Uint8Array and friends, even without a TypedArray
           // base-class constructor.
-          const isTypedArray =
-              val.buffer && val.buffer.constructor == ArrayBuffer;
+          const isTypedArray = val.buffer instanceof ArrayBuffer;
           if (isTypedArray) {
             return val;
           }

package/lib/util/platform.js

@@ -299,7 +299,8 @@ shaka.util.Platform = class {
         !shaka.util.Platform.isOrange() &&
         !shaka.util.Platform.isPS4() &&
         !shaka.util.Platform.isAmazonFireTV() &&
-        !shaka.util.Platform.isWPE();
+        !shaka.util.Platform.isWPE() &&
+        !shaka.util.Platform.isZenterio();
   }
 
   /**
@@ -362,6 +363,14 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('WPE');
   }
 
+  /**
+   * Check if the current platform is Deutsche Telecom Zenterio STB.
+   * @return {boolean}
+   */
+  static isZenterio() {
+    return shaka.util.Platform.userAgentContains_('DT_STB_BCM');
+  }
+
   /**
    * Returns a major version number for Safari, or Safari-based iOS browsers.
    *
@@ -519,7 +528,7 @@ shaka.util.Platform = class {
         Platform.isEOS() || Platform.isAPL() ||
         Platform.isVirginMedia() || Platform.isOrange() ||
         Platform.isWPE() || Platform.isChromecast() ||
-        Platform.isHisense()) {
+        Platform.isHisense() || Platform.isZenterio()) {
       return true;
     }
     return false;

package/package.json

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

package/ui/audio_language_selection.js

@@ -46,6 +46,10 @@ shaka.ui.AudioLanguageSelection = class extends shaka.ui.SettingsMenu {
         });
 
 
+    this.eventManager.listen(this.player, 'loading', () => {
+      this.onTracksChanged_();
+    });
+
     this.eventManager.listen(this.player, 'trackschanged', () => {
       this.onTracksChanged_();
     });

package/ui/presentation_time.js

@@ -7,6 +7,7 @@
 
 goog.provide('shaka.ui.PresentationTimeTracker');
 
+goog.require('shaka.ads.AdManager');
 goog.require('shaka.ui.Controls');
 goog.require('shaka.ui.Element');
 goog.require('shaka.ui.Locales');
@@ -40,6 +41,10 @@ shaka.ui.PresentationTimeTracker = class extends shaka.ui.Element {
       }
     });
 
+    this.eventManager.listen(this.player, 'loading', () => {
+      shaka.ui.Utils.setDisplay(this.currentTime_, true);
+    });
+
     this.eventManager.listen(this.controls, 'timeandseekrangeupdated', () => {
       this.updateTime_();
     });
@@ -47,6 +52,16 @@ shaka.ui.PresentationTimeTracker = class extends shaka.ui.Element {
     this.eventManager.listen(this.player, 'trackschanged', () => {
       this.onTracksChanged_();
     });
+
+    this.eventManager.listen(
+        this.adManager, shaka.ads.AdManager.AD_STARTED, () => {
+          shaka.ui.Utils.setDisplay(this.currentTime_, false);
+        });
+
+    this.eventManager.listen(
+        this.adManager, shaka.ads.AdManager.AD_STOPPED, () => {
+          shaka.ui.Utils.setDisplay(this.currentTime_, true);
+        });
   }
 
   /** @private */

package/ui/resolution_selection.js

@@ -50,6 +50,10 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
         });
 
 
+    this.eventManager.listen(this.player, 'loading', () => {
+      this.updateResolutionSelection_();
+    });
+
     this.eventManager.listen(this.player, 'variantchanged', () => {
       this.updateResolutionSelection_();
     });
@@ -136,6 +140,9 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
       tracks.sort((t1, t2) => {
         goog.asserts.assert(t1.height != null, 'Null height');
         goog.asserts.assert(t2.height != null, 'Null height');
+        if (t2.height == t1.height) {
+          return t2.bandwidth - t1.bandwidth;
+        }
         return t2.height - t1.height;
       });
     }

package/ui/text_selection.js

@@ -64,6 +64,10 @@ shaka.ui.TextSelection = class extends shaka.ui.SettingsMenu {
           this.updateTextLanguages_();
         });
 
+    this.eventManager.listen(this.player, 'loading', () => {
+      this.onTracksChanged_();
+    });
+
     this.eventManager.listen(this.player, 'texttrackvisibility', () => {
       this.onCaptionStateChange_();
       this.updateTextLanguages_();