shaka-player 4.5.0 → 4.6.1

package/lib/abr/simple_abr_manager.js

@@ -63,7 +63,7 @@ shaka.abr.SimpleAbrManager = class {
             this.bandwidthEstimator_.configure(this.config_.advanced);
           }
           const chosenVariant = this.chooseVariant();
-          if (chosenVariant) {
+          if (chosenVariant && navigator.onLine) {
             this.switch_(chosenVariant, this.config_.clearBufferSwitch,
                 this.config_.safeMarginSwitch);
           }
@@ -165,10 +165,12 @@ shaka.abr.SimpleAbrManager = class {
 
 
   /**
+   * @param {boolean=} preferFastSwitching
+   * @return {shaka.extern.Variant}
    * @override
    * @export
    */
-  chooseVariant() {
+  chooseVariant(preferFastSwitching = false) {
     const SimpleAbrManager = shaka.abr.SimpleAbrManager;
 
     let maxHeight = Infinity;
@@ -190,9 +192,24 @@ shaka.abr.SimpleAbrManager = class {
           maxWidth, this.mediaElement_.clientWidth * devicePixelRatio);
     }
 
+    let normalVariants = this.variants_.filter((variant) => {
+      return !shaka.util.StreamUtils.isFastSwitching(variant);
+    });
+    if (!normalVariants.length) {
+      normalVariants = this.variants_;
+    }
+
+    let variants = normalVariants;
+    if (preferFastSwitching &&
+        normalVariants.length != this.variants_.length) {
+      variants = this.variants_.filter((variant) => {
+        return shaka.util.StreamUtils.isFastSwitching(variant);
+      });
+    }
+
     // Get sorted Variants.
     let sortedVariants = SimpleAbrManager.filterAndSortVariants_(
-        this.config_.restrictions, this.variants_,
+        this.config_.restrictions, variants,
         /* maxHeight= */ Infinity, /* maxWidth= */ Infinity);
 
     if (maxHeight != Infinity || maxWidth != Infinity) {
@@ -206,14 +223,14 @@ shaka.abr.SimpleAbrManager = class {
       }
 
       sortedVariants = SimpleAbrManager.filterAndSortVariants_(
-          this.config_.restrictions, this.variants_, maxHeight, maxWidth);
+          this.config_.restrictions, variants, maxHeight, maxWidth);
     }
 
     const defaultBandwidthEstimate = this.getDefaultBandwidth_();
     const currentBandwidth = this.bandwidthEstimator_.getBandwidthEstimate(
         defaultBandwidthEstimate);
 
-    if (this.variants_.length && !sortedVariants.length) {
+    if (variants.length && !sortedVariants.length) {
       // If we couldn't meet the ABR restrictions, we should still play
       // something.
       // These restrictions are not "hard" restrictions in the way that
@@ -222,7 +239,7 @@ shaka.abr.SimpleAbrManager = class {
       shaka.log.warning('No variants met the ABR restrictions. ' +
                         'Choosing a variant by lowest bandwidth.');
       sortedVariants = SimpleAbrManager.filterAndSortVariants_(
-          /* restrictions= */ null, this.variants_,
+          /* restrictions= */ null, variants,
           /* maxHeight= */ Infinity, /* maxWidth= */ Infinity);
       sortedVariants = [sortedVariants[0]];
     }
@@ -285,7 +302,7 @@ shaka.abr.SimpleAbrManager = class {
    * @override
    * @export
    */
-  segmentDownloaded(deltaTimeMs, numBytes) {
+  segmentDownloaded(deltaTimeMs, numBytes, allowSwitch) {
     shaka.log.v2('Segment downloaded:',
         'deltaTimeMs=' + deltaTimeMs,
         'numBytes=' + numBytes,
@@ -294,7 +311,7 @@ shaka.abr.SimpleAbrManager = class {
     goog.asserts.assert(deltaTimeMs >= 0, 'expected a non-negative duration');
     this.bandwidthEstimator_.sample(deltaTimeMs, numBytes);
 
-    if ((this.lastTimeChosenMs_ != null) && this.enabled_) {
+    if (allowSwitch && (this.lastTimeChosenMs_ != null) && this.enabled_) {
       this.suggestStreams_();
     }
   }

package/lib/ads/media_tailor_ad_manager.js

@@ -612,8 +612,13 @@ shaka.ads.MediaTailorAdManager = class {
    */
   setupCurrentAdListeners_() {
     const MediaTailorAdManager = shaka.ads.MediaTailorAdManager;
-    this.sendTrackingEvent_(MediaTailorAdManager.IMPRESSION_);
-    this.sendTrackingEvent_(MediaTailorAdManager.START_);
+    let needFirstEvents = false;
+    if (!this.video_.paused) {
+      this.sendTrackingEvent_(MediaTailorAdManager.IMPRESSION_);
+      this.sendTrackingEvent_(MediaTailorAdManager.START_);
+    } else {
+      needFirstEvents = true;
+    }
     this.adListeners_.push({
       target: this.video_,
       type: 'volumechange',
@@ -636,7 +641,13 @@ shaka.ads.MediaTailorAdManager = class {
       target: this.video_,
       type: 'play',
       listener: () => {
-        this.sendTrackingEvent_(MediaTailorAdManager.RESUME_);
+        if (needFirstEvents) {
+          this.sendTrackingEvent_(MediaTailorAdManager.IMPRESSION_);
+          this.sendTrackingEvent_(MediaTailorAdManager.START_);
+          needFirstEvents = false;
+        } else {
+          this.sendTrackingEvent_(MediaTailorAdManager.RESUME_);
+        }
       },
     });
     this.adListeners_.push({

package/lib/cast/cast_receiver.js

@@ -408,7 +408,7 @@ shaka.cast.CastReceiver = class extends shaka.util.FakeEventTarget {
       } catch (error) {
         // Pass any errors through to the app.
         goog.asserts.assert(error instanceof shaka.util.Error,
-            'Wrong error type!');
+            'Wrong error type! Error: ' + error);
         const eventType = shaka.util.FakeEvent.EventName.Error;
         const data = (new Map()).set('detail', error);
         const event = new shaka.util.FakeEvent(eventType, data);

package/lib/cea/cea_decoder.js

@@ -83,6 +83,12 @@ shaka.cea.CeaDecoder = class {
      */
     this.waitingForFirstPacket_ = true;
 
+    /**
+     * Set used to track available streams.
+     * @private {!Set.<string>}
+     */
+    this.streams_ = new Set();
+
     this.reset();
   }
 
@@ -131,6 +137,9 @@ shaka.cea.CeaDecoder = class {
     const reader = new shaka.util.DataViewReader(
         userDataSeiMessage, shaka.util.DataViewReader.Endianness.BIG_ENDIAN);
 
+    if (reader.getLength() < shaka.cea.CeaDecoder.MIN_LENGTH) {
+      return;
+    }
     if (reader.readUint8() !== shaka.cea.CeaDecoder.USA_COUNTRY_CODE) {
       return;
     }
@@ -300,6 +309,8 @@ shaka.cea.CeaDecoder = class {
       return null;
     }
 
+    this.streams_.add(selectedMode);
+
     // Process the clean CC data pair.
     let parsedClosedCaption = null;
     if (shaka.cea.Cea608DataChannel.isControlCode(ccPacket.ccData1)) {
@@ -340,6 +351,7 @@ shaka.cea.CeaDecoder = class {
 
         // As per CEA-708-E, service number 0 is invalid, and should be ignored.
         if (serviceNumber != 0) {
+          this.streams_.add('svc'+ serviceNumber);
           // If the service doesn't already exist, create it.
           if (!this.serviceNumberToService_.has(serviceNumber)) {
             const service = new shaka.cea.Cea708Service(serviceNumber);
@@ -386,6 +398,15 @@ shaka.cea.CeaDecoder = class {
     }
     return parity === 1;
   }
+
+  /**
+   * Returns the streams that the CEA decoder found.
+   *
+   * @override
+   */
+  getStreams() {
+    return Array.from(this.streams_);
+  }
 };
 
 /**
@@ -417,5 +438,12 @@ shaka.cea.CeaDecoder.NTSC_CC_FIELD_2 = 1;
  */
 shaka.cea.CeaDecoder.USA_COUNTRY_CODE = 0xb5;
 
+/**
+ * Caption packet min length
+ * Country Code + ATSC_PROVIDER_CODE + ATSC_1_USER_IDENTIFIER + USER_DATA_TYPE
+ * @private @const {number}
+ */
+shaka.cea.CeaDecoder.MIN_LENGTH = 8;
+
 shaka.media.ClosedCaptionParser.registerDecoder(
     () => new shaka.cea.CeaDecoder());

package/lib/cea/dummy_caption_decoder.js

@@ -18,4 +18,9 @@ shaka.cea.DummyCaptionDecoder = class {
 
   /** @override */
   clear() {}
+
+  /** @override */
+  getStreams() {
+    return [];
+  }
 };