shaka-player - npm Package Compare versions

Comparing version 4.9.24 to 4.9.25

dist/locales.js

@@ -765,46 +765,46 @@
   EXIT_PICTURE_IN_PICTURE: 'EXIT_PICTURE_IN_PICTURE',
-  ENTER_PICTURE_IN_PICTURE: 'ENTER_PICTURE_IN_PICTURE',
-  REPLAY: 'REPLAY',
   SEEK: 'SEEK',
-  BACK: 'BACK',
-  RECENTER_VR: 'RECENTER_VR',
-  CAST: 'CAST',
-  VOLUME: 'VOLUME',
-  MULTIPLE_LANGUAGES: 'MULTIPLE_LANGUAGES',
-  PLAY: 'PLAY',
-  FAST_FORWARD: 'FAST_FORWARD',
+  LOOP: 'LOOP',
   EXIT_LOOP_MODE: 'EXIT_LOOP_MODE',
-  FULL_SCREEN: 'FULL_SCREEN',
+  UNRECOGNIZED_LANGUAGE: 'UNRECOGNIZED_LANGUAGE',
+  ENTER_LOOP_MODE: 'ENTER_LOOP_MODE',
   MORE_SETTINGS: 'MORE_SETTINGS',
   EXIT_FULL_SCREEN: 'EXIT_FULL_SCREEN',
+  REPLAY: 'REPLAY',
   UNDETERMINED_LANGUAGE: 'UNDETERMINED_LANGUAGE',
-  SURROUND: 'SURROUND',
-  LOOP: 'LOOP',
-  PICTURE_IN_PICTURE: 'PICTURE_IN_PICTURE',
-  AD_DURATION: 'AD_DURATION',
-  UNMUTE: 'UNMUTE',
-  AIRPLAY: 'AIRPLAY',
-  SKIP_AD: 'SKIP_AD',
-  OFF: 'OFF',
-  ENTER_LOOP_MODE: 'ENTER_LOOP_MODE',
+  PLAYBACK_RATE: 'PLAYBACK_RATE',
+  CAST: 'CAST',
+  LANGUAGE: 'LANGUAGE',
+  FULL_SCREEN: 'FULL_SCREEN',
+  ENTER_PICTURE_IN_PICTURE: 'ENTER_PICTURE_IN_PICTURE',
+  NOT_APPLICABLE: 'NOT_APPLICABLE',
   PAUSE: 'PAUSE',
-  NOT_APPLICABLE: 'NOT_APPLICABLE',
   RESOLUTION: 'RESOLUTION',
+  QUALITY: 'QUALITY',
+  ON: 'ON',
   MUTE: 'MUTE',
+  TOGGLE_STEREOSCOPIC: 'TOGGLE_STEREOSCOPIC',
+  AUTO_QUALITY: 'AUTO_QUALITY',
+  PICTURE_IN_PICTURE: 'PICTURE_IN_PICTURE',
+  SKIP_TO_LIVE: 'SKIP_TO_LIVE',
+  PLAY: 'PLAY',
+  CAPTIONS: 'CAPTIONS',
+  REWIND: 'REWIND',
+  SURROUND: 'SURROUND',
+  LIVE: 'LIVE',
+  RECENTER_VR: 'RECENTER_VR',
+  OFF: 'OFF',
   STATISTICS: 'STATISTICS',
-  SKIP_TO_LIVE: 'SKIP_TO_LIVE',
+  AD_PROGRESS: 'AD_PROGRESS',
+  SKIP_AD: 'SKIP_AD',
   SUBTITLE_FORCED: 'SUBTITLE_FORCED',
-  AD_PROGRESS: 'AD_PROGRESS',
-  REWIND: 'REWIND',
+  BACK: 'BACK',
+  AD_TIME: 'AD_TIME',
   AD_STATISTICS: 'AD_STATISTICS',
-  LANGUAGE: 'LANGUAGE',
-  AD_TIME: 'AD_TIME',
-  AUTO_QUALITY: 'AUTO_QUALITY',
-  ON: 'ON',
-  PLAYBACK_RATE: 'PLAYBACK_RATE',
-  QUALITY: 'QUALITY',
-  CAPTIONS: 'CAPTIONS',
-  TOGGLE_STEREOSCOPIC: 'TOGGLE_STEREOSCOPIC',
-  LIVE: 'LIVE',
-  UNRECOGNIZED_LANGUAGE: 'UNRECOGNIZED_LANGUAGE',
+  AD_DURATION: 'AD_DURATION',
+  FAST_FORWARD: 'FAST_FORWARD',
+  VOLUME: 'VOLUME',
+  UNMUTE: 'UNMUTE',
+  AIRPLAY: 'AIRPLAY',
+  MULTIPLE_LANGUAGES: 'MULTIPLE_LANGUAGES',
 };

lib/util/periods.js

@@ -893,12 +893,17 @@ /*! @license
             input.trickModeVideo);
-        // TODO: fix the createSegmentIndex function for trickModeVideo.
-        // The trick-mode tracks in multi-period content should have trick-mode
-        // segment indexes whenever available, rather than only regular-mode
-        // segment indexes.
+        output.trickModeVideo.matchedStreams = [];
         output.trickModeVideo.createSegmentIndex = () => {
-          // Satisfy the compiler about the type.
-          goog.asserts.assert(
-              output.segmentIndex instanceof shaka.media.MetaSegmentIndex,
-              'The stream should have a MetaSegmentIndex.');
-          output.trickModeVideo.segmentIndex = output.segmentIndex.clone();
+          if (output.trickModeVideo.segmentIndex) {
+            return Promise.resolve();
+          }
+          const segmentIndex = new shaka.media.MetaSegmentIndex();
+          goog.asserts.assert(output.trickModeVideo.matchedStreams,
+              'trickmode matched streams should exist');
+          for (const stream of output.trickModeVideo.matchedStreams) {
+            goog.asserts.assert(stream.segmentIndex,
+                'trickmode segment index should exist');
+            segmentIndex.appendSegmentIndex(stream.segmentIndex);
+          }
+          output.trickModeVideo.segmentIndex = segmentIndex;
+
           return Promise.resolve();
@@ -909,2 +914,3 @@ };
       // Concatenate the trick mode input onto the trick mode output.
+      output.trickModeVideo.matchedStreams.push(input.trickModeVideo);
       shaka.util.PeriodCombiner.concatenateStreams_(
@@ -915,2 +921,3 @@ output.trickModeVideo, input.trickModeVideo);
       // from the standard input Stream.
+      output.trickModeVideo.matchedStreams.push(input);
       shaka.util.PeriodCombiner.concatenateStreams_(
@@ -917,0 +924,0 @@ output.trickModeVideo, input);

lib/util/tXml.js

@@ -9,2 +9,3 @@ /*! @license
 
+goog.require('shaka.util.ObjectUtils');
 goog.require('shaka.util.StringUtils');
@@ -75,3 +76,3 @@ goog.require('shaka.log');
   /**
-   * Parse some data
+   * Get namespace based on schema
    * @param {string} schema
@@ -81,4 +82,4 @@ * @return {string}
   static getKnownNameSpace(schema) {
-    if (shaka.util.TXml.knownNameSpaces_.has(schema)) {
-      return shaka.util.TXml.knownNameSpaces_.get(schema);
+    if (shaka.util.TXml.uriToNameSpace_.has(schema)) {
+      return shaka.util.TXml.uriToNameSpace_.get(schema);
     }
@@ -89,3 +90,15 @@ return '';
   /**
-   * Parse some data
+   * Get schema based on namespace
+   * @param {string} NS
+   * @return {string}
+   */
+  static getKnownSchema(NS) {
+    if (shaka.util.TXml.nameSpaceToUri_.has(NS)) {
+      return shaka.util.TXml.nameSpaceToUri_.get(NS);
+    }
+    return '';
+  }
+
+  /**
+   * Sets NS <-> schema bidirectional mapping
    * @param {string} schema
@@ -95,3 +108,4 @@ * @param {string} NS
   static setKnownNameSpace(schema, NS) {
-    shaka.util.TXml.knownNameSpaces_.set(schema, NS);
+    shaka.util.TXml.uriToNameSpace_.set(schema, NS);
+    shaka.util.TXml.nameSpaceToUri_.set(NS, schema);
   }
@@ -881,3 +895,8 @@
     const TXml = shaka.util.TXml;
-    const element = document.createElementNS('', node.tagName);
+    let namespace = '';
+    const parts = node.tagName.split(':');
+    if (parts.length > 0) {
+      namespace = TXml.getKnownSchema(parts[0]);
+    }
+    const element = document.createElementNS(namespace, node.tagName);
 
@@ -901,7 +920,39 @@ for (const k in node.attributes) {
   }
+
+  /**
+   * Clones node and its children recursively. Skips parent.
+   * @param {?shaka.extern.xml.Node} node
+   * @return {?shaka.extern.xml.Node}
+   */
+  static cloneNode(node) {
+    if (!node) {
+      return null;
+    }
+    /** @type {!shaka.extern.xml.Node} */
+    const clone = {
+      tagName: node.tagName,
+      attributes: shaka.util.ObjectUtils.shallowCloneObject(node.attributes),
+      children: [],
+      parent: null,
+    };
+    for (const child of node.children) {
+      if (typeof child === 'string') {
+        clone.children.push(child);
+      } else {
+        const clonedChild = shaka.util.TXml.cloneNode(child);
+        clonedChild.parent = clone;
+        clone.children.push(clonedChild);
+      }
+    }
+    return clone;
+  }
 };
 
-shaka.util.TXml.knownNameSpaces_ = new Map([]);
+/** @private {!Map<string, string>} */
+shaka.util.TXml.uriToNameSpace_ = new Map();
 
+/** @private {!Map<string, string>} */
+shaka.util.TXml.nameSpaceToUri_ = new Map();
 
+
 /**
@@ -908,0 +959,0 @@ * @typedef {{

package.json

 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.9.24",
+  "version": "4.9.25",
   "homepage": "https://github.com/shaka-project/shaka-player",
@@ -6,0 +6,0 @@ "author": "Google",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

18532928

increased by0.17%

Lines of code

169871

increased by0.1%

No dependency changes