shaka-player 4.4.0 → 4.4.1

package/externs/shaka/namespace.js

@@ -6,8 +6,8 @@
 
 /**
  * @externs
- * @suppress {duplicate} To prevent compiler errors with the namespace
- *   being declared both here and by goog.provide in the library.
+ * @suppress {constantProperty, duplicate} To prevent compiler errors with the
+ *   namespace being declared both here and by goog.provide in the library.
  */
 
 /** @namespace */

package/externs/shaka/transmuxer.js

@@ -46,9 +46,10 @@ shaka.extern.Transmuxer = class {
    * @param {?shaka.media.SegmentReference} reference The segment reference, or
    *   null for init segments
    * @param {number} duration
+   * @param {string} contentType
    * @return {!Promise.<!Uint8Array>}
    */
-  transmux(data, stream, reference, duration) {}
+  transmux(data, stream, reference, duration, contentType) {}
 };
 
 

package/lib/hls/hls_parser.js

@@ -1466,6 +1466,7 @@ shaka.hls.HlsParser = class {
       // and no video codec, so it should be audio.
       type = ContentType.AUDIO;
       shaka.log.debug('Guessing audio-only.');
+      ignoreStream = res.audio.length > 0;
     } else if (!streamInfos.length && audioCodecs && videoCodecs) {
       // There are both audio and video codecs, so assume multiplexed content.
       // Note that the default used when CODECS is missing assumes multiple

package/lib/media/media_source_engine.js

@@ -821,7 +821,7 @@ shaka.media.MediaSourceEngine = class {
 
     if (this.transmuxers_[contentType]) {
       data = await this.transmuxers_[contentType].transmux(
-          data, stream, reference, this.mediaSource_.duration);
+          data, stream, reference, this.mediaSource_.duration, contentType);
     }
 
     data = this.workAroundBrokenPlatforms_(
@@ -1562,16 +1562,34 @@ shaka.media.MediaSourceEngine = class {
    * @private
    */
   async reset_(streamsByType) {
+    const Functional = shaka.util.Functional;
     this.reloadingMediaSource_ = true;
     const currentTime = this.video_.currentTime;
     try {
       this.eventManager_.removeAll();
-      this.sourceBuffers_ = {};
 
       const cleanup = [];
       for (const contentType in this.transmuxers_) {
         cleanup.push(this.transmuxers_[contentType].destroy());
       }
+      for (const contentType in this.queues_) {
+        // Make a local copy of the queue and the first item.
+        const q = this.queues_[contentType];
+        const inProgress = q[0];
+
+        // Drop everything else out of the original queue.
+        this.queues_[contentType] = q.slice(0, 1);
+
+        // We will wait for this item to complete/fail.
+        if (inProgress) {
+          cleanup.push(inProgress.p.catch(Functional.noop));
+        }
+
+        // The rest will be rejected silently if possible.
+        for (const item of q.slice(1)) {
+          item.p.reject(shaka.util.Destroyer.destroyedError());
+        }
+      }
       for (const contentType in this.sourceBuffers_) {
         const sourceBuffer = this.sourceBuffers_[contentType];
         try {
@@ -1580,6 +1598,8 @@ shaka.media.MediaSourceEngine = class {
       }
       await Promise.all(cleanup);
       this.transmuxers_ = {};
+      this.queues_ = {};
+      this.sourceBuffers_ = {};
 
       const previousDuration = this.mediaSource_.duration;
       this.mediaSourceOpen_ = new shaka.util.PublicPromise();

package/lib/mss/mss_parser.js

@@ -635,6 +635,7 @@ shaka.mss.MssParser = class {
         const streamInfo = {
           id: stream.id,
           type: stream.type,
+          codecs: stream.codecs,
           encrypted: stream.encrypted,
           timescale: stream.mssPrivateData.timescale,
           duration: stream.mssPrivateData.duration,

package/lib/player.js

@@ -7224,7 +7224,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v4.4.0-uncompiled';
+shaka.Player.version = 'v4.4.1-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/simple_text_displayer.js

@@ -51,7 +51,6 @@ shaka.text.SimpleTextDisplayer = class {
       // kinds which can be displayed in the app's UI.
       this.textTrack_ = video.addTextTrack(
           'subtitles', shaka.Player.TextTrackLabel);
-      console.log(this.textTrack_);
     }
     this.textTrack_.mode = 'hidden';
   }

package/lib/transmuxer/aac_transmuxer.js

@@ -145,7 +145,6 @@ shaka.transmuxer.AacTransmuxer = class {
     }
     stream.audioSamplingRate = info.sampleRate;
     stream.channelsCount = info.channelCount;
-    stream.codecs = info.codec;
 
     /** @type {!Array.<shaka.util.Mp4Generator.Mp4Sample>} */
     const samples = [];
@@ -189,6 +188,7 @@ shaka.transmuxer.AacTransmuxer = class {
     const streamInfo = {
       id: stream.id,
       type: shaka.util.ManifestParserUtils.ContentType.AUDIO,
+      codecs: info.codec,
       encrypted: stream.encrypted && stream.drmInfos.length > 0,
       timescale: sampleRate,
       duration: duration,

package/lib/transmuxer/ac3_transmuxer.js

@@ -177,6 +177,7 @@ shaka.transmuxer.Ac3Transmuxer = class {
     const streamInfo = {
       id: stream.id,
       type: shaka.util.ManifestParserUtils.ContentType.AUDIO,
+      codecs: 'ac-3',
       encrypted: stream.encrypted && stream.drmInfos.length > 0,
       timescale: sampleRate,
       duration: duration,

package/lib/transmuxer/ec3_transmuxer.js

@@ -177,6 +177,7 @@ shaka.transmuxer.Ec3Transmuxer = class {
     const streamInfo = {
       id: stream.id,
       type: shaka.util.ManifestParserUtils.ContentType.AUDIO,
+      codecs: 'ec-3',
       encrypted: stream.encrypted && stream.drmInfos.length > 0,
       timescale: sampleRate,
       duration: duration,

package/lib/transmuxer/mp3_transmuxer.js

@@ -169,6 +169,7 @@ shaka.transmuxer.Mp3Transmuxer = class {
     const streamInfo = {
       id: stream.id,
       type: shaka.util.ManifestParserUtils.ContentType.AUDIO,
+      codecs: 'mp3',
       encrypted: stream.encrypted && stream.drmInfos.length > 0,
       timescale: sampleRate,
       duration: duration,

package/lib/transmuxer/ts_transmuxer.js

@@ -159,7 +159,8 @@ shaka.transmuxer.TsTransmuxer = class {
    * @override
    * @export
    */
-  transmux(data, stream, reference, duration) {
+  transmux(data, stream, reference, duration, contentType) {
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
     if (!this.tsParser_) {
       this.tsParser_ = new shaka.util.TsParser();
     } else {
@@ -184,42 +185,46 @@ shaka.transmuxer.TsTransmuxer = class {
     const codecs = tsParser.getCodecs();
     try {
       let streamInfo = null;
-      switch (codecs.video) {
-        case 'avc':
-          streamInfo =
-            this.getAvcStreamInfo_(tsParser, timestamp, stream, duration);
-          break;
-      }
-      if (streamInfo) {
-        streamInfos.push(streamInfo);
-        streamInfo = null;
-      }
-      const isMuxed = !!(codecs.video && codecs.audio);
-      switch (codecs.audio) {
-        case 'aac':
-          streamInfo =
-            this.getAacStreamInfo_(
-                tsParser, timestamp, stream, duration, isMuxed);
-          break;
-        case 'ac3':
-          streamInfo =
-            this.getAc3StreamInfo_(
-                tsParser, timestamp, stream, duration, isMuxed);
-          break;
-        case 'ec3':
-          streamInfo =
-            this.getEc3StreamInfo_(
-                tsParser, timestamp, stream, duration, isMuxed);
-          break;
-        case 'mp3':
-          streamInfo =
-            this.getMp3StreamInfo_(
-                tsParser, timestamp, stream, duration, isMuxed);
-          break;
+      if (contentType == ContentType.VIDEO) {
+        switch (codecs.video) {
+          case 'avc':
+            streamInfo =
+              this.getAvcStreamInfo_(
+                  tsParser, timestamp, stream, duration);
+            break;
+        }
+        if (streamInfo) {
+          streamInfos.push(streamInfo);
+          streamInfo = null;
+        }
       }
-      if (streamInfo) {
-        streamInfos.push(streamInfo);
-        streamInfo = null;
+      if (contentType == ContentType.AUDIO) {
+        switch (codecs.audio) {
+          case 'aac':
+            streamInfo =
+              this.getAacStreamInfo_(
+                  tsParser, timestamp, stream, duration);
+            break;
+          case 'ac3':
+            streamInfo =
+              this.getAc3StreamInfo_(
+                  tsParser, timestamp, stream, duration);
+            break;
+          case 'ec3':
+            streamInfo =
+              this.getEc3StreamInfo_(
+                  tsParser, timestamp, stream, duration);
+            break;
+          case 'mp3':
+            streamInfo =
+              this.getMp3StreamInfo_(
+                  tsParser, timestamp, stream, duration);
+            break;
+        }
+        if (streamInfo) {
+          streamInfos.push(streamInfo);
+          streamInfo = null;
+        }
       }
     } catch (e) {
       return Promise.reject(e);
@@ -253,11 +258,10 @@ shaka.transmuxer.TsTransmuxer = class {
    * @param {number} timestamp
    * @param {shaka.extern.Stream} stream
    * @param {number} duration
-   * @param {boolean} isMuxed
    * @return {shaka.util.Mp4Generator.StreamInfo}
    * @private
    */
-  getAacStreamInfo_(tsParser, timestamp, stream, duration, isMuxed) {
+  getAacStreamInfo_(tsParser, timestamp, stream, duration) {
     const ADTS = shaka.transmuxer.ADTS;
 
     /** @type {!Array.<shaka.util.Mp4Generator.Mp4Sample>} */
@@ -280,7 +284,6 @@ shaka.transmuxer.TsTransmuxer = class {
       }
       stream.audioSamplingRate = info.sampleRate;
       stream.channelsCount = info.channelCount;
-      stream.codecs = info.codec;
 
       while (offset < data.length) {
         const header = ADTS.parseHeader(data, offset);
@@ -325,13 +328,10 @@ shaka.transmuxer.TsTransmuxer = class {
     /** @type {number} */
     const baseMediaDecodeTime = Math.floor(timestamp * sampleRate / 1000);
 
-    let id = stream.id;
-    if (isMuxed) {
-      id += shaka.transmuxer.TsTransmuxer.START_ID_FOR_MUXED_CONTENT_;
-    }
     return {
-      id: id,
+      id: stream.id,
       type: shaka.util.ManifestParserUtils.ContentType.AUDIO,
+      codecs: info.codec,
       encrypted: stream.encrypted && stream.drmInfos.length > 0,
       timescale: sampleRate,
       duration: duration,
@@ -353,11 +353,10 @@ shaka.transmuxer.TsTransmuxer = class {
    * @param {number} timestamp
    * @param {shaka.extern.Stream} stream
    * @param {number} duration
-   * @param {boolean} isMuxed
    * @return {shaka.util.Mp4Generator.StreamInfo}
    * @private
    */
-  getAc3StreamInfo_(tsParser, timestamp, stream, duration, isMuxed) {
+  getAc3StreamInfo_(tsParser, timestamp, stream, duration) {
     const Ac3 = shaka.transmuxer.Ac3;
 
     /** @type {!Array.<shaka.util.Mp4Generator.Mp4Sample>} */
@@ -415,13 +414,10 @@ shaka.transmuxer.TsTransmuxer = class {
     /** @type {number} */
     const baseMediaDecodeTime = Math.floor(timestamp * sampleRate / 1000);
 
-    let id = stream.id;
-    if (isMuxed) {
-      id += shaka.transmuxer.TsTransmuxer.START_ID_FOR_MUXED_CONTENT_;
-    }
     return {
-      id: id,
+      id: stream.id,
       type: shaka.util.ManifestParserUtils.ContentType.AUDIO,
+      codecs: 'ac-3',
       encrypted: stream.encrypted && stream.drmInfos.length > 0,
       timescale: sampleRate,
       duration: duration,
@@ -443,11 +439,10 @@ shaka.transmuxer.TsTransmuxer = class {
    * @param {number} timestamp
    * @param {shaka.extern.Stream} stream
    * @param {number} duration
-   * @param {boolean} isMuxed
    * @return {shaka.util.Mp4Generator.StreamInfo}
    * @private
    */
-  getEc3StreamInfo_(tsParser, timestamp, stream, duration, isMuxed) {
+  getEc3StreamInfo_(tsParser, timestamp, stream, duration) {
     const Ec3 = shaka.transmuxer.Ec3;
 
     /** @type {!Array.<shaka.util.Mp4Generator.Mp4Sample>} */
@@ -505,13 +500,10 @@ shaka.transmuxer.TsTransmuxer = class {
     /** @type {number} */
     const baseMediaDecodeTime = Math.floor(timestamp * sampleRate / 1000);
 
-    let id = stream.id;
-    if (isMuxed) {
-      id += shaka.transmuxer.TsTransmuxer.START_ID_FOR_MUXED_CONTENT_;
-    }
     return {
-      id: id,
+      id: stream.id,
       type: shaka.util.ManifestParserUtils.ContentType.AUDIO,
+      codecs: 'ec-3',
       encrypted: stream.encrypted && stream.drmInfos.length > 0,
       timescale: sampleRate,
       duration: duration,
@@ -533,11 +525,10 @@ shaka.transmuxer.TsTransmuxer = class {
    * @param {number} timestamp
    * @param {shaka.extern.Stream} stream
    * @param {number} duration
-   * @param {boolean} isMuxed
    * @return {shaka.util.Mp4Generator.StreamInfo}
    * @private
    */
-  getMp3StreamInfo_(tsParser, timestamp, stream, duration, isMuxed) {
+  getMp3StreamInfo_(tsParser, timestamp, stream, duration) {
     const MpegAudio = shaka.transmuxer.MpegAudio;
 
     /** @type {!Array.<shaka.util.Mp4Generator.Mp4Sample>} */
@@ -590,13 +581,10 @@ shaka.transmuxer.TsTransmuxer = class {
     /** @type {number} */
     const baseMediaDecodeTime = Math.floor(timestamp * sampleRate / 1000);
 
-    let id = stream.id;
-    if (isMuxed) {
-      id += shaka.transmuxer.TsTransmuxer.START_ID_FOR_MUXED_CONTENT_;
-    }
     return {
-      id: id,
+      id: stream.id,
       type: shaka.util.ManifestParserUtils.ContentType.AUDIO,
+      codecs: 'mp3',
       encrypted: stream.encrypted && stream.drmInfos.length > 0,
       timescale: sampleRate,
       duration: duration,
@@ -686,6 +674,7 @@ shaka.transmuxer.TsTransmuxer = class {
     return {
       id: stream.id,
       type: shaka.util.ManifestParserUtils.ContentType.VIDEO,
+      codecs: 'avc1',
       encrypted: stream.encrypted && stream.drmInfos.length > 0,
       timescale: timescale,
       duration: duration,
@@ -725,12 +714,6 @@ shaka.transmuxer.TsTransmuxer.SUPPORTED_VIDEO_CODECS_ = [
   'avc',
 ];
 
-/**
- * @private
- * @const {number}
- */
-shaka.transmuxer.TsTransmuxer.START_ID_FOR_MUXED_CONTENT_ = 128;
-
 
 shaka.transmuxer.TransmuxerEngine.registerTransmuxer(
     'video/mp2t',

package/lib/util/mp4_generator.js

@@ -55,7 +55,7 @@ shaka.util.Mp4Generator = class {
     return Mp4Generator.box('moov',
         this.mvhd_(firstStreamInfo),
         traks,
-        this.mvex_(firstStreamInfo),
+        this.mvex_(),
         this.pssh_(firstStreamInfo));
   }
 
@@ -130,9 +130,14 @@ shaka.util.Mp4Generator = class {
    */
   tkhd_(streamInfo) {
     const Mp4Generator = shaka.util.Mp4Generator;
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
     const id = streamInfo.id + 1;
-    const width = streamInfo.stream.width || 0;
-    const height = streamInfo.stream.height || 0;
+    let width = streamInfo.stream.width || 0;
+    let height = streamInfo.stream.height || 0;
+    if (streamInfo.type == ContentType.AUDIO) {
+      width = 0;
+      height = 0;
+    }
     const duration = streamInfo.duration * streamInfo.timescale;
     const upperWordDuration =
         Math.floor(duration / (Mp4Generator.UINT32_MAX_ + 1));
@@ -295,24 +300,18 @@ shaka.util.Mp4Generator = class {
     let bytes = new Uint8Array([]);
     switch (streamInfo.type) {
       case ContentType.VIDEO:
-        if (streamInfo.stream.codecs.includes('avc1.') ||
-            streamInfo.stream.codecs.includes('avc3.')) {
+        if (streamInfo.codecs.includes('avc1')) {
           bytes = this.avc1_(streamInfo);
-        } else if (streamInfo.stream.codecs.includes('hev1.') ||
-            streamInfo.stream.codecs.includes('hvc1.')) {
+        } else if (streamInfo.codecs.includes('hvc1')) {
           bytes = this.hvc1_(streamInfo);
         }
         break;
       case ContentType.AUDIO:
-        if (streamInfo.stream.mimeType === 'audio/mpeg' ||
-            streamInfo.stream.codecs.includes('mp3') ||
-            streamInfo.stream.codecs.includes('mp4a.40.34')) {
+        if (streamInfo.codecs.includes('mp3')) {
           bytes = this.mp3_(streamInfo);
-        } else if (streamInfo.stream.mimeType === 'audio/ac3' ||
-            streamInfo.stream.codecs.includes('ac-3')) {
+        } else if (streamInfo.codecs.includes('ac-3')) {
           bytes = this.ac3_(streamInfo);
-        } else if (streamInfo.stream.mimeType === 'audio/ec3' ||
-            streamInfo.stream.codecs.includes('ec-3')) {
+        } else if (streamInfo.codecs.includes('ec-3')) {
           bytes = this.ec3_(streamInfo);
         } else {
           bytes = this.mp4a_(streamInfo);
@@ -630,7 +629,7 @@ shaka.util.Mp4Generator = class {
     const audioSamplingRate = streamInfo.stream.audioSamplingRate || 44100;
 
     const audioCodec = shaka.util.ManifestParserUtils.guessCodecs(
-        ContentType.AUDIO, streamInfo.stream.codecs.split(','));
+        ContentType.AUDIO, streamInfo.codecs.split(','));
 
     const samplingFrequencyIndex = {
       96000: 0x0,
@@ -689,13 +688,16 @@ shaka.util.Mp4Generator = class {
   /**
    * Generate a MVEX box
    *
-   * @param {shaka.util.Mp4Generator.StreamInfo} streamInfo
    * @return {!Uint8Array}
    * @private
    */
-  mvex_(streamInfo) {
+  mvex_() {
     const Mp4Generator = shaka.util.Mp4Generator;
-    return Mp4Generator.box('mvex', this.trex_(streamInfo));
+    let trexs = new Uint8Array([]);
+    for (const streamInfo of this.streamInfos_) {
+      trexs = shaka.util.Uint8ArrayUtils.concat(trexs, this.trex_(streamInfo));
+    }
+    return Mp4Generator.box('mvex', trexs);
   }
 
   /**
@@ -765,8 +767,8 @@ shaka.util.Mp4Generator = class {
    * @private
    */
   frma_(streamInfo) {
-    const codec = streamInfo.stream.codecs.substring(
-        0, streamInfo.stream.codecs.indexOf('.'));
+    const codec = streamInfo.codecs.substring(
+        0, streamInfo.codecs.indexOf('.'));
     const Mp4Generator = shaka.util.Mp4Generator;
     const codecNumber = this.stringToCharCode_(codec);
     const bytes = new Uint8Array([
@@ -1290,6 +1292,7 @@ shaka.util.Mp4Generator.DINF_ = new Uint8Array([]);
  * @typedef {{
  *    id: number,
  *    type: string,
+ *    codecs: string,
  *    encrypted: boolean,
  *    timescale: number,
  *    duration: number,
@@ -1304,6 +1307,10 @@ shaka.util.Mp4Generator.DINF_ = new Uint8Array([]);
  *   A unique ID
  * @property {string} type
  *   Indicate the content type: 'video' or 'audio'.
+ * @property {string} codecs
+ *   <i>Defaults to '' (i.e., unknown / not needed).</i> <br>
+ *   The Stream's codecs, e.g., 'avc1.4d4015' or 'vp9'<br>
+ *   See {@link https://tools.ietf.org/html/rfc6381}
  * @property {boolean} encrypted
  *   Indicate if the stream is encrypted.
  * @property {number} timescale