hls.js 1.5.14-0.canary.10601 → 1.5.14-0.canary.10603

package/package.json

@@ -130,5 +130,5 @@
     "url-toolkit": "2.2.5",
     "wrangler": "3.75.0"
   },
-  "version": "1.5.14-0.canary.10601"
+  "version": "1.5.14-0.canary.10603"
 }

package/src/config.ts

@@ -241,6 +241,7 @@ export type LatencyControllerConfig = {
 export type MetadataControllerConfig = {
   enableDateRangeMetadataCues: boolean;
   enableEmsgMetadataCues: boolean;
+  enableEmsgKLVMetadata: boolean;
   enableID3MetadataCues: boolean;
 };
 
@@ -412,6 +413,7 @@ export const hlsDefaultConfig: HlsConfig = {
   cmcd: undefined,
   enableDateRangeMetadataCues: true,
   enableEmsgMetadataCues: true,
+  enableEmsgKLVMetadata: false,
   enableID3MetadataCues: true,
   useMediaCapabilities: __USE_MEDIA_CAPABILITIES__,
 

package/src/demux/mp4demuxer.ts

@@ -20,6 +20,7 @@ import {
   parseInitSegment,
   RemuxerTrackIdConfig,
   hasMoofData,
+  IEmsgParsingData,
 } from '../utils/mp4-tools';
 import { dummyTrack } from './dummy-demuxed-track';
 import type { HlsEventEmitter } from '../events';
@@ -115,7 +116,6 @@ class MP4Demuxer implements Demuxer {
     } else {
       videoTrack.samples = videoSamples;
     }
-
     const id3Track = this.extractID3Track(videoTrack, timeOffset);
     textTrack.samples = parseSamples(timeOffset, videoTrack);
 
@@ -156,10 +156,7 @@ class MP4Demuxer implements Demuxer {
         emsgs.forEach((data: Uint8Array) => {
           const emsgInfo = parseEmsg(data);
           if (emsgSchemePattern.test(emsgInfo.schemeIdUri)) {
-            const pts = Number.isFinite(emsgInfo.presentationTime)
-              ? emsgInfo.presentationTime! / emsgInfo.timeScale
-              : timeOffset +
-                emsgInfo.presentationTimeDelta! / emsgInfo.timeScale;
+            const pts = getEmsgStartTime(emsgInfo, timeOffset);
             let duration =
               emsgInfo.eventDuration === 0xffffffff
                 ? Number.POSITIVE_INFINITY
@@ -177,6 +174,19 @@ class MP4Demuxer implements Demuxer {
               type: MetadataSchema.emsg,
               duration: duration,
             });
+          } else if (
+            this.config.enableEmsgKLVMetadata &&
+            emsgInfo.schemeIdUri.startsWith('urn:misb:KLV:bin:1910.1')
+          ) {
+            const pts = getEmsgStartTime(emsgInfo, timeOffset);
+            id3Track.samples.push({
+              data: emsgInfo.payload,
+              len: emsgInfo.payload.byteLength,
+              dts: pts,
+              pts: pts,
+              type: MetadataSchema.misbklv,
+              duration: Number.POSITIVE_INFINITY,
+            });
           }
         });
       }
@@ -206,4 +216,14 @@ class MP4Demuxer implements Demuxer {
   }
 }
 
+function getEmsgStartTime(
+  emsgInfo: IEmsgParsingData,
+  timeOffset: number,
+): number {
+  return Number.isFinite(emsgInfo.presentationTime)
+    ? (emsgInfo.presentationTime as number) / emsgInfo.timeScale
+    : timeOffset +
+        (emsgInfo.presentationTimeDelta as number) / emsgInfo.timeScale;
+}
+
 export default MP4Demuxer;

package/src/hls.ts

@@ -12,6 +12,7 @@ import { enableLogs, type ILogger } from './utils/logger';
 import { enableStreamingMode, hlsDefaultConfig, mergeConfig } from './config';
 import { EventEmitter } from 'eventemitter3';
 import { Events } from './events';
+import { MetadataSchema } from './types/demuxer';
 import { ErrorTypes, ErrorDetails } from './errors';
 import { version } from './version';
 import { isHdcpLevel, type HdcpLevel, type Level } from './types/level';
@@ -116,6 +117,10 @@ export default class Hls implements HlsEventEmitter {
     return Events;
   }
 
+  static get MetadataSchema(): typeof MetadataSchema {
+    return MetadataSchema;
+  }
+
   static get ErrorTypes(): typeof ErrorTypes {
     return ErrorTypes;
   }
@@ -1026,6 +1031,7 @@ export type {
   ErrorDetails,
   ErrorTypes,
   Events,
+  MetadataSchema,
   Level,
   HlsListeners,
   HlsEventEmitter,
@@ -1097,11 +1103,7 @@ export type { LoadStats } from './loader/load-stats';
 export type { LevelKey } from './loader/level-key';
 export type { LevelDetails } from './loader/level-details';
 export type { SourceBufferName } from './types/buffer';
-export type {
-  MetadataSample,
-  MetadataSchema,
-  UserdataSample,
-} from './types/demuxer';
+export type { MetadataSample, UserdataSample } from './types/demuxer';
 export type {
   HlsSkip,
   HlsUrlParameters,

package/src/types/demuxer.ts

@@ -95,10 +95,11 @@ export interface DemuxedUserdataTrack extends DemuxedTrack {
   samples: UserdataSample[];
 }
 
-export const enum MetadataSchema {
+export enum MetadataSchema {
   audioId3 = 'org.id3',
   dateRange = 'com.apple.quicktime.HLS',
   emsg = 'https://aomedia.org/emsg/ID3',
+  misbklv = 'urn:misb:KLV:bin:1910.1',
 }
 export interface MetadataSample {
   pts: number;