shaka-player 4.8.0 → 4.8.1

package/lib/dash/dash_parser.js

@@ -30,6 +30,7 @@ goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Networking');
 goog.require('shaka.util.OperationManager');
 goog.require('shaka.util.PeriodCombiner');
+goog.require('shaka.util.PlayerConfiguration');
 goog.require('shaka.util.StringUtils');
 goog.require('shaka.util.Timer');
 goog.require('shaka.util.TXml');
@@ -338,7 +339,9 @@ shaka.dash.DashParser = class {
   async parseManifest_(data, finalManifestUri) {
     let manifestData = data;
     const manifestPreprocessor = this.config_.dash.manifestPreprocessor;
-    if (manifestPreprocessor) {
+    const defaultManifestPreprocessor =
+        shaka.util.PlayerConfiguration.defaultManifestPreprocessor;
+    if (manifestPreprocessor != defaultManifestPreprocessor) {
       shaka.Deprecate.deprecateFeature(5,
           'manifest.dash.manifestPreprocessor configuration',
           'Please Use manifest.dash.manifestPreprocessorTXml instead.');
@@ -364,7 +367,9 @@ shaka.dash.DashParser = class {
     }
     const manifestPreprocessorTXml =
         this.config_.dash.manifestPreprocessorTXml;
-    if (manifestPreprocessorTXml) {
+    const defaultManifestPreprocessorTXml =
+        shaka.util.PlayerConfiguration.defaultManifestPreprocessorTXml;
+    if (manifestPreprocessorTXml != defaultManifestPreprocessorTXml) {
       manifestPreprocessorTXml(mpd);
     }
 
@@ -2074,8 +2079,9 @@ shaka.dash.DashParser = class {
    * @private
    */
   async requestForTiming_(getBaseUris, uri, method) {
+    const uris = [shaka.util.StringUtils.htmlUnescape(uri)];
     const requestUris =
-        shaka.util.ManifestParserUtils.resolveUris(getBaseUris(), [uri]);
+        shaka.util.ManifestParserUtils.resolveUris(getBaseUris(), uris);
     const request = shaka.net.NetworkingEngine.makeRequest(
         requestUris, this.config_.retryParameters);
     request.method = method;

package/lib/dash/segment_template.js

@@ -701,7 +701,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
    */
   appendTemplateInfo(info, periodStart, periodEnd, shouldFit,
       initSegmentReference) {
-    this.initSegmentReference_ = initSegmentReference;
+    this.updateInitSegmentReference(initSegmentReference);
     if (!this.templateInfo_) {
       this.templateInfo_ = info;
       this.periodStart_ = periodStart;
@@ -732,6 +732,24 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     }
   }
 
+  /**
+   * Updates the init segment reference and propagates the update to all
+   * references.
+   * @param {shaka.media.InitSegmentReference} initSegmentReference
+   */
+  updateInitSegmentReference(initSegmentReference) {
+    if (this.initSegmentReference_ === initSegmentReference) {
+      return;
+    }
+
+    this.initSegmentReference_ = initSegmentReference;
+    for (const reference of this.references) {
+      if (reference) {
+        reference.updateInitSegmentReference(initSegmentReference);
+      }
+    }
+  }
+
   /**
    *
    * @param {number} time

package/lib/media/segment_index.js

@@ -436,10 +436,11 @@ shaka.media.SegmentIndex = class {
    *
    * @param {number} time
    * @param {boolean=} allowNonIndepedent
+   * @param {boolean=} reverse
    * @return {?shaka.media.SegmentIterator}
    * @export
    */
-  getIteratorForTime(time, allowNonIndepedent = false) {
+  getIteratorForTime(time, allowNonIndepedent = false, reverse = false) {
     let index = this.find(time);
     if (index == null) {
       return null;
@@ -476,7 +477,8 @@ shaka.media.SegmentIndex = class {
         }
       }
     }
-    return new shaka.media.SegmentIterator(this, index, partialSegmentIndex);
+    return new shaka.media.SegmentIterator(
+        this, index, partialSegmentIndex, reverse);
   }
 
   /**
@@ -552,8 +554,9 @@ shaka.media.SegmentIterator = class {
    * @param {shaka.media.SegmentIndex} segmentIndex
    * @param {number} index
    * @param {number} partialSegmentIndex
+   * @param {boolean} reverse
    */
-  constructor(segmentIndex, index, partialSegmentIndex) {
+  constructor(segmentIndex, index, partialSegmentIndex, reverse) {
     /** @private {shaka.media.SegmentIndex} */
     this.segmentIndex_ = segmentIndex;
 
@@ -562,6 +565,17 @@ shaka.media.SegmentIterator = class {
 
     /** @private {number} */
     this.currentPartialPosition_ = partialSegmentIndex;
+
+    /** @private {boolean} */
+    this.reverse = reverse;
+  }
+
+  /**
+   * @param {boolean} reverse
+   * @export
+   */
+  setReverse(reverse) {
+    this.reverse = reverse;
   }
 
   /**
@@ -606,25 +620,47 @@ shaka.media.SegmentIterator = class {
   next() {
     const ref = this.segmentIndex_.get(this.currentPosition_);
 
-    if (ref && ref.hasPartialSegments()) {
-      // If the regular segment contains partial segments, move to the next
-      // partial SegmentReference.
-      this.currentPartialPosition_++;
-      // If the current regular segment has been published completely, and
-      // we've reached the end of its partial segments list, move to the next
-      // regular segment.
-      // If the Partial Segments list is still on the fly, do not move to
-      // the next regular segment.
-      if (ref.hasAllPartialSegments() &&
-          this.currentPartialPosition_ == ref.partialReferences.length) {
+    if (!this.reverse) {
+      if (ref && ref.hasPartialSegments()) {
+        // If the regular segment contains partial segments, move to the next
+        // partial SegmentReference.
+        this.currentPartialPosition_++;
+        // If the current regular segment has been published completely, and
+        // we've reached the end of its partial segments list, move to the next
+        // regular segment.
+        // If the Partial Segments list is still on the fly, do not move to
+        // the next regular segment.
+        if (ref.hasAllPartialSegments() &&
+            this.currentPartialPosition_ == ref.partialReferences.length) {
+          this.currentPosition_++;
+          this.currentPartialPosition_ = 0;
+        }
+      } else {
+        // If the regular segment doesn't contain partial segments, move to the
+        // next regular segment.
         this.currentPosition_++;
         this.currentPartialPosition_ = 0;
       }
     } else {
-      // If the regular segment doesn't contain partial segments, move to the
-      // next regular segment.
-      this.currentPosition_++;
-      this.currentPartialPosition_ = 0;
+      if (ref && ref.hasPartialSegments()) {
+        // If the regular segment contains partial segments, move to the
+        // previous partial SegmentReference.
+        this.currentPartialPosition_--;
+        if (this.currentPartialPosition_ < 0) {
+          this.currentPosition_--;
+          const prevRef = this.segmentIndex_.get(this.currentPosition_);
+          if (prevRef && prevRef.hasPartialSegments()) {
+            this.currentPartialPosition_ = prevRef.partialReferences.length - 1;
+          } else {
+            this.currentPartialPosition_ = 0;
+          }
+        }
+      } else {
+        // If the regular segment doesn't contain partial segments, move to the
+        // previous regular segment.
+        this.currentPosition_--;
+        this.currentPartialPosition_ = 0;
+      }
     }
 
     const res = this.current();

package/lib/media/segment_reference.js

@@ -621,6 +621,18 @@ shaka.media.SegmentReference = class {
   getSegmentData() {
     return this.segmentData;
   }
+
+  /**
+   * Updates the init segment reference and propagates the update to all partial
+   * references.
+   * @param {shaka.media.InitSegmentReference} initSegmentReference
+   */
+  updateInitSegmentReference(initSegmentReference) {
+    this.initSegmentReference = initSegmentReference;
+    for (const partialReference of this.partialReferences) {
+      partialReference.updateInitSegmentReference(initSegmentReference);
+    }
+  }
 };
 
 

package/lib/media/streaming_engine.js

@@ -360,6 +360,8 @@ shaka.media.StreamingEngine = class {
   setTrickPlay(on) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
+    this.updateSegmentIteratorReverse_();
+
     const mediaState = this.mediaStates_.get(ContentType.VIDEO);
     if (!mediaState) {
       return;
@@ -1422,8 +1424,10 @@ shaka.media.StreamingEngine = class {
       shaka.log.v1(
           logPrefix, 'looking up segment from new stream endTime:', time);
 
+      const reverse = this.playerInterface_.getPlaybackRate() < 0;
       mediaState.segmentIterator =
-          mediaState.stream.segmentIndex.getIteratorForTime(time);
+          mediaState.stream.segmentIndex.getIteratorForTime(
+              time, /* allowNonIndepedent= */ false, reverse);
       const ref = mediaState.segmentIterator &&
           mediaState.segmentIterator.next().value;
       if (ref == null) {
@@ -1443,10 +1447,12 @@ shaka.media.StreamingEngine = class {
           'lookupTime:', lookupTime,
           'presentationTime:', presentationTime);
 
+      const reverse = this.playerInterface_.getPlaybackRate() < 0;
       let ref = null;
       if (inaccurateTolerance) {
         mediaState.segmentIterator =
-            mediaState.stream.segmentIndex.getIteratorForTime(lookupTime);
+            mediaState.stream.segmentIndex.getIteratorForTime(
+                lookupTime, /* allowNonIndepedent= */ false, reverse);
         ref = mediaState.segmentIterator &&
             mediaState.segmentIterator.next().value;
       }
@@ -1454,7 +1460,8 @@ shaka.media.StreamingEngine = class {
         // If we can't find a valid segment with the drifted time, look for a
         // segment with the presentation time.
         mediaState.segmentIterator =
-            mediaState.stream.segmentIndex.getIteratorForTime(presentationTime);
+            mediaState.stream.segmentIndex.getIteratorForTime(
+                presentationTime, /* allowNonIndepedent= */ false, reverse);
         ref = mediaState.segmentIterator &&
             mediaState.segmentIterator.next().value;
       }
@@ -2752,6 +2759,29 @@ shaka.media.StreamingEngine = class {
     }
   }
 
+  /**
+   * Update the segment iterator direction.
+   *
+   * @private
+   */
+  updateSegmentIteratorReverse_() {
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
+
+    const reverse = this.playerInterface_.getPlaybackRate() < 0;
+    const videoState = this.mediaStates_.get(ContentType.VIDEO);
+    if (videoState && videoState.segmentIterator) {
+      videoState.segmentIterator.setReverse(reverse);
+    }
+    const audioState = this.mediaStates_.get(ContentType.AUDIO);
+    if (audioState && audioState.segmentIterator) {
+      audioState.segmentIterator.setReverse(reverse);
+    }
+    const textState = this.mediaStates_.get(ContentType.TEXT);
+    if (textState && textState.segmentIterator) {
+      textState.segmentIterator.setReverse(reverse);
+    }
+  }
+
   /**
    * @param {shaka.media.StreamingEngine.MediaState_} mediaState
    * @return {string} A log prefix of the form ($CONTENT_TYPE:$STREAM_ID), e.g.,
@@ -2768,6 +2798,7 @@ shaka.media.StreamingEngine = class {
  * @typedef {{
  *   getPresentationTime: function():number,
  *   getBandwidthEstimate: function():number,
+ *   getPlaybackRate: function():number,
  *   mediaSourceEngine: !shaka.media.MediaSourceEngine,
  *   netEngine: shaka.net.NetworkingEngine,
  *   onError: function(!shaka.util.Error),
@@ -2787,6 +2818,8 @@ shaka.media.StreamingEngine = class {
  *   viewer is seeing on screen right now.
  * @property {function():number} getBandwidthEstimate
  *   Get the estimated bandwidth in bits per second.
+ * @property {function():number} getPlaybackRate
+ *   Get the playback rate
  * @property {!shaka.media.MediaSourceEngine} mediaSourceEngine
  *   The MediaSourceEngine. The caller retains ownership.
  * @property {shaka.net.NetworkingEngine} netEngine

package/lib/mss/mss_parser.js

@@ -23,6 +23,7 @@ goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Mp4Generator');
 goog.require('shaka.util.OperationManager');
+goog.require('shaka.util.PlayerConfiguration');
 goog.require('shaka.util.Timer');
 goog.require('shaka.util.TXml');
 goog.require('shaka.util.XmlUtils');
@@ -282,7 +283,9 @@ shaka.mss.MssParser = class {
   parseManifest_(data, finalManifestUri) {
     let manifestData = data;
     const manifestPreprocessor = this.config_.mss.manifestPreprocessor;
-    if (manifestPreprocessor) {
+    const defaultManifestPreprocessor =
+        shaka.util.PlayerConfiguration.defaultManifestPreprocessor;
+    if (manifestPreprocessor != defaultManifestPreprocessor) {
       shaka.Deprecate.deprecateFeature(5,
           'manifest.mss.manifestPreprocessor configuration',
           'Please Use manifest.mss.manifestPreprocessorTXml instead.');
@@ -307,7 +310,9 @@ shaka.mss.MssParser = class {
           finalManifestUri);
     }
     const manifestPreprocessorTXml = this.config_.mss.manifestPreprocessorTXml;
-    if (manifestPreprocessorTXml) {
+    const defaultManifestPreprocessorTXml =
+        shaka.util.PlayerConfiguration.defaultManifestPreprocessorTXml;
+    if (manifestPreprocessorTXml != defaultManifestPreprocessorTXml) {
       manifestPreprocessorTXml(mss);
     }
     this.processManifest_(mss, finalManifestUri);

package/lib/player.js

@@ -3246,6 +3246,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     const playerInterface = {
       getPresentationTime: () => this.playhead_ ? this.playhead_.getTime() : 0,
       getBandwidthEstimate: () => this.abrManager_.getBandwidthEstimate(),
+      getPlaybackRate: () => this.getPlaybackRate(),
       mediaSourceEngine: this.mediaSourceEngine_,
       netEngine: this.networkingEngine_,
       onError: (error) => this.onError_(error),
@@ -7181,7 +7182,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.8.0' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.8.1' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/util/cmcd_manager.js

@@ -187,12 +187,12 @@ shaka.util.CmcdManager = class {
 
       const stream = context.stream;
       if (stream) {
+        const playbackRate = this.playerInterface_.getPlaybackRate();
         if (isMedia) {
           data.bl = this.getBufferLength_(stream.type);
           if (data.ot !== ObjectType.TIMED_TEXT) {
             const remainingBufferLength =
                 this.getRemainingBufferLength_(stream.type);
-            const playbackRate = this.playerInterface_.getPlaybackRate();
             if (playbackRate) {
               data.dl = remainingBufferLength / Math.abs(playbackRate);
             } else {
@@ -206,8 +206,9 @@ shaka.util.CmcdManager = class {
         }
 
         if (stream.segmentIndex && segment) {
+          const reverse = playbackRate < 0;
           const iterator = stream.segmentIndex.getIteratorForTime(
-              segment.endTime, /* allowNonIndepedent= */ true);
+              segment.endTime, /* allowNonIndepedent= */ true, reverse);
           if (iterator) {
             const nextSegment = iterator.next().value;
             if (nextSegment && nextSegment != segment) {

package/lib/util/player_configuration.js

@@ -141,16 +141,10 @@ shaka.util.PlayerConfiguration = class {
           'urn:uuid:79f0049a-4098-8642-ab92-e65be0885f95':
             'com.microsoft.playready',
         },
-        manifestPreprocessor: (element) => {
-          return shaka.util.ConfigUtils.referenceParametersAndReturn(
-              [element],
-              element);
-        },
-        manifestPreprocessorTXml: (element) => {
-          return shaka.util.ConfigUtils.referenceParametersAndReturn(
-              [element],
-              element);
-        },
+        manifestPreprocessor:
+            shaka.util.PlayerConfiguration.defaultManifestPreprocessor,
+        manifestPreprocessorTXml:
+            shaka.util.PlayerConfiguration.defaultManifestPreprocessorTXml,
         sequenceMode: false,
         enableAudioGroups: false,
         multiTypeVariantsAllowed,
@@ -174,16 +168,10 @@ shaka.util.PlayerConfiguration = class {
         allowLowLatencyByteRangeOptimization: true,
       },
       mss: {
-        manifestPreprocessor: (element) => {
-          return shaka.util.ConfigUtils.referenceParametersAndReturn(
-              [element],
-              element);
-        },
-        manifestPreprocessorTXml: (element) => {
-          return shaka.util.ConfigUtils.referenceParametersAndReturn(
-              [element],
-              element);
-        },
+        manifestPreprocessor:
+            shaka.util.PlayerConfiguration.defaultManifestPreprocessor,
+        manifestPreprocessorTXml:
+            shaka.util.PlayerConfiguration.defaultManifestPreprocessorTXml,
         sequenceMode: false,
         keySystemsBySystemId: {
           '9a04f079-9840-4286-ab92-e65be0885f95':
@@ -615,4 +603,24 @@ shaka.util.PlayerConfiguration = class {
 
     return selectedTracks;
   }
+
+  /**
+   * @param {!Element} element
+   * @return {!Element}
+   */
+  static defaultManifestPreprocessor(element) {
+    return shaka.util.ConfigUtils.referenceParametersAndReturn(
+        [element],
+        element);
+  }
+
+  /**
+   * @param {!shaka.extern.xml.Node} element
+   * @return {!shaka.extern.xml.Node}
+   */
+  static defaultManifestPreprocessorTXml(element) {
+    return shaka.util.ConfigUtils.referenceParametersAndReturn(
+        [element],
+        element);
+  }
 };

package/lib/util/stream_utils.js

@@ -983,8 +983,12 @@ shaka.util.StreamUtils = class {
     // currently don't support 'fLaC', while 'flac' is supported by most
     // major browsers.
     // See https://bugs.chromium.org/p/chromium/issues/detail?id=1422728
-    if (codecs === 'fLaC' && !shaka.util.Platform.isSafari()) {
-      return 'flac';
+    if (codecs.toLowerCase() == 'flac') {
+      if (!shaka.util.Platform.isSafari()) {
+        return 'flac';
+      } else {
+        return 'fLaC';
+      }
     }
 
     // The same is true for 'Opus'.

package/package.json

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