fix(HLS): Fix switching between muxed MP4 and muxed TS (#8061)

Backported to v4.9.x

Author: avelad

karma.conf.js

@@ -264,6 +264,7 @@ module.exports = (config) => {
       {pattern: 'test/test/assets/dash-clearkey/*', included: false},
       {pattern: 'test/test/assets/dash-vr/*', included: false},
       {pattern: 'test/test/assets/hls-aes-256/*', included: false},
+      {pattern: 'test/test/assets/hls-muxed-mp4-ts/*', included: false},
       {pattern: 'test/test/assets/hls-raw-aac/*', included: false},
       {pattern: 'test/test/assets/hls-raw-ac3/*', included: false},
       {pattern: 'test/test/assets/hls-raw-ec3/*', included: false},

lib/media/media_source_engine.js

@@ -2186,7 +2186,8 @@ shaka.media.MediaSourceEngine = class {
     const newMimeType = realInfo.mimeType;
 
     let muxedContentCheck = true;
-    if (transmuxerMuxed) {
+    if (transmuxerMuxed &&
+        ContentType.AUDIO in this.sourceBufferTypes_) {
       const muxedRealInfo =
           this.getRealInfo_(ContentType.AUDIO, mimeType, codecs);
       const muxedCurrentCodec = MimeUtils.getNormalizedCodec(

test/hls/hls_parser_integration.js

@@ -153,4 +153,36 @@ describe('HlsParser', () => {
 
     await player.unload();
   });
+
+  it('allow switch between mp4 muxed and ts muxed', async () => {
+    if (!await Util.isTypeSupported(
+        'video/mp4; codecs="av01.0.31M.08"',
+        /* width= */ 1920, /* height= */ 1080)) {
+      pending('Codec AV1 is not supported by the platform.');
+    }
+    player.configure('abr.enabled', false);
+    await player.load('/base/test/test/assets/hls-muxed-mp4-ts/master.m3u8');
+    await video.play();
+
+    expect(player.getVariantTracks().length).toBe(2);
+
+    // We want to test TS --> MP4 and MP4 --> TS, that's why
+    // selectVariantTrack is called twice
+
+    await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 1, 30);
+
+    let nonActiveVariant = player.getVariantTracks().find((v) => !v.active);
+    goog.asserts.assert(nonActiveVariant, 'variant should be non-null!');
+    player.selectVariantTrack(nonActiveVariant, /* clearBuffer= */ true);
+
+    await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 3, 30);
+
+    nonActiveVariant = player.getVariantTracks().find((v) => !v.active);
+    goog.asserts.assert(nonActiveVariant, 'variant should be non-null!');
+    player.selectVariantTrack(nonActiveVariant, /* clearBuffer= */ true);
+
+    await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 5, 30);
+
+    await player.unload();
+  });
 });

test/test/assets/hls-muxed-mp4-ts/000000000.m4s

@@ -0,0 +1,6 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-STREAM-INF:BANDWIDTH=3500000,RESOLUTION=1920x1080,FRAMERATE=60,CODECS="av01.0.31M.08,mp4a.40.2",NAME="1080p60 AV1"
+mp4.m3u8
+#EXT-X-STREAM-INF:BANDWIDTH=2600000,RESOLUTION=1280x720,FRAMERATE=30,CODECS="avc1.4D401F,mp4a.40.2",NAME="720p"
+ts.m3u8

test/test/assets/hls-muxed-mp4-ts/000000000.ts

@@ -0,0 +1,9 @@
+#EXTM3U
+#EXT-X-VERSION:7
+#EXT-X-TARGETDURATION:8
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-MAP:URI="init.mp4"
+#EXTINF:8.000000,
+000000000.m4s
+#EXT-X-ENDLIST

test/test/assets/hls-muxed-mp4-ts/init.mp4

@@ -0,0 +1,8 @@
+#EXTM3U
+#EXT-X-VERSION:3
+#EXT-X-TARGETDURATION:8
+#EXT-X-MEDIA-SEQUENCE:0
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXTINF:8.000000,
+000000000.ts
+#EXT-X-ENDLIST