feat(DASH): Remove multiTypeVariantsAllowed config and add support for it on all browsers

demo/config.js

@@ -251,8 +251,6 @@ shakaDemo.Config = class {
             'manifest.dash.ignoreEmptyAdaptationSet')
         .addBoolInput_('Ignore DASH maxSegmentDuration',
             'manifest.dash.ignoreMaxSegmentDuration')
-        .addBoolInput_('Allow DASH multi type variants',
-            'manifest.dash.multiTypeVariantsAllowed')
         .addTextInput_('Clock Sync URI', 'manifest.dash.clockSyncUri')
         .addBoolInput_('Ignore Min Buffer Time',
             'manifest.dash.ignoreMinBufferTime')

externs/shaka/player.js

@@ -1385,7 +1385,6 @@ shaka.extern.xml.Node;
  *   manifestPreprocessor: function(!Element),
  *   manifestPreprocessorTXml: function(!shaka.extern.xml.Node),
  *   sequenceMode: boolean,
- *   multiTypeVariantsAllowed: boolean,
  *   useStreamOnceInPeriodFlattening: boolean,
  *   enableFastSwitching: boolean
  * }}
@@ -1457,17 +1456,6 @@ shaka.extern.xml.Node;
  *   "sequence mode" (ignoring their internal timestamps).
  *   <br>
  *   Defaults to <code>false</code>.
- * @property {boolean} multiTypeVariantsAllowed
- *   If true, the manifest parser will create variants that have multiple
- *   mimeTypes or codecs for video or for audio if there is no other choice.
- *   Meant for content where some periods are only available in one mimeType or
- *   codec, and other periods are only available in a different mimeType or
- *   codec. For example, a stream with baked-in ads where the audio codec does
- *   not match the main content.
- *   Might result in undesirable behavior if mediaSource.codecSwitchingStrategy
- *   is not set to SMOOTH.
- *   <br>
- *   Defaults to true if SMOOTH codec switching is supported, RELOAD overwise.
  * @property {boolean} useStreamOnceInPeriodFlattening
  *   If period combiner is used, this option ensures every stream is used
  *   only once in period flattening. It speeds up underlying algorithm

karma.conf.js

@@ -256,6 +256,7 @@ module.exports = (config) => {
       {pattern: 'test/test/assets/clear-encrypted-hls/*', included: false},
       {pattern: 'test/test/assets/dash-multi-codec/*', included: false},
       {pattern: 'test/test/assets/dash-multi-codec-ec3/*', included: false},
+      {pattern: 'test/test/assets/dash-multitype-variant/*', included: false},
       {pattern: 'test/test/assets/3675/*', included: false},
       {pattern: 'test/test/assets/7401/*', included: false},
       {pattern: 'test/test/assets/6339/*', included: false},

lib/dash/dash_parser.js

@@ -16,7 +16,6 @@ goog.require('shaka.dash.SegmentBase');
 goog.require('shaka.dash.SegmentList');
 goog.require('shaka.dash.SegmentTemplate');
 goog.require('shaka.log');
-goog.require('shaka.media.Capabilities');
 goog.require('shaka.media.ManifestParser');
 goog.require('shaka.media.PresentationTimeline');
 goog.require('shaka.media.SegmentIndex');
@@ -238,9 +237,6 @@ shaka.dash.DashParser = class {
     }
 
     if (this.periodCombiner_) {
-      this.periodCombiner_.setAllowMultiTypeVariants(
-          this.config_.dash.multiTypeVariantsAllowed &&
-          shaka.media.Capabilities.isChangeTypeSupported());
       this.periodCombiner_.setUseStreamOnce(
           this.config_.dash.useStreamOnceInPeriodFlattening);
     }

lib/device/abstract_device.js

@@ -321,6 +321,13 @@ shaka.device.AbstractDevice = class {
     return keySystem === 'com.apple.fps';
   }
 
+  /**
+   * @override
+   */
+  supportsContainerChangeType() {
+    return true;
+  }
+
   /**
    * @override
    */

lib/device/apple_browser.js

@@ -126,6 +126,13 @@ shaka.device.AppleBrowser = class extends shaka.device.AbstractDevice {
     return true;
   }
 
+  /**
+   * @override
+   */
+  supportsContainerChangeType() {
+    return false;
+  }
+
   /**
    * @return {boolean}
    * @private

lib/device/i_device.js

@@ -230,6 +230,11 @@ shaka.device.IDevice = class {
    */
   supportsCbcsWithoutEncryptionSchemeSupport() {}
 
+  /**
+   * @return {boolean}
+   */
+  supportsContainerChangeType() {}
+
   /**
    * Returns true if the platform needs to wait for the encrypted event in order
    * to initialize CDM correctly.

lib/device/webkit_stb.js

@@ -113,6 +113,13 @@ shaka.device.WebKitSTB = class extends shaka.device.AbstractDevice {
     return !this.isSkyQ_.value();
   }
 
+  /**
+   * @override
+   */
+  supportsContainerChangeType() {
+    return false;
+  }
+
   /**
    * @return {boolean}
    * @private

lib/media/media_source_engine.js

@@ -10,7 +10,6 @@ goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.config.CodecSwitchingStrategy');
 goog.require('shaka.device.DeviceFactory');
-goog.require('shaka.device.IDevice');
 goog.require('shaka.media.Capabilities');
 goog.require('shaka.media.ContentWorkarounds');
 goog.require('shaka.media.ClosedCaptionParser');
@@ -2377,8 +2376,7 @@ shaka.media.MediaSourceEngine = class {
       needTransmux = true;
     } else if (!needTransmux && mimeType != currentBasicType) {
       const device = shaka.device.DeviceFactory.getDevice();
-      needTransmux = device.getBrowserEngine() ===
-          shaka.device.IDevice.BrowserEngine.WEBKIT &&
+      needTransmux = !device.supportsContainerChangeType() &&
           shaka.util.MimeUtils.RAW_FORMATS.includes(mimeType);
     }
     const TransmuxerEngine = shaka.transmuxer.TransmuxerEngine;