shaka-player 4.13.0 → 4.13.2

package/lib/media/content_workarounds.js

@@ -347,6 +347,52 @@ shaka.media.ContentWorkarounds = class {
       boxView.setUint32(ContentWorkarounds.BOX_SIZE_OFFSET_, newBoxSize);
     }
   }
+
+  /**
+   * Transform the init segment into a new init segment buffer that indicates
+   * EC-3 as audio codec instead of AC-3. Even though any EC-3 decoder should
+   * be able to decode AC-3 streams, there are platforms that do not accept
+   * AC-3 as codec.
+   *
+   * Should only be called for MP4 init segments, and only on platforms that
+   * need this workaround. Returns a new buffer containing the modified init
+   * segment.
+   *
+   * @param {!BufferSource} initSegmentBuffer
+   * @return {!Uint8Array}
+   */
+  static fakeEC3(initSegmentBuffer) {
+    const ContentWorkarounds = shaka.media.ContentWorkarounds;
+    const initSegment = shaka.util.BufferUtils.toUint8(initSegmentBuffer);
+    const ancestorBoxes = [];
+
+    const onSimpleAncestorBox = (box) => {
+      ancestorBoxes.push({start: box.start, size: box.size});
+      shaka.util.Mp4Parser.children(box);
+    };
+
+    new shaka.util.Mp4Parser()
+        .box('moov', onSimpleAncestorBox)
+        .box('trak', onSimpleAncestorBox)
+        .box('mdia', onSimpleAncestorBox)
+        .box('minf', onSimpleAncestorBox)
+        .box('stbl', onSimpleAncestorBox)
+        .box('stsd', (box) => {
+          ancestorBoxes.push({start: box.start, size: box.size});
+          const stsdBoxView = shaka.util.BufferUtils.toDataView(
+              initSegment, box.start);
+          for (let i=0; i<box.size; i++) {
+            const codecTag = stsdBoxView.getUint32(i);
+            if (codecTag == ContentWorkarounds.BOX_TYPE_AC_3_) {
+              stsdBoxView.setUint32(i, ContentWorkarounds.BOX_TYPE_EC_3_);
+            } else if (codecTag == ContentWorkarounds.BOX_TYPE_DAC3_) {
+              stsdBoxView.setUint32(i, ContentWorkarounds.BOX_TYPE_DEC3_);
+            }
+          }
+        }).parse(initSegment);
+
+    return initSegment;
+  }
 };
 
 /**
@@ -482,3 +528,35 @@ shaka.media.ContentWorkarounds.BOX_TYPE_ENCV_ = 0x656e6376;
  * @private
  */
 shaka.media.ContentWorkarounds.BOX_TYPE_ENCA_ = 0x656e6361;
+
+/**
+ * Box type for "ac-3".
+ *
+ * @const {number}
+ * @private
+ */
+shaka.media.ContentWorkarounds.BOX_TYPE_AC_3_ = 0x61632d33;
+
+/**
+ * Box type for "dac3".
+ *
+ * @const {number}
+ * @private
+ */
+shaka.media.ContentWorkarounds.BOX_TYPE_DAC3_ = 0x64616333;
+
+/**
+ * Box type for "ec-3".
+ *
+ * @const {number}
+ * @private
+ */
+shaka.media.ContentWorkarounds.BOX_TYPE_EC_3_ = 0x65632d33;
+
+/**
+ * Box type for "dec3".
+ *
+ * @const {number}
+ * @private
+ */
+shaka.media.ContentWorkarounds.BOX_TYPE_DEC3_ = 0x64656333;

package/lib/media/example_based_criteria.js

@@ -22,10 +22,11 @@ shaka.media.ExampleBasedCriteria = class {
    *        } adaptationSetCriteriaFactory
    */
   constructor(example, codecSwitchingStrategy, adaptationSetCriteriaFactory) {
-    // We can't know if role and label are really important, so we don't use
-    // role and label for this.
+    // We can't know if role and video label are really important, so we don't
+    // use role and video label for this.
     const role = '';
-    const audioLabel = '';
+    const audioLabel = example.audio && example.audio.label ?
+        example.audio.label : '';
     const videoLabel = '';
     const hdrLevel = example.video && example.video.hdr ?
         example.video.hdr : '';

package/lib/media/manifest_parser.js

@@ -42,7 +42,7 @@ shaka.media.ManifestParser = class {
    * @export
    */
   static registerParserByMime(mimeType, parserFactory) {
-    shaka.media.ManifestParser.parsersByMime[mimeType] = parserFactory;
+    shaka.media.ManifestParser.parsersByMime.set(mimeType, parserFactory);
   }
 
   /**
@@ -52,7 +52,7 @@ shaka.media.ManifestParser = class {
    * @export
    */
   static unregisterParserByMime(mimeType) {
-    delete shaka.media.ManifestParser.parsersByMime[mimeType];
+    shaka.media.ManifestParser.parsersByMime.delete(mimeType);
   }
 
 
@@ -68,7 +68,7 @@ shaka.media.ManifestParser = class {
     // Make sure all registered parsers are shown, but only for MSE-enabled
     // platforms where our parsers matter.
     if (shaka.util.Platform.supportsMediaSource()) {
-      for (const type in ManifestParser.parsersByMime) {
+      for (const type of ManifestParser.parsersByMime.keys()) {
         support[type] = true;
       }
     }
@@ -89,7 +89,7 @@ shaka.media.ManifestParser = class {
       // Only query our parsers for MSE-enabled platforms.  Otherwise, query a
       // temporary media element for native support for these types.
       if (shaka.util.Platform.supportsMediaSource()) {
-        support[type] = !!ManifestParser.parsersByMime[type];
+        support[type] = ManifestParser.parsersByMime.has(type);
       } else {
         support[type] = shaka.util.Platform.supportsMediaType(type);
       }
@@ -112,7 +112,7 @@ shaka.media.ManifestParser = class {
 
     // Try using the MIME type we were given.
     if (mimeType) {
-      const factory = ManifestParser.parsersByMime[mimeType.toLowerCase()];
+      const factory = ManifestParser.parsersByMime.get(mimeType.toLowerCase());
       if (factory) {
         return factory;
       }
@@ -145,11 +145,7 @@ shaka.media.ManifestParser = class {
       return false;
     }
 
-    if (mimeType in shaka.media.ManifestParser.parsersByMime) {
-      return true;
-    }
-
-    return false;
+    return shaka.media.ManifestParser.parsersByMime.has(mimeType);
   }
 };
 
@@ -191,8 +187,8 @@ shaka.media.ManifestParser.AccessibilityPurpose = {
 /**
  * Contains the parser factory functions indexed by MIME type.
  *
- * @type {!Object<string, shaka.extern.ManifestParser.Factory>}
+ * @type {!Map<string, shaka.extern.ManifestParser.Factory>}
  */
-shaka.media.ManifestParser.parsersByMime = {};
+shaka.media.ManifestParser.parsersByMime = new Map();