hls.js 1.6.0-rc.1.0.canary.11076 → 1.6.0-rc.1.0.canary.11078

package/package.json

@@ -134,5 +134,5 @@
     "url-toolkit": "2.2.5",
     "wrangler": "3.114.2"
   },
-  "version": "1.6.0-rc.1.0.canary.11076"
+  "version": "1.6.0-rc.1.0.canary.11078"
 }

package/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);

package/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',
       };

package/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,

package/src/utils/mp4-tools.ts

@@ -226,13 +226,24 @@ export interface InitDataTrack {
   supplemental: string | undefined;
 }
 
-type HdlrType = ElementaryStreamTypes.AUDIO | ElementaryStreamTypes.VIDEO;
+type HdlrMetadata = 'meta';
+type HdlrType =
+  | ElementaryStreamTypes.AUDIO
+  | ElementaryStreamTypes.VIDEO
+  | HdlrMetadata;
+
+type StsdData = {
+  codec: string;
+  encrypted: boolean;
+  supplemental: string | undefined;
+};
 
 export interface InitData extends Array<any> {
   [index: number]:
     | {
         timescale: number;
         type: HdlrType;
+        stsd: StsdData;
         default?: {
           duration: number;
           flags: number;
@@ -266,10 +277,20 @@ export function parseInitSegment(initSegment: Uint8Array): InitData {
           }[hdlrType];
           if (type) {
             // Parse codec details
-            const stsd = findBox(trak, ['mdia', 'minf', 'stbl', 'stsd'])[0];
-            const stsdData = parseStsd(stsd);
-            result[trackId] = { timescale, type };
-            result[type] = { timescale, id: trackId, ...stsdData };
+            const stsdBox = findBox(trak, ['mdia', 'minf', 'stbl', 'stsd'])[0];
+            const stsd = parseStsd(stsdBox);
+            if (type) {
+              // Add 'audio', 'video', and 'audiovideo' track records that will map to SourceBuffers
+              result[trackId] = { timescale, type, stsd };
+              result[type] = { timescale, id: trackId, ...stsd };
+            } else {
+              // Add 'meta' and other track records required by `offsetStartDTS`
+              result[trackId] = {
+                timescale,
+                type: hdlrType as HdlrType,
+                stsd,
+              };
+            }
           }
         }
       }
@@ -291,11 +312,7 @@ export function parseInitSegment(initSegment: Uint8Array): InitData {
   return result;
 }
 
-function parseStsd(stsd: Uint8Array): {
-  codec: string;
-  encrypted: boolean;
-  supplemental: string | undefined;
-} {
+function parseStsd(stsd: Uint8Array): StsdData {
   const sampleEntries = stsd.subarray(8);
   const sampleEntriesEnd = sampleEntries.subarray(8 + 78);
   const fourCC = bin2str(sampleEntries.subarray(4, 8));
@@ -818,6 +835,7 @@ export function computeRawDurationFromSamples(trun): number {
   return duration;
 }
 
+// TODO: Remove `offsetStartDTS` in favor of using `timestampOffset` (issue #5715)
 export function offsetStartDTS(
   initData: InitData,
   fmp4: Uint8Array,