Added support for supplemental codec with streams that has audio and … (#7120)

* Added support for supplemental codec with streams that has audio and video in same file.

---------

Authored-by: Timi Tuohenmaa <[email protected]>

Author: timitt

src/controller/buffer-controller.ts

@@ -9,6 +9,7 @@ import {
   areCodecsMediaSourceSupported,
   getCodecCompatibleName,
   pickMostCompleteCodecName,
+  replaceVideoCodec,
 } from '../utils/codecs';
 import { Logger } from '../utils/logger';
 import {
@@ -1436,14 +1437,15 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
   private getTrackCodec(track: BaseTrack, trackName: SourceBufferName): string {
     // Use supplemental video codec when supported when adding SourceBuffer (#5558)
     const supplementalCodec = track.supplemental;
+    let trackCodec = track.codec;
     if (
       supplementalCodec &&
-      trackName === 'video' &&
-      areCodecsMediaSourceSupported(supplementalCodec, trackName)
+      (trackName === 'video' || trackName === 'audiovideo') &&
+      areCodecsMediaSourceSupported(supplementalCodec, 'video')
     ) {
-      return supplementalCodec;
+      trackCodec = replaceVideoCodec(trackCodec, supplementalCodec);
     }
-    const codec = pickMostCompleteCodecName(track.codec, track.levelCodec);
+    const codec = pickMostCompleteCodecName(trackCodec, track.levelCodec);
     if (codec) {
       if (trackName.slice(0, 5) === 'audio') {
         return getCodecCompatibleName(codec, this.appendSource);

src/remux/passthrough-remuxer.ts

@@ -103,6 +103,7 @@ class PassThroughRemuxer implements Remuxer {
       tracks.audiovideo = {
         container: 'video/mp4',
         codec: audioCodec + ',' + videoCodec,
+        supplemental: initData.video.supplemental,
         initSegment,
         id: 'main',
       };

src/utils/codecs.ts

@@ -202,6 +202,25 @@ export function getCodecCompatibleName(
   );
 }
 
+export function replaceVideoCodec(
+  originalCodecs: string | undefined,
+  newVideoCodec: string | undefined,
+): string | undefined {
+  const codecs: string[] = [];
+  if (originalCodecs) {
+    const allCodecs = originalCodecs.split(',');
+    for (let i = 0; i < allCodecs.length; i++) {
+      if (!isCodecType(allCodecs[i], 'video')) {
+        codecs.push(allCodecs[i]);
+      }
+    }
+  }
+  if (newVideoCodec) {
+    codecs.push(newVideoCodec);
+  }
+  return codecs.join(',');
+}
+
 export function pickMostCompleteCodecName(
   parsedCodec: string | undefined,
   levelCodec: string | undefined,