shaka-player 4.10.13 → 4.11.0

package/lib/cea/cea608_data_channel.js

@@ -123,19 +123,26 @@ shaka.cea.Cea608DataChannel = class {
   controlPac_(b1, b2) {
     const row = this.pacToRow_(b1, b2);
 
-    // Get attribute bits (4 bits)
-    const attr = (b2 & 0x1E) >> 1;
-
     // Set up the defaults.
     let textColor = shaka.cea.CeaUtils.DEFAULT_TXT_COLOR;
     let italics = false;
+    let indent = null;
+
+    // Get PAC index;
+    let pacIndex;
+    if (b2 > 0x5f) {
+      pacIndex = b2 - 0x60;
+    } else {
+      pacIndex = b2 - 0x40;
+    }
 
-
-    // Attributes < 7 are colors, = 7 is white w/ italics, and >7 are indents
-    if (attr < 7) {
-      textColor = shaka.cea.Cea608DataChannel.TEXT_COLORS[attr];
-    } else if (attr === 7) {
+    if (pacIndex <= 0xd) {
+      const colorIndex = Math.floor(pacIndex / 2);
+      textColor = shaka.cea.Cea608DataChannel.TEXT_COLORS[colorIndex];
+    } else if (pacIndex <= 0xf) {
       italics = true; // color stays white
+    } else {
+      indent = Math.floor((pacIndex - 0x10) / 2);
     }
 
     // PACs toggle underline on the last bit of b2.
@@ -168,6 +175,7 @@ shaka.cea.Cea608DataChannel = class {
     buf.setUnderline(underline);
     buf.setItalics(italics);
     buf.setTextColor(textColor);
+    buf.setIndent(indent);
 
     // Clear the background color, since new row (PAC) should reset ALL styles.
     buf.setBackgroundColor(shaka.cea.CeaUtils.DEFAULT_BG_COLOR);
@@ -507,6 +515,16 @@ shaka.cea.Cea608DataChannel = class {
     this.curbuf_.addChar(charSet, b2);
   }
 
+  /**
+   * Handles a tab offset.
+   *
+   * @param {number} offset
+   * @private
+   */
+  handleOffset_(offset) {
+    this.curbuf_.setOffset(offset);
+  }
+
   /**
    * Decodes control code.
    * Three types of control codes:
@@ -543,6 +561,9 @@ shaka.cea.Cea608DataChannel = class {
       this.handleExtendedWesternEuropeanChar_(b1, b2);
     } else if (this.isMiscellaneous_(b1, b2)) {
       return this.controlMiscellaneous_(ccPacket);
+    } else if (this.isOffset_(b1, b2)) {
+      const offset = b2 - 0x20;
+      this.handleOffset_(offset);
     }
     return null;
   }
@@ -561,6 +582,17 @@ shaka.cea.Cea608DataChannel = class {
     return ((b1 & 0xf6) === 0x14) && ((b2 & 0xf0) === 0x20);
   }
 
+  /**
+   * Checks if this is a offset control code.
+   * @param {number} b1 Byte 1.
+   * @param {number} b2 Byte 2.
+   * @return {boolean}
+   * @private
+   */
+  isOffset_(b1, b2) {
+    return (b1 == 0x17 || b1 == 0x1f) && b2 >= 0x21 && b2 <= 0x23;
+  }
+
   /**
    * Checks if this is a PAC control code.
    * @param {number} b1 Byte 1.

package/lib/cea/cea608_memory.js

@@ -69,6 +69,16 @@ shaka.cea.Cea608Memory = class {
      */
     this.backgroundColor_ = shaka.cea.CeaUtils.DEFAULT_BG_COLOR;
 
+    /**
+     * @private {?number}
+     */
+    this.offset_ = null;
+
+    /**
+     * @private {?number}
+     */
+    this.indent_ = null;
+
     this.reset();
   }
 
@@ -89,6 +99,10 @@ shaka.cea.Cea608Memory = class {
     if (line) {
       topLevelCue.line = line;
     }
+    if (this.indent_ != null && this.offset_ != null) {
+      topLevelCue.position = 10 + Math.min(70, this.indent_ * 10) +
+          this.offset_ * 2.5;
+    }
     const ret = shaka.cea.CeaUtils.getParsedCaption(
         topLevelCue, stream, this.rows_, startTime, endTime);
     // If the text and its lines are larger than what we can show on the
@@ -270,6 +284,20 @@ shaka.cea.Cea608Memory = class {
   setBackgroundColor(color) {
     this.backgroundColor_ = color;
   }
+
+  /**
+   * @param {number} offset
+   */
+  setOffset(offset) {
+    this.offset_ = offset;
+  }
+
+  /**
+   * @param {?number} indent
+   */
+  setIndent(indent) {
+    this.indent_ = indent;
+  }
 };
 
 /**

package/lib/dash/dash_parser.js

@@ -7,6 +7,7 @@
 goog.provide('shaka.dash.DashParser');
 
 goog.require('goog.asserts');
+goog.require('goog.Uri');
 goog.require('shaka.Deprecate');
 goog.require('shaka.abr.Ewma');
 goog.require('shaka.dash.ContentProtection');
@@ -34,6 +35,7 @@ goog.require('shaka.util.ObjectUtils');
 goog.require('shaka.util.OperationManager');
 goog.require('shaka.util.PeriodCombiner');
 goog.require('shaka.util.PlayerConfiguration');
+goog.require('shaka.util.StreamUtils');
 goog.require('shaka.util.StringUtils');
 goog.require('shaka.util.Timer');
 goog.require('shaka.util.TXml');
@@ -184,19 +186,30 @@ shaka.dash.DashParser = class {
 
     /** @private {boolean} */
     this.isTransitionFromDynamicToStatic_ = false;
+
+    /** @private {string} */
+    this.lastManifestQueryParams_ = '';
+
+    /** @private {function():boolean} */
+    this.isPreloadFn_ = () => false;
   }
 
   /**
+   * @param {shaka.extern.ManifestConfiguration} config
+   * @param {(function():boolean)=} isPreloadFn
    * @override
    * @exportInterface
    */
-  configure(config) {
+  configure(config, isPreloadFn) {
     goog.asserts.assert(config.dash != null,
         'DashManifestConfiguration should not be null!');
     const needFireUpdate = this.playerInterface_ &&
       config.dash.updatePeriod != this.config_.dash.updatePeriod &&
       config.dash.updatePeriod >= 0;
     this.config_ = config;
+    if (isPreloadFn) {
+      this.isPreloadFn_ = isPreloadFn;
+    }
     if (needFireUpdate && this.manifest_ &&
       this.manifest_.presentationTimeline.isLive()) {
       this.updateNow_();
@@ -406,6 +419,9 @@ shaka.dash.DashParser = class {
       this.manifestUris_.unshift(response.uri);
     }
 
+    const uriObj = new goog.Uri(response.uri);
+    this.lastManifestQueryParams_ = uriObj.getQueryData().toString();
+
     // This may throw, but it will result in a failed promise.
     await this.parseManifest_(response.data, response.uri, rootElement);
     // Keep track of how long the longest manifest update took.
@@ -740,6 +756,7 @@ shaka.dash.DashParser = class {
       mediaPresentationDuration: null,
       profiles: profiles.split(','),
       roles: null,
+      urlParams: () => '',
     };
 
     this.gapCount_ = 0;
@@ -808,6 +825,7 @@ shaka.dash.DashParser = class {
         periodCount: periods.length,
         gapCount: this.gapCount_,
         isLowLatency: this.isLowLatency_,
+        startTime: null,
       };
 
       // We only need to do clock sync when we're using presentation start
@@ -1020,6 +1038,7 @@ shaka.dash.DashParser = class {
       mediaPresentationDuration:
           this.manifestPatchContext_.mediaPresentationDuration,
       roles: null,
+      urlParams: () => '',
     };
 
     const periodsAndDuration = this.parsePeriods_(context,
@@ -1526,6 +1545,19 @@ shaka.dash.DashParser = class {
           periodInfo.start, periodInfo.duration, node, availabilityStart);
     }
 
+
+    const supplementalProperties =
+        TXml.findChildren(periodInfo.node, 'SupplementalProperty');
+    for (const prop of supplementalProperties) {
+      const schemeId = prop.attributes['schemeIdUri'];
+      if (schemeId == 'urn:mpeg:dash:urlparam:2014') {
+        const urlParams = this.getURLParametersFunction_(prop);
+        if (urlParams) {
+          context.urlParams = urlParams;
+        }
+      }
+    }
+
     const adaptationSetNodes =
         TXml.findChildren(periodInfo.node, 'AdaptationSet');
     const adaptationSets = adaptationSetNodes
@@ -1565,12 +1597,8 @@ shaka.dash.DashParser = class {
       for (const normalSet of normalAdaptationSets) {
         if (targetIds.includes(normalSet.id)) {
           for (const stream of normalSet.streams) {
-            // There may be multiple trick mode streams, but we do not
-            // currently support that.  Just choose one.
-            // TODO: https://github.com/shaka-project/shaka-player/issues/1528
-            stream.trickModeVideo = trickModeSet.streams.find((trickStream) =>
-              shaka.util.MimeUtils.getNormalizedCodec(stream.codecs) ==
-              shaka.util.MimeUtils.getNormalizedCodec(trickStream.codecs));
+            shaka.util.StreamUtils.setBetterIFrameStream(
+                stream, trickModeSet.streams);
           }
         }
       }
@@ -1734,11 +1762,23 @@ shaka.dash.DashParser = class {
       return undefined;
     };
 
+    const parseFont = (prop) => {
+      const fontFamily = prop.attributes['dvb:fontFamily'];
+      const fontUrl = prop.attributes['dvb:url'];
+      if (fontFamily && fontUrl) {
+        const uris = shaka.util.ManifestParserUtils.resolveUris(
+            context.adaptationSet.getBaseUris(), [fontUrl],
+            context.urlParams());
+        this.playerInterface_.addFont(fontFamily, uris[0]);
+      }
+    };
+
     const essentialProperties =
         TXml.findChildren(elem, 'EssentialProperty');
     // ID of real AdaptationSet if this is a trick mode set:
     let trickModeFor = null;
     let isFastSwitching = false;
+    let adaptationSetUrlParams = null;
     let unrecognizedEssentialProperty = false;
     for (const prop of essentialProperties) {
       const schemeId = prop.attributes['schemeIdUri'];
@@ -1757,11 +1797,29 @@ shaka.dash.DashParser = class {
       } else if (schemeId == 'urn:mpeg:dash:ssr:2023' &&
           this.config_.dash.enableFastSwitching) {
         isFastSwitching = true;
+      } else if (schemeId == 'urn:dvb:dash:fontdownload:2014') {
+        parseFont(prop);
+      } else if (schemeId == 'urn:mpeg:dash:urlparam:2014') {
+        adaptationSetUrlParams = this.getURLParametersFunction_(prop);
+        if (!adaptationSetUrlParams) {
+          unrecognizedEssentialProperty = true;
+        }
       } else {
         unrecognizedEssentialProperty = true;
       }
     }
 
+    // According to DASH spec (2014) section 5.8.4.8, "the successful processing
+    // of the descriptor is essential to properly use the information in the
+    // parent element".  According to DASH IOP v3.3, section 3.3.4, "if the
+    // scheme or the value" for EssentialProperty is not recognized, "the DASH
+    // client shall ignore the parent element."
+    if (unrecognizedEssentialProperty) {
+      // Stop parsing this AdaptationSet and let the caller filter out the
+      // nulls.
+      return null;
+    }
+
     let lastSegmentNumber = null;
 
     const supplementalProperties =
@@ -1778,9 +1836,17 @@ shaka.dash.DashParser = class {
         colorGamut = getColorGamutFromColourPrimariesCICP(
             parseInt(prop.attributes['value'], 10),
         );
+      } else if (schemeId == 'urn:dvb:dash:fontdownload:2014') {
+        parseFont(prop);
+      } else if (schemeId == 'urn:mpeg:dash:urlparam:2014') {
+        adaptationSetUrlParams = this.getURLParametersFunction_(prop);
       }
     }
 
+    if (adaptationSetUrlParams) {
+      context.urlParams = adaptationSetUrlParams;
+    }
+
     const accessibilities = TXml.findChildren(elem, 'Accessibility');
     const LanguageUtils = shaka.util.LanguageUtils;
     const closedCaptions = new Map();
@@ -1882,17 +1948,6 @@ shaka.dash.DashParser = class {
       }
     }
 
-    // According to DASH spec (2014) section 5.8.4.8, "the successful processing
-    // of the descriptor is essential to properly use the information in the
-    // parent element".  According to DASH IOP v3.3, section 3.3.4, "if the
-    // scheme or the value" for EssentialProperty is not recognized, "the DASH
-    // client shall ignore the parent element."
-    if (unrecognizedEssentialProperty) {
-      // Stop parsing this AdaptationSet and let the caller filter out the
-      // nulls.
-      return null;
-    }
-
     const contentProtectionElems =
         TXml.findChildren(elem, 'ContentProtection');
     const contentProtection = ContentProtection.parseFromAdaptationSet(
@@ -1984,6 +2039,48 @@ shaka.dash.DashParser = class {
     };
   }
 
+  /**
+   * @param {!shaka.extern.xml.Node} elem
+   * @return {?function():string}
+   * @private
+   */
+  getURLParametersFunction_(elem) {
+    const TXml = shaka.util.TXml;
+    const urlQueryInfo = TXml.findChildNS(
+        elem, shaka.dash.DashParser.UP_NAMESPACE_, 'UrlQueryInfo');
+    if (urlQueryInfo && TXml.parseAttr(urlQueryInfo, 'useMPDUrlQuery',
+        TXml.parseBoolean, /* defaultValue= */ false)) {
+      const queryTemplate = urlQueryInfo.attributes['queryTemplate'];
+      if (queryTemplate) {
+        return () => {
+          if (queryTemplate == '$querypart$') {
+            return this.lastManifestQueryParams_;
+          }
+          const parameters = queryTemplate.split('&').map((param) => {
+            if (param == '$querypart$') {
+              return this.lastManifestQueryParams_;
+            } else {
+              const regex = /\$query:(.*?)\$/g;
+              const parts = regex.exec(param);
+              if (parts && parts.length == 2) {
+                const paramName = parts[1];
+                const queryData =
+                    new goog.Uri.QueryData(this.lastManifestQueryParams_);
+                const value = queryData.get(paramName);
+                if (value.length) {
+                  return paramName + '=' + value[0];
+                }
+              }
+              return param;
+            }
+          });
+          return parameters.join('&');
+        };
+      }
+    }
+    return null;
+  }
+
   /**
    * Parses a Representation XML element.
    *
@@ -2037,6 +2134,34 @@ shaka.dash.DashParser = class {
 
     context.roles = roles;
 
+    const supplementalPropertyElems =
+        TXml.findChildren(node, 'SupplementalProperty');
+    const essentialPropertyElems =
+        TXml.findChildren(node, 'EssentialProperty');
+
+    let representationUrlParams = null;
+    let urlParamsElement = essentialPropertyElems.find((element) => {
+      const schemeId = element.attributes['schemeIdUri'];
+      return schemeId == 'urn:mpeg:dash:urlparam:2014';
+    });
+    if (urlParamsElement) {
+      representationUrlParams =
+          this.getURLParametersFunction_(urlParamsElement);
+    } else {
+      urlParamsElement = supplementalPropertyElems.find((element) => {
+        const schemeId = element.attributes['schemeIdUri'];
+        return schemeId == 'urn:mpeg:dash:urlparam:2014';
+      });
+      if (urlParamsElement) {
+        representationUrlParams =
+            this.getURLParametersFunction_(urlParamsElement);
+      }
+    }
+
+    if (representationUrlParams) {
+      context.urlParams = representationUrlParams;
+    }
+
     /** @type {?shaka.dash.DashParser.StreamInfo} */
     let streamInfo;
 
@@ -2050,8 +2175,9 @@ shaka.dash.DashParser = class {
       let aesKey = undefined;
       if (contentProtection.aes128Info) {
         const getBaseUris = context.representation.getBaseUris;
+        const urlParams = context.urlParams;
         const uris = shaka.util.ManifestParserUtils.resolveUris(
-            getBaseUris(), [contentProtection.aes128Info.keyUri]);
+            getBaseUris(), [contentProtection.aes128Info.keyUri], urlParams());
         const requestType = shaka.net.NetworkingEngine.RequestType.KEY;
         const request = shaka.net.NetworkingEngine.makeRequest(
             uris, this.config_.retryParameters);
@@ -2146,8 +2272,6 @@ shaka.dash.DashParser = class {
 
     // Detect the presence of E-AC3 JOC audio content, using DD+JOC signaling.
     // See: ETSI TS 103 420 V1.2.1 (2018-10)
-    const supplementalPropertyElems =
-        TXml.findChildren(node, 'SupplementalProperty');
     const hasJoc = supplementalPropertyElems.some((element) => {
       const expectedUri = 'tag:dolby.com,2018:dash:EC3_ExtensionType:2018';
       const expectedValue = 'JOC';
@@ -2169,8 +2293,6 @@ shaka.dash.DashParser = class {
 
     let tilesLayout;
     if (isImage) {
-      const essentialPropertyElems =
-          TXml.findChildren(node, 'EssentialProperty');
       const thumbnailTileElem = essentialPropertyElems.find((element) => {
         const expectedUris = [
           'http://dashif.org/thumbnail_tile',
@@ -2745,7 +2867,8 @@ shaka.dash.DashParser = class {
     const type = shaka.net.NetworkingEngine.RequestType.TIMING;
 
     const operation =
-    this.playerInterface_.networkingEngine.request(type, request);
+    this.playerInterface_.networkingEngine.request(
+        type, request, {isPreload: this.isPreloadFn_()});
     this.operationManager_.manage(operation);
 
     const response = await operation.promise;
@@ -2953,6 +3076,10 @@ shaka.dash.DashParser = class {
    * @private
    */
   makeNetworkRequest_(request, type, context) {
+    if (!context) {
+      context = {};
+    }
+    context.isPreload = this.isPreloadFn_();
     const op = this.playerInterface_.networkingEngine.request(
         type, request, context);
     this.operationManager_.manage(op);
@@ -3032,6 +3159,13 @@ shaka.dash.DashParser.PatchContext;
 shaka.dash.DashParser.SCTE214_ = 'urn:scte:dash:scte214-extensions';
 
 
+/**
+ * @const {string}
+ * @private
+ */
+shaka.dash.DashParser.UP_NAMESPACE_ = 'urn:mpeg:dash:schema:urlparam:2014';
+
+
 /**
  * @typedef {
  *   function(!Array.<string>, ?number, ?number, boolean):
@@ -3133,7 +3267,8 @@ shaka.dash.DashParser.InheritanceFrame;
  *   availabilityTimeOffset: number,
  *   mediaPresentationDuration: ?number,
  *   profiles: !Array.<string>,
- *   roles: ?Array.<string>
+ *   roles: ?Array.<string>,
+ *   urlParams: function():string
  * }}
  *
  * @description
@@ -3164,6 +3299,8 @@ shaka.dash.DashParser.InheritanceFrame;
  *   of the use of features.
  * @property {?number} mediaPresentationDuration
  *   Media presentation duration, or null if unknown.
+ * @property {function():string} urlParams
+ *   The query params for the segments.
  */
 shaka.dash.DashParser.Context;
 

package/lib/dash/segment_base.js

@@ -53,7 +53,7 @@ shaka.dash.SegmentBase = class {
     if (uri) {
       resolvedUris = ManifestParserUtils.resolveUris(resolvedUris, [
         StringUtils.htmlUnescape(uri),
-      ]);
+      ], context.urlParams());
     }
 
     let startByte = 0;
@@ -194,6 +194,7 @@ shaka.dash.SegmentBase = class {
     for (const ref of references) {
       ref.codecs = context.representation.codecs;
       ref.mimeType = context.representation.mimeType;
+      ref.bandwidth = context.bandwidth;
     }
 
     presentationTimeline.notifySegments(references);
@@ -266,7 +267,7 @@ shaka.dash.SegmentBase = class {
         StringUtils.htmlUnescape(representationIndex.attributes['sourceURL']);
       if (representationUri) {
         indexUris = ManifestParserUtils.resolveUris(
-            indexUris, [representationUri]);
+            indexUris, [representationUri], context.urlParams());
       }
     }
 

package/lib/dash/segment_list.js

@@ -62,7 +62,7 @@ shaka.dash.SegmentList = class {
         context.periodInfo.start, context.periodInfo.duration,
         info.startNumber, context.representation.getBaseUris, info,
         initSegmentReference, aesKey, context.representation.mimeType,
-        context.representation.codecs);
+        context.representation.codecs, context.bandwidth, context.urlParams);
 
     const isNew = !segmentIndex;
     if (segmentIndex) {
@@ -203,12 +203,14 @@ shaka.dash.SegmentList = class {
    * @param {shaka.extern.aesKey|undefined} aesKey
    * @param {string} mimeType
    * @param {string} codecs
+   * @param {number} bandwidth
+   * @param {function():string} urlParams
    * @return {!Array.<!shaka.media.SegmentReference>}
    * @private
    */
   static createSegmentReferences_(
       periodStart, periodDuration, startNumber, getBaseUris, info,
-      initSegmentReference, aesKey, mimeType, codecs) {
+      initSegmentReference, aesKey, mimeType, codecs, bandwidth, urlParams) {
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
 
     let max = info.mediaSegments.length;
@@ -251,7 +253,7 @@ shaka.dash.SegmentList = class {
       const getUris = () => {
         if (uris == null) {
           uris = ManifestParserUtils.resolveUris(
-              getBaseUris(), [segment.mediaUri]);
+              getBaseUris(), [segment.mediaUri], urlParams());
         }
         return uris;
       };
@@ -273,6 +275,7 @@ shaka.dash.SegmentList = class {
           aesKey);
       ref.codecs = codecs;
       ref.mimeType = mimeType;
+      ref.bandwidth = bandwidth;
       references.push(ref);
       prevEndTime = endTime;
     }