shaka-player 4.11.13 → 4.12.1

package/lib/media/streaming_engine.js

@@ -27,7 +27,6 @@ goog.require('shaka.util.Destroyer');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IDestroyable');
-goog.require('shaka.util.Id3Utils');
 goog.require('shaka.util.LanguageUtils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MimeUtils');
@@ -93,9 +92,6 @@ shaka.media.StreamingEngine = class {
     /** @private {number} */
     this.textStreamSequenceId_ = 0;
 
-    /** @private {boolean} */
-    this.parsedPrftEventRaised_ = false;
-
     /**
      * Maps a content type, e.g., 'audio', 'video', or 'text', to a MediaState.
      *
@@ -628,6 +624,9 @@ shaka.media.StreamingEngine = class {
       }
     }
 
+    const shouldResetMediaSource =
+        mediaState.stream.isAudioMuxedInVideo != stream.isAudioMuxedInVideo;
+
     mediaState.stream = stream;
     mediaState.segmentIterator = null;
     mediaState.adaptation = !!adaptation;
@@ -635,6 +634,11 @@ shaka.media.StreamingEngine = class {
     const streamTag = shaka.media.StreamingEngine.logPrefix_(mediaState);
     shaka.log.debug('switch: switching to Stream ' + streamTag);
 
+    if (shouldResetMediaSource) {
+      this.resetMediaSource(/* force= */ true, /* clearBuffer= */ false);
+      return;
+    }
+
     if (clearBuffer) {
       if (mediaState.clearingBuffer) {
         // We are already going to clear the buffer, but make sure it is also
@@ -1319,6 +1323,10 @@ shaka.media.StreamingEngine = class {
       this.playerInterface_.mediaSourceEngine.clearSelectedClosedCaptionId();
     }
 
+    if (mediaState.stream.isAudioMuxedInVideo) {
+      return null;
+    }
+
     if (!this.playerInterface_.mediaSourceEngine.isStreamingAllowed() &&
         mediaState.type != ContentType.TEXT) {
       // It is not allowed to add segments yet, so we schedule an update to
@@ -2241,84 +2249,64 @@ shaka.media.StreamingEngine = class {
     const hasClosedCaptions = stream.closedCaptions &&
         stream.closedCaptions.size > 0;
 
-    let parser;
-    const hasEmsg = ((stream.emsgSchemeIdUris != null &&
-      stream.emsgSchemeIdUris.length > 0) ||
-      this.config_.dispatchAllEmsgBoxes);
-    const shouldParsePrftBox =
-      (this.config_.parsePrftBox && !this.parsedPrftEventRaised_);
-
-    const isMP4 = stream.mimeType == 'video/mp4' ||
-            stream.mimeType == 'audio/mp4';
-    let timescale = null;
-    if (reference.initSegmentReference) {
-      timescale = reference.initSegmentReference.timescale;
-    }
-    const shouldFixTimestampOffset = isMP4 && timescale &&
-        stream.type === shaka.util.ManifestParserUtils.ContentType.VIDEO &&
-        this.manifest_.type == shaka.media.ManifestParser.DASH &&
-        this.config_.shouldFixTimestampOffset;
-
-    if (hasEmsg || shouldParsePrftBox || shouldFixTimestampOffset) {
-      parser = new shaka.util.Mp4Parser();
-    }
-
-    if (hasEmsg) {
-      parser
-          .fullBox(
-              'emsg',
-              (box) => this.parseEMSG_(
-                  reference, stream.emsgSchemeIdUris, box));
-    }
-
-    if (shouldParsePrftBox) {
-      parser
-          .fullBox(
-              'prft',
-              (box) => this.parsePrft_(
-                  reference, box));
-    }
-
-    if (shouldFixTimestampOffset) {
-      parser
-          .box('moof', shaka.util.Mp4Parser.children)
-          .box('traf', shaka.util.Mp4Parser.children)
-          .fullBox('tfdt', async (box) => {
-            goog.asserts.assert(
-                box.version != null,
-                'TFDT is a full box and should have a valid version.');
-
-            const parsedTFDT = shaka.util.Mp4BoxParsers.parseTFDTInaccurate(
-                box.reader, box.version);
-
-            const baseMediaDecodeTime = parsedTFDT.baseMediaDecodeTime;
-
-            // In case the time is 0, it is not updated
-            if (!baseMediaDecodeTime) {
-              return;
-            }
-            goog.asserts.assert(typeof(timescale) == 'number',
-                'Should be an number!');
+    if (this.config_.shouldFixTimestampOffset) {
+      let parser;
 
-            const scaledMediaDecodeTime = -baseMediaDecodeTime / timescale;
+      const isMP4 = stream.mimeType == 'video/mp4' ||
+              stream.mimeType == 'audio/mp4';
+      let timescale = null;
+      if (reference.initSegmentReference) {
+        timescale = reference.initSegmentReference.timescale;
+      }
+      const shouldFixTimestampOffset = isMP4 && timescale &&
+          stream.type === shaka.util.ManifestParserUtils.ContentType.VIDEO &&
+          this.manifest_.type == shaka.media.ManifestParser.DASH;
 
-            const comparison1 = Number(mediaState.lastTimestampOffset) || 0;
+      if (shouldFixTimestampOffset) {
+        parser = new shaka.util.Mp4Parser();
+      }
 
-            if (comparison1 < scaledMediaDecodeTime) {
-              const lastAppendWindowStart = mediaState.lastAppendWindowStart;
-              const lastAppendWindowEnd = mediaState.lastAppendWindowEnd;
-              goog.asserts.assert(typeof(lastAppendWindowStart) == 'number',
-                  'Should be an number!');
-              goog.asserts.assert(typeof(lastAppendWindowEnd) == 'number',
+      if (shouldFixTimestampOffset) {
+        parser
+            .box('moof', shaka.util.Mp4Parser.children)
+            .box('traf', shaka.util.Mp4Parser.children)
+            .fullBox('tfdt', async (box) => {
+              goog.asserts.assert(
+                  box.version != null,
+                  'TFDT is a full box and should have a valid version.');
+
+              const parsedTFDT = shaka.util.Mp4BoxParsers.parseTFDTInaccurate(
+                  box.reader, box.version);
+
+              const baseMediaDecodeTime = parsedTFDT.baseMediaDecodeTime;
+
+              // In case the time is 0, it is not updated
+              if (!baseMediaDecodeTime) {
+                return;
+              }
+              goog.asserts.assert(typeof(timescale) == 'number',
                   'Should be an number!');
-              await this.setProperties_(mediaState, scaledMediaDecodeTime,
-                  lastAppendWindowStart, lastAppendWindowEnd, reference);
-            }
-          });
-    }
 
-    if (hasEmsg || shouldParsePrftBox || shouldFixTimestampOffset) {
-      parser.parse(segment, /* partialOkay= */ false, isChunkedData);
+              const scaledMediaDecodeTime = -baseMediaDecodeTime / timescale;
+
+              const comparison1 = Number(mediaState.lastTimestampOffset) || 0;
+
+              if (comparison1 < scaledMediaDecodeTime) {
+                const lastAppendWindowStart = mediaState.lastAppendWindowStart;
+                const lastAppendWindowEnd = mediaState.lastAppendWindowEnd;
+                goog.asserts.assert(typeof(lastAppendWindowStart) == 'number',
+                    'Should be an number!');
+                goog.asserts.assert(typeof(lastAppendWindowEnd) == 'number',
+                    'Should be an number!');
+                await this.setProperties_(mediaState, scaledMediaDecodeTime,
+                    lastAppendWindowStart, lastAppendWindowEnd, reference);
+              }
+            });
+      }
+
+      if (shouldFixTimestampOffset) {
+        parser.parse(segment, /* partialOkay= */ false, isChunkedData);
+      }
     }
 
     await this.evict_(mediaState, presentationTime);
@@ -2343,176 +2331,6 @@ shaka.media.StreamingEngine = class {
     shaka.log.v2(logPrefix, 'appended media segment');
   }
 
-
-  /**
-   * Parse the EMSG box from a MP4 container.
-   *
-   * @param {!shaka.media.SegmentReference} reference
-   * @param {?Array.<string>} emsgSchemeIdUris Array of emsg
-   *     scheme_id_uri for which emsg boxes should be parsed.
-   * @param {!shaka.extern.ParsedBox} box
-   * @private
-   * https://dashif-documents.azurewebsites.net/Events/master/event.html#emsg-format
-   * aligned(8) class DASHEventMessageBox
-   *    extends FullBox(‘emsg’, version, flags = 0){
-   * if (version==0) {
-   *   string scheme_id_uri;
-   *   string value;
-   *   unsigned int(32) timescale;
-   *   unsigned int(32) presentation_time_delta;
-   *   unsigned int(32) event_duration;
-   *   unsigned int(32) id;
-   * } else if (version==1) {
-   *   unsigned int(32) timescale;
-   *   unsigned int(64) presentation_time;
-   *   unsigned int(32) event_duration;
-   *   unsigned int(32) id;
-   *   string scheme_id_uri;
-   *   string value;
-   * }
-   * unsigned int(8) message_data[];
-   */
-  parseEMSG_(reference, emsgSchemeIdUris, box) {
-    let timescale;
-    let id;
-    let eventDuration;
-    let schemeId;
-    let startTime;
-    let presentationTimeDelta;
-    let value;
-
-    if (box.version === 0) {
-      schemeId = box.reader.readTerminatedString();
-      value = box.reader.readTerminatedString();
-      timescale = box.reader.readUint32();
-      presentationTimeDelta = box.reader.readUint32();
-      eventDuration = box.reader.readUint32();
-      id = box.reader.readUint32();
-      startTime = reference.startTime + (presentationTimeDelta / timescale);
-    } else {
-      timescale = box.reader.readUint32();
-      const pts = box.reader.readUint64();
-      startTime = (pts / timescale) + reference.timestampOffset;
-      presentationTimeDelta = startTime - reference.startTime;
-      eventDuration = box.reader.readUint32();
-      id = box.reader.readUint32();
-      schemeId = box.reader.readTerminatedString();
-      value = box.reader.readTerminatedString();
-    }
-    const messageData = box.reader.readBytes(
-        box.reader.getLength() - box.reader.getPosition());
-
-    // See DASH sec. 5.10.3.3.1
-    // If a DASH client detects an event message box with a scheme that is not
-    // defined in MPD, the client is expected to ignore it.
-    if ((emsgSchemeIdUris && emsgSchemeIdUris.includes(schemeId)) ||
-        this.config_.dispatchAllEmsgBoxes) {
-      // See DASH sec. 5.10.4.1
-      // A special scheme in DASH used to signal manifest updates.
-      if (schemeId == 'urn:mpeg:dash:event:2012') {
-        this.playerInterface_.onManifestUpdate();
-      } else {
-        // All other schemes are dispatched as a general 'emsg' event.
-        const endTime = startTime + (eventDuration / timescale);
-        /** @type {shaka.extern.EmsgInfo} */
-        const emsg = {
-          startTime: startTime,
-          endTime: endTime,
-          schemeIdUri: schemeId,
-          value: value,
-          timescale: timescale,
-          presentationTimeDelta: presentationTimeDelta,
-          eventDuration: eventDuration,
-          id: id,
-          messageData: messageData,
-        };
-
-        // Dispatch an event to notify the application about the emsg box.
-        const eventName = shaka.util.FakeEvent.EventName.Emsg;
-        const data = (new Map()).set('detail', emsg);
-        const event = new shaka.util.FakeEvent(eventName, data);
-        // A user can call preventDefault() on a cancelable event.
-        event.cancelable = true;
-
-        this.playerInterface_.onEvent(event);
-
-        if (event.defaultPrevented) {
-          // If the caller uses preventDefault() on the 'emsg' event, don't
-          // process any further, and don't generate an ID3 'metadata' event
-          // for the same data.
-          return;
-        }
-
-        // Additionally, ID3 events generate a 'metadata' event.  This is a
-        // pre-parsed version of the metadata blob already dispatched in the
-        // 'emsg' event.
-        if (schemeId == 'https://aomedia.org/emsg/ID3' ||
-            schemeId == 'https://developer.apple.com/streaming/emsg-id3') {
-          // See https://aomediacodec.github.io/id3-emsg/
-          const frames = shaka.util.Id3Utils.getID3Frames(messageData);
-          if (frames.length) {
-            /** @private {shaka.extern.ID3Metadata} */
-            const metadata = {
-              cueTime: startTime,
-              data: messageData,
-              frames: frames,
-              dts: startTime,
-              pts: startTime,
-            };
-            this.playerInterface_.onMetadata(
-                [metadata], /* offset= */ 0, endTime);
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Parse PRFT box.
-   * @param {!shaka.media.SegmentReference} reference
-   * @param {!shaka.extern.ParsedBox} box
-   * @private
-   */
-  parsePrft_(reference, box) {
-    if (this.parsedPrftEventRaised_ ||
-      !reference.initSegmentReference.timescale) {
-      return;
-    }
-    goog.asserts.assert(
-        box.version == 0 || box.version == 1,
-        'PRFT version can only be 0 or 1');
-    const parsed = shaka.util.Mp4BoxParsers.parsePRFTInaccurate(
-        box.reader, box.version);
-
-    const timescale = reference.initSegmentReference.timescale;
-    const wallClockTime = this.convertNtp(parsed.ntpTimestamp);
-    const programStartDate = new Date(wallClockTime -
-      (parsed.mediaTime / timescale) * 1000);
-    const prftInfo = {
-      wallClockTime,
-      programStartDate,
-    };
-
-    const eventName = shaka.util.FakeEvent.EventName.Prft;
-    const data = (new Map()).set('detail', prftInfo);
-    const event = new shaka.util.FakeEvent(
-        eventName, data);
-    this.playerInterface_.onEvent(event);
-    this.parsedPrftEventRaised_ = true;
-  }
-
-
-  /**
-   * Convert Ntp ntpTimeStamp to UTC Time
-   *
-   * @param {number} ntpTimeStamp
-   * @return {number} utcTime
-   */
-  convertNtp(ntpTimeStamp) {
-    const start = new Date(Date.UTC(1900, 0, 1, 0, 0, 0));
-    return new Date(start.getTime() + ntpTimeStamp).getTime();
-  }
-
   /**
    * Evicts media to meet the max buffer behind limit.
    *
@@ -2896,21 +2714,26 @@ shaka.media.StreamingEngine = class {
   /**
    * Reset Media Source
    *
+   * @param {boolean=} force
    * @return {!Promise.<boolean>}
    */
-  async resetMediaSource() {
+  async resetMediaSource(force = false, clearBuffer = true) {
     const now = (Date.now() / 1000);
     const minTimeBetweenRecoveries = this.config_.minTimeBetweenRecoveries;
-    if (!this.config_.allowMediaSourceRecoveries ||
-        (now - this.lastMediaSourceReset_) < minTimeBetweenRecoveries) {
-      return false;
+    if (!force) {
+      if (!this.config_.allowMediaSourceRecoveries ||
+          (now - this.lastMediaSourceReset_) < minTimeBetweenRecoveries) {
+        return false;
+      }
+      this.lastMediaSourceReset_ = now;
     }
-    this.lastMediaSourceReset_ = now;
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     const audioMediaState = this.mediaStates_.get(ContentType.AUDIO);
     if (audioMediaState) {
       audioMediaState.lastInitSegmentReference = null;
-      this.forceClearBuffer_(audioMediaState);
+      if (clearBuffer) {
+        this.forceClearBuffer_(audioMediaState);
+      }
       this.abortOperations_(audioMediaState).catch(() => {});
       if (audioMediaState.segmentIterator) {
         audioMediaState.segmentIterator.resetToLastIndependent();
@@ -2919,7 +2742,9 @@ shaka.media.StreamingEngine = class {
     const videoMediaState = this.mediaStates_.get(ContentType.VIDEO);
     if (videoMediaState) {
       videoMediaState.lastInitSegmentReference = null;
-      this.forceClearBuffer_(videoMediaState);
+      if (clearBuffer) {
+        this.forceClearBuffer_(videoMediaState);
+      }
       this.abortOperations_(videoMediaState).catch(() => {});
       if (videoMediaState.segmentIterator) {
         videoMediaState.segmentIterator.resetToLastIndependent();
@@ -2937,6 +2762,14 @@ shaka.media.StreamingEngine = class {
       streamsByType.set(ContentType.VIDEO, this.currentVariant_.video);
     }
     await this.playerInterface_.mediaSourceEngine.reset(streamsByType);
+    if (videoMediaState &&
+        !videoMediaState.performingUpdate && !videoMediaState.updateTimer) {
+      this.scheduleUpdate_(videoMediaState, 0);
+    }
+    if (audioMediaState &&
+          !audioMediaState.performingUpdate && !audioMediaState.updateTimer) {
+      this.scheduleUpdate_(audioMediaState, 0);
+    }
     return true;
   }
 
@@ -3006,13 +2839,11 @@ shaka.media.StreamingEngine = class {
  *   netEngine: shaka.net.NetworkingEngine,
  *   onError: function(!shaka.util.Error),
  *   onEvent: function(!Event),
- *   onManifestUpdate: function(),
  *   onSegmentAppended: function(!shaka.media.SegmentReference,
  *     !shaka.extern.Stream),
  *   onInitSegmentAppended: function(!number,!shaka.media.InitSegmentReference),
  *   beforeAppendSegment: function(
  *     shaka.util.ManifestParserUtils.ContentType,!BufferSource):Promise,
- *   onMetadata: !function(!Array.<shaka.extern.ID3Metadata>, number, ?number),
  *   disableStream: function(!shaka.extern.Stream, number):boolean
  * }}
  *
@@ -3033,8 +2864,6 @@ shaka.media.StreamingEngine = class {
  *   StreamingEngine.switch*() or StreamingEngine.seeked() to attempt recovery.
  * @property {function(!Event)} onEvent
  *   Called when an event occurs that should be sent to the app.
- * @property {function()} onManifestUpdate
- *   Called when an embedded 'emsg' box should trigger a manifest update.
  * @property {function(!shaka.media.SegmentReference,
  *     !shaka.extern.Stream)} onSegmentAppended
  *   Called after a segment is successfully appended to a MediaSource.
@@ -3044,9 +2873,6 @@ shaka.media.StreamingEngine = class {
  * @property {!function(shaka.util.ManifestParserUtils.ContentType,
  *   !BufferSource):Promise} beforeAppendSegment
  *   A function called just before appending to the source buffer.
- * @property
- *  {!function(!Array.<shaka.extern.ID3Metadata>, number, ?number)} onMetadata
- *   Called when an ID3 is found in a EMSG.
  * @property {function(!shaka.extern.Stream, number):boolean} disableStream
  *   Called to temporarily disable a stream i.e. disabling all variant
  *   containing said stream.

package/lib/mss/mss_parser.js

@@ -605,6 +605,7 @@ shaka.mss.MssParser = class {
       external: false,
       fastSwitching: false,
       fullMimeTypes: new Set(),
+      isAudioMuxedInVideo: false,
     };
 
     // This is specifically for text tracks.

package/lib/offline/download_info.js

@@ -45,7 +45,11 @@ shaka.offline.DownloadInfo = class {
   static idForSegmentRef(ref) {
     // Escape the URIs using encodeURI, to make sure that a weirdly formed URI
     // cannot cause two unrelated refs to be considered equivalent.
-    return ref.getUris().map((uri) => '{' + encodeURI(uri) + '}').join('') +
+    const removeSprites = (uri) => {
+      return uri.split('#xywh=')[0];
+    };
+    return ref.getUris().map(
+        (uri) => '{' + encodeURI(removeSprites(uri)) + '}').join('') +
         ':' + ref.startByte + ':' + ref.endByte;
   }
 

package/lib/offline/indexeddb/storage_mechanism.js

@@ -392,9 +392,10 @@ shaka.offline.indexeddb.StorageMechanism.SESSION_ID_STORE = 'session-ids';
 shaka.offline.StorageMuxer.register(
     'idb',
     () => {
-      // Offline storage is not supported on the Chromecast or Xbox One
-      // platforms.
-      if (shaka.util.Platform.isChromecast() ||
+      // Offline storage is not supported on the Chromecast Linux/Fuschia or
+      // Xbox One platforms.
+      if ((shaka.util.Platform.isChromecast() &&
+          !shaka.util.Platform.isAndroidCastDevice()) ||
           shaka.util.Platform.isXboxOne()) {
         return null;
       }

package/lib/offline/indexeddb/v1_storage_cell.js

@@ -182,6 +182,7 @@ shaka.offline.indexeddb.V1StorageCell = class
       tilesLayout: undefined,
       external: false,
       fastSwitching: false,
+      isAudioMuxedInVideo: false,
     };
   }
 
@@ -214,6 +215,7 @@ shaka.offline.indexeddb.V1StorageCell = class
       tilesLayout: '',
       mimeType: null,
       codecs: null,
+      thumbnailSprite: null,
     };
   }
 

package/lib/offline/indexeddb/v2_storage_cell.js

@@ -131,6 +131,7 @@ shaka.offline.indexeddb.V2StorageCell = class
       tilesLayout: undefined,
       external: false,
       fastSwitching: false,
+      isAudioMuxedInVideo: false,
     };
   }
 
@@ -158,6 +159,7 @@ shaka.offline.indexeddb.V2StorageCell = class
       tilesLayout: '',
       mimeType: null,
       codecs: null,
+      thumbnailSprite: null,
     };
   }
 };

package/lib/offline/manifest_converter.js

@@ -221,6 +221,7 @@ shaka.offline.ManifestConverter = class {
       fastSwitching: streamDB.fastSwitching,
       fullMimeTypes: new Set([shaka.util.MimeUtils.getFullType(
           streamDB.mimeType, streamDB.codecs)]),
+      isAudioMuxedInVideo: false,
     };
 
     return stream;
@@ -255,6 +256,9 @@ shaka.offline.ManifestConverter = class {
         segmentDB.tilesLayout || '');
     ref.mimeType = segmentDB.mimeType || streamDB.mimeType || '';
     ref.codecs = segmentDB.codecs || streamDB.codecs || '';
+    if (segmentDB.thumbnailSprite) {
+      ref.setThumbnailSprite(segmentDB.thumbnailSprite);
+    }
     return ref;
   }