shaka-player 4.7.11 → 4.7.13

package/lib/util/periods.js

@@ -599,14 +599,6 @@ shaka.util.PeriodCombiner = class {
         goog.asserts.assert(match.segmentIndex,
             'stream should have a segmentIndex.');
         if (match.segmentIndex) {
-          match.segmentIndex.forEachTopLevelReference((ref) => {
-            ref.codecs = match.codecs;
-            ref.mimeType = match.mimeType;
-            if (ref.initSegmentReference) {
-              ref.initSegmentReference.codecs = match.codecs;
-              ref.initSegmentReference.mimeType = match.mimeType;
-            }
-          });
           outputStream.segmentIndex.appendSegmentIndex(match.segmentIndex);
         }
       }
@@ -721,39 +713,14 @@ shaka.util.PeriodCombiner = class {
 
       if (used) {
         unusedStreamsPerPeriod[i].delete(match);
-        // Add the codec of this stream to the output stream's codecs.
-        const codecs = new Set(outputStream.codecs.split(','));
-        for (const codec of match.codecs.split(',')) {
-          if (codec) {
-            codecs.add(codec);
+        // Add the full mimetypes to the stream.
+        if (match.fullMimeTypes) {
+          for (const fullMimeType of match.fullMimeTypes.values()) {
+            outputStream.fullMimeTypes.add(fullMimeType);
           }
         }
-        const PeriodCombiner = shaka.util.PeriodCombiner;
-        outputStream.codecs = PeriodCombiner.filterDuplicateCodecs_(
-            Array.from(codecs)).join(',');
-      }
-    }
-  }
-
-  /**
-   * @param {!Array.<string>} codecs
-   * @return {!Array.<string>} codecs
-   * @private
-   */
-  static filterDuplicateCodecs_(codecs) {
-    // Filter out duplicate codecs.
-    const seen = new Set();
-    const ret = [];
-    for (const codec of codecs) {
-      const shortCodec = shaka.util.MimeUtils.getCodecBase(codec);
-      if (!seen.has(shortCodec)) {
-        ret.push(codec);
-        seen.add(shortCodec);
-      } else {
-        shaka.log.debug('Ignoring duplicate codec');
       }
     }
-    return ret;
   }
 
   /**
@@ -1578,6 +1545,7 @@ shaka.util.PeriodCombiner = class {
       accessibilityPurpose: null,
       external: false,
       fastSwitching: false,
+      fullMimeTypes: new Set(),
     };
   }
 

package/lib/util/platform.js

@@ -535,6 +535,10 @@ shaka.util.Platform = class {
         Platform.isWebOS4() || Platform.isWebOS5()) {
       return false;
     }
+    // See: https://chromium-review.googlesource.com/c/chromium/src/+/4577759
+    if (Platform.isWindows() && Platform.isEdge()) {
+      return false;
+    }
     return true;
   }