shaka-player 4.5.0 → 4.6.1

package/lib/media/manifest_parser.js

@@ -6,9 +6,8 @@
 
 goog.provide('shaka.media.ManifestParser');
 
-goog.require('goog.Uri');
+goog.require('shaka.Deprecate');
 goog.require('shaka.log');
-goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.Platform');
 
@@ -28,7 +27,9 @@ shaka.media.ManifestParser = class {
    * @export
    */
   static registerParserByExtension(extension, parserFactory) {
-    shaka.media.ManifestParser.parsersByExtension[extension] = parserFactory;
+    shaka.Deprecate.deprecateFeature(5,
+        'ManifestParser',
+        'Please use an ManifestParser with registerParserByMime function.');
   }
 
 
@@ -70,9 +71,6 @@ shaka.media.ManifestParser = class {
       for (const type in ManifestParser.parsersByMime) {
         support[type] = true;
       }
-      for (const type in ManifestParser.parsersByExtension) {
-        support[type] = true;
-      }
     }
 
     // Make sure all well-known types are tested as well, just to show an
@@ -86,14 +84,6 @@ shaka.media.ManifestParser = class {
       // SmoothStreaming
       'application/vnd.ms-sstr+xml',
     ];
-    const testExtensions = {
-      // DASH
-      'mpd': 'application/dash+xml',
-      // HLS
-      'm3u8': 'application/x-mpegurl',
-      // SmoothStreaming
-      'ism': 'application/vnd.ms-sstr+xml',
-    };
 
     for (const type of testMimeTypes) {
       // Only query our parsers for MSE-enabled platforms.  Otherwise, query a
@@ -105,18 +95,6 @@ shaka.media.ManifestParser = class {
       }
     }
 
-    for (const extension in testExtensions) {
-      // Only query our parsers for MSE-enabled platforms.  Otherwise, query a
-      // temporary media element for native support for these MIME type for the
-      // extension.
-      if (shaka.util.Platform.supportsMediaSource()) {
-        support[extension] = !!ManifestParser.parsersByExtension[extension];
-      } else {
-        const type = testExtensions[extension];
-        support[extension] = shaka.util.Platform.supportsMediaType(type);
-      }
-    }
-
     return support;
   }
 
@@ -126,12 +104,10 @@ shaka.media.ManifestParser = class {
    * parse the manifest at |uri|.
    *
    * @param {string} uri
-   * @param {!shaka.net.NetworkingEngine} netEngine
-   * @param {shaka.extern.RetryParameters} retryParams
    * @param {?string} mimeType
-   * @return {!Promise.<shaka.extern.ManifestParser.Factory>}
+   * @return {shaka.extern.ManifestParser.Factory}
    */
-  static async getFactory(uri, netEngine, retryParams, mimeType) {
+  static getFactory(uri, mimeType) {
     const ManifestParser = shaka.media.ManifestParser;
 
     // Try using the MIME type we were given.
@@ -145,33 +121,6 @@ shaka.media.ManifestParser = class {
           'Could not determine manifest type using MIME type ', mimeType);
     }
 
-    const extension = ManifestParser.getExtension(uri);
-    if (extension) {
-      const factory = ManifestParser.parsersByExtension[extension];
-      if (factory) {
-        return factory;
-      }
-
-      shaka.log.warning(
-          'Could not determine manifest type for extension ', extension);
-    } else {
-      shaka.log.warning('Could not find extension for ', uri);
-    }
-
-    if (!mimeType) {
-      mimeType = await ManifestParser.getMimeType(uri, netEngine, retryParams);
-
-      if (mimeType) {
-        const factory = shaka.media.ManifestParser.parsersByMime[mimeType];
-        if (factory) {
-          return factory;
-        }
-
-        shaka.log.warning('Could not determine manifest type using MIME type',
-            mimeType);
-      }
-    }
-
     throw new shaka.util.Error(
         shaka.util.Error.Severity.CRITICAL,
         shaka.util.Error.Category.MANIFEST,
@@ -181,56 +130,15 @@ shaka.media.ManifestParser = class {
 
 
   /**
-   * @param {string} uri
-   * @param {!shaka.net.NetworkingEngine} netEngine
-   * @param {shaka.extern.RetryParameters} retryParams
-   * @return {!Promise.<string>}
-   */
-  static async getMimeType(uri, netEngine, retryParams) {
-    const type = shaka.net.NetworkingEngine.RequestType.MANIFEST;
-
-    const request = shaka.net.NetworkingEngine.makeRequest([uri], retryParams);
-    request.method = 'HEAD';
-
-    const response = await netEngine.request(type, request).promise;
-
-    // https://bit.ly/2K9s9kf says this header should always be available,
-    // but just to be safe:
-    const mimeType = response.headers['content-type'];
-    return mimeType ? mimeType.toLowerCase().split(';').shift() : '';
-  }
-
-
-  /**
-   * @param {string} uri
-   * @return {string}
-   */
-  static getExtension(uri) {
-    const uriObj = new goog.Uri(uri);
-    const uriPieces = uriObj.getPath().split('/');
-    const uriFilename = uriPieces.pop();
-    const filenamePieces = uriFilename.split('.');
-
-    // Only one piece means there is no extension.
-    if (filenamePieces.length == 1) {
-      return '';
-    }
-
-    return filenamePieces.pop().toLowerCase();
-  }
-
-
-  /**
-   * Determines whether or not this URI and MIME type are supported by our own
+   * Determines whether or not the MIME type is supported by our own
    * manifest parsers on this platform.  This takes into account whether or not
    * MediaSource is available, as well as which parsers are registered to the
    * system.
    *
-   * @param {string} uri
    * @param {string} mimeType
    * @return {boolean}
    */
-  static isSupported(uri, mimeType) {
+  static isSupported(mimeType) {
     // Without MediaSource, our own parsers are useless.
     if (!shaka.util.Platform.supportsMediaSource()) {
       return false;
@@ -240,11 +148,6 @@ shaka.media.ManifestParser = class {
       return true;
     }
 
-    const extension = shaka.media.ManifestParser.getExtension(uri);
-    if (extension in shaka.media.ManifestParser.parsersByExtension) {
-      return true;
-    }
-
     return false;
   }
 };
@@ -292,11 +195,3 @@ shaka.media.ManifestParser.AccessibilityPurpose = {
 shaka.media.ManifestParser.parsersByMime = {};
 
 
-/**
- * Contains the parser factory functions indexed by file extension.
- *
- * @type {!Object.<string, shaka.extern.ManifestParser.Factory>}
- */
-shaka.media.ManifestParser.parsersByExtension = {};
-
-

package/lib/media/media_source_capabilities.js

@@ -23,9 +23,16 @@ shaka.media.Capabilities = class {
     if (supportMap.has(type)) {
       return supportMap.get(type);
     }
-    const currentSupport = MediaSource.isTypeSupported(type);
-    supportMap.set(type, currentSupport);
-    return currentSupport;
+    if (window.ManagedMediaSource) {
+      const currentSupport = ManagedMediaSource.isTypeSupported(type);
+      supportMap.set(type, currentSupport);
+      return currentSupport;
+    } else if (window.MediaSource) {
+      const currentSupport = MediaSource.isTypeSupported(type);
+      supportMap.set(type, currentSupport);
+      return currentSupport;
+    }
+    return false;
   }
 
   /**

package/lib/media/media_source_engine.js

@@ -119,7 +119,7 @@ shaka.media.MediaSourceEngine = class {
     /** @private {boolean} */
     this.playbackHasBegun_ = false;
 
-    /** @private {MediaSource} */
+    /** @private {(MediaSource|ManagedMediaSource)} */
     this.mediaSource_ = this.createMediaSource(this.mediaSourceOpen_);
 
     /** @private {boolean} */
@@ -145,6 +145,9 @@ shaka.media.MediaSourceEngine = class {
 
     /** @private {boolean} */
     this.needSplitMuxedContent_ = false;
+
+    /** @private {boolean} */
+    this.streamingAllowed_ = true;
   }
 
   /**
@@ -154,30 +157,60 @@ shaka.media.MediaSourceEngine = class {
    * Replaced by unit tests.
    *
    * @param {!shaka.util.PublicPromise} p
-   * @return {!MediaSource}
+   * @return {!(MediaSource|ManagedMediaSource)}
    */
   createMediaSource(p) {
-    const mediaSource = new MediaSource();
+    if (window.ManagedMediaSource) {
+      this.video_.disableRemotePlayback = true;
 
-    // Set up MediaSource on the video element.
-    this.eventManager_.listenOnce(
-        mediaSource, 'sourceopen', () => this.onSourceOpen_(p));
+      const mediaSource = new ManagedMediaSource();
 
-    // Correctly set when playback has begun.
-    this.eventManager_.listenOnce(this.video_, 'playing', () => {
-      this.playbackHasBegun_ = true;
-    });
+      this.eventManager_.listenOnce(
+          mediaSource, 'sourceopen', () => this.onSourceOpen_(p));
+
+      this.eventManager_.listen(
+          mediaSource, 'startstreaming', () => {
+            this.streamingAllowed_ = true;
+          });
+
+      this.eventManager_.listen(
+          mediaSource, 'endstreaming', () => {
+            this.streamingAllowed_ = false;
+          });
+
+      // Correctly set when playback has begun.
+      this.eventManager_.listenOnce(this.video_, 'playing', () => {
+        this.playbackHasBegun_ = true;
+      });
+
+      this.url_ = shaka.media.MediaSourceEngine.createObjectURL(mediaSource);
+
+      this.video_.src = this.url_;
+
+      return mediaSource;
+    } else {
+      const mediaSource = new MediaSource();
+
+      // Set up MediaSource on the video element.
+      this.eventManager_.listenOnce(
+          mediaSource, 'sourceopen', () => this.onSourceOpen_(p));
 
-    // Store the object URL for releasing it later.
-    this.url_ = shaka.media.MediaSourceEngine.createObjectURL(mediaSource);
+      // Correctly set when playback has begun.
+      this.eventManager_.listenOnce(this.video_, 'playing', () => {
+        this.playbackHasBegun_ = true;
+      });
+
+      // Store the object URL for releasing it later.
+      this.url_ = shaka.media.MediaSourceEngine.createObjectURL(mediaSource);
 
-    this.video_.src = this.url_;
+      this.video_.src = this.url_;
 
-    return mediaSource;
+      return mediaSource;
+    }
   }
 
   /**
-   * @param {!shaka.util.PublicPromise} p
+   * @param {shaka.util.PublicPromise} p
    * @private
    */
   onSourceOpen_(p) {
@@ -229,9 +262,11 @@ shaka.media.MediaSourceEngine = class {
       'video/mp4; codecs="vp9"',
       'video/mp4; codecs="vp09.00.10.08"',
       'video/mp4; codecs="av01.0.01M.08"',
+      'video/mp4; codecs="dvh1.20.01"',
       'audio/mp4; codecs="mp4a.40.2"',
       'audio/mp4; codecs="ac-3"',
       'audio/mp4; codecs="ec-3"',
+      'audio/mp4; codecs="ac-4"',
       'audio/mp4; codecs="opus"',
       'audio/mp4; codecs="flac"',
       'audio/mp4; codecs="dtsc"', // DTS Digital Surround
@@ -480,8 +515,8 @@ shaka.media.MediaSourceEngine = class {
             shaka.util.Error.Category.MEDIA,
             shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,
             exception,
-            'The mediaSource_ status was' + this.mediaSource_.readyState +
-            'expected \'open\'');
+            'The mediaSource_ status was ' + this.mediaSource_.readyState +
+            ' expected \'open\'');
       }
 
       if (this.sequenceMode_) {
@@ -511,6 +546,16 @@ shaka.media.MediaSourceEngine = class {
     this.config_ = config;
   }
 
+  /**
+   * Indicate if the streaming is allowed by MediaSourceEngine.
+   * If we using MediaSource we allways returns true.
+   *
+   * @return {boolean}
+   */
+  isStreamingAllowed() {
+    return this.streamingAllowed_;
+  }
+
   /**
    * Reinitialize the TextEngine for a new text type.
    * @param {string} mimeType
@@ -739,7 +784,7 @@ shaka.media.MediaSourceEngine = class {
     } else if (!mimeType.includes('/mp4') && !mimeType.includes('/webm') &&
         shaka.util.TsParser.probe(uint8ArrayData)) {
       const tsParser = new shaka.util.TsParser().parse(uint8ArrayData);
-      const startTime = tsParser.getStartTime()[contentType];
+      const startTime = tsParser.getStartTime(contentType);
       if (startTime != null) {
         timestamp = startTime;
       }
@@ -786,7 +831,8 @@ shaka.media.MediaSourceEngine = class {
       await this.textEngine_.appendBuffer(
           data,
           reference ? reference.startTime : null,
-          reference ? reference.endTime : null);
+          reference ? reference.endTime : null,
+          reference ? reference.getUris()[0] : null);
       return;
     }
 
@@ -809,7 +855,7 @@ shaka.media.MediaSourceEngine = class {
 
     let mimeType = this.sourceBufferTypes_[contentType];
     if (this.transmuxers_[contentType]) {
-      mimeType = this.transmuxers_[contentType].getOrginalMimeType();
+      mimeType = this.transmuxers_[contentType].getOriginalMimeType();
     }
     if (reference) {
       const timestamp = this.getTimestampAndDispatchMetadata_(
@@ -818,7 +864,9 @@ shaka.media.MediaSourceEngine = class {
         const calculatedTimestampOffset = reference.startTime - timestamp;
         const timestampOffsetDifference =
             Math.abs(timestampOffset - calculatedTimestampOffset);
-        if (timestampOffsetDifference >= 0.1 || seeked || adaptation) {
+        if ((timestampOffsetDifference >= 0.1 || seeked || adaptation) &&
+            (!isChunkedData || calculatedTimestampOffset > 0 ||
+            !timestampOffset)) {
           timestampOffset = calculatedTimestampOffset;
           if (this.attemptTimestampOffsetCalculation_) {
             this.enqueueOperation_(
@@ -1778,6 +1826,9 @@ shaka.media.MediaSourceEngine = class {
    * @private
    */
   async codecSwitchIfNecessary_(contentType, stream, streamsByType) {
+    if (contentType == shaka.util.ManifestParserUtils.ContentType.TEXT) {
+      return false;
+    }
     const MimeUtils = shaka.util.MimeUtils;
     const currentCodec = MimeUtils.getCodecBase(
         MimeUtils.getCodecs(this.sourceBufferTypes_[contentType]));
@@ -1840,6 +1891,9 @@ shaka.media.MediaSourceEngine = class {
    * @private
    */
   isCodecSwitchNecessary_(contentType, stream) {
+    if (contentType == shaka.util.ManifestParserUtils.ContentType.TEXT) {
+      return false;
+    }
     const MimeUtils = shaka.util.MimeUtils;
     const currentCodec = MimeUtils.getCodecBase(
         MimeUtils.getCodecs(this.sourceBufferTypes_[contentType]));

package/lib/media/play_rate_controller.js

@@ -6,7 +6,6 @@
 
 goog.provide('shaka.media.PlayRateController');
 
-goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.util.IReleasable');
 goog.require('shaka.util.Timer');
@@ -17,8 +16,6 @@ goog.require('shaka.util.Timer');
  * the playback rate on the media element can change outside of the controller,
  * the playback controller will need to be updated to stay in-sync.
  *
- * TODO: Try not to manage buffering above the browser with playbackRate=0.
- *
  * @implements {shaka.util.IReleasable}
  * @final
  */
@@ -30,9 +27,6 @@ shaka.media.PlayRateController = class {
     /** @private {?shaka.media.PlayRateController.Harness} */
     this.harness_ = harness;
 
-    /** @private {boolean} */
-    this.isBuffering_ = false;
-
     /** @private {number} */
     this.rate_ = this.harness_.getRate();
 
@@ -56,25 +50,15 @@ shaka.media.PlayRateController = class {
   }
 
   /**
-   * Sets the buffering flag, which controls the effective playback rate.
-   *
-   * @param {boolean} isBuffering If true, forces playback rate to 0 internally.
-   */
-  setBuffering(isBuffering) {
-    this.isBuffering_ = isBuffering;
-    this.apply_();
-  }
-
-  /**
-   * Set the playback rate. This rate will only be used as provided when the
-   * player is not buffering. You should never set the rate to 0.
+   * Set the playback rate.
    *
    * @param {number} rate
    */
   set(rate) {
-    goog.asserts.assert(rate != 0, 'Should never set rate of 0 explicitly!');
-    this.rate_ = rate;
-    this.apply_();
+    if (this.rate_ != rate) {
+      this.rate_ = rate;
+      this.apply_();
+    }
   }
 
   /**
@@ -108,14 +92,11 @@ shaka.media.PlayRateController = class {
     // Always stop the timer. We may not start it again.
     this.timer_.stop();
 
-    /** @type {number} */
-    const rate = this.calculateCurrentRate_();
+    shaka.log.v1('Changing effective playback rate to', this.rate_);
 
-    shaka.log.v1('Changing effective playback rate to', rate);
-
-    if (rate >= 0) {
+    if (this.rate_ >= 0) {
       try {
-        this.applyRate_(rate);
+        this.applyRate_(this.rate_);
         return;
       } catch (e) {
         // Fall through to the next clause.
@@ -135,17 +116,6 @@ shaka.media.PlayRateController = class {
     this.applyRate_(0);
   }
 
-  /**
-   * Calculate the rate that the controller wants the media element to have
-   * based on the current state of the controller.
-   *
-   * @return {number}
-   * @private
-   */
-  calculateCurrentRate_() {
-    return this.isBuffering_ ? 0 : this.rate_;
-  }
-
   /**
    * If the new rate is different than the media element's playback rate, this
    * will change the playback rate. If the rate does not need to change, it will

package/lib/media/presentation_timeline.js

@@ -619,7 +619,9 @@ shaka.media.PresentationTimeline = class {
  * @typedef {{
  *   start: number,
  *   unscaledStart: number,
- *   end: number
+ *   end: number,
+ *   partialSegments: number,
+ *   segmentPosition: number
  * }}
  *
  * @description
@@ -631,6 +633,10 @@ shaka.media.PresentationTimeline = class {
  *   The start time of the range in representation timescale units.
  * @property {number} end
  *   The end time (exclusive) of the range.
+ * @property {number} partialSegments
+ *   The number of partial segments
+ * @property {number} segmentPosition
+ *   The segment position of the timeline entry as it appears in the manifest
  *
  * @export
  */

package/lib/media/quality_observer.js

@@ -261,7 +261,7 @@ shaka.media.QualityObserver.QualityChangePosition;
   *
   * @description
   * Contains media quality information for a specific content type
-  * e.g video or audio.
+  * e.g. video or audio.
   *
   * @property {!Array.<shaka.media.QualityObserver.QualityChangePosition>}
   * qualityChangePositions

package/lib/media/segment_index.js

@@ -582,7 +582,7 @@ shaka.media.SegmentIterator = class {
     // new references in merge(), the pointers may not make sense any more.
     // This adjusts the invalid pointer values to point to the next newly added
     // segment or partial segment.
-    if (ref && ref.hasPartialSegments() && ref.getUris().length &&
+    if (ref && ref.hasPartialSegments() && ref.hasAllPartialSegments() &&
         this.currentPartialPosition_ >= ref.partialReferences.length) {
       this.currentPosition_++;
       this.currentPartialPosition_ = 0;
@@ -609,12 +609,12 @@ shaka.media.SegmentIterator = class {
       // If the regular segment contains partial segments, move to the next
       // partial SegmentReference.
       this.currentPartialPosition_++;
-      // If the current regular segment has been published completely (has a
-      // valid Uri), and we've reached the end of its partial segments list,
-      // move to the next regular segment.
+      // 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.getUris().length &&
+      if (ref.hasAllPartialSegments() &&
           this.currentPartialPosition_ == ref.partialReferences.length) {
         this.currentPosition_++;
         this.currentPartialPosition_ = 0;