video-dev
diff --git a/‎api-extractor/report/hls.js.api.md
Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions b/‎api-extractor/report/hls.js.api.md
Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions
diff --git a/‎src/controller/base-stream-controller.ts
Copy file name to clipboard
+5-1Lines changed: 5 additions & 1 deletion b/‎src/controller/base-stream-controller.ts
Copy file name to clipboard
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎src/controller/buffer-controller.ts
Copy file name to clipboard
+28-14Lines changed: 28 additions & 14 deletions b/‎src/controller/buffer-controller.ts
Copy file name to clipboard
+28-14Lines changed: 28 additions & 14 deletions
diff --git a/‎src/controller/gap-controller.ts
Copy file name to clipboard
+5-1Lines changed: 5 additions & 1 deletion b/‎src/controller/gap-controller.ts
Copy file name to clipboard
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎src/controller/stream-controller.ts
Copy file name to clipboard
+15-4Lines changed: 15 additions & 4 deletions b/‎src/controller/stream-controller.ts
Copy file name to clipboard
+15-4Lines changed: 15 additions & 4 deletions
diff --git a/‎src/demux/transmuxer-worker.ts
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/demux/transmuxer-worker.ts
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
@@ -635,6 +635,8 @@ export interface BufferAppendingData {
     // (undocumented)
     frag: Fragment;
     // (undocumented)
+    offset?: number | undefined;
+    // (undocumented)
     parent: PlaylistLevelType;
     // (undocumented)
     part: Part | null;
@@ -4342,9 +4344,9 @@ export interface RemuxedMetadata {
 // @public (undocumented)
 export interface RemuxedTrack {
     // (undocumented)
-    data1: Uint8Array;
+    data1: Uint8Array<ArrayBuffer>;
     // (undocumented)
-    data2?: Uint8Array;
+    data2?: Uint8Array<ArrayBuffer>;
     // (undocumented)
     dropped?: number;
     // (undocumented)
 
@@ -1132,12 +1132,16 @@ export default class BaseStreamController
     if (!buffer?.length) {
       return;
     }
-
+    const offsetTimestamp = this.initPTS[frag.cc];
+    const offset = offsetTimestamp
+      ? -offsetTimestamp.baseTime / offsetTimestamp.timescale
+      : undefined;
     const segment: BufferAppendingData = {
       type: data.type,
       frag,
       part,
       chunkMeta,
+      offset,
       parent: frag.type,
       data: buffer,
     };
 
@@ -755,9 +755,9 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
     eventData: BufferAppendingData,
   ) {
     const { tracks } = this;
-    const { data, type, parent, frag, part, chunkMeta } = eventData;
+    const { data, type, parent, frag, part, chunkMeta, offset } = eventData;
     const chunkStats = chunkMeta.buffering[type];
-    const sn = frag.sn;
+    const { sn, cc } = frag;
     const bufferAppendingStart = self.performance.now();
     chunkStats.start = bufferAppendingStart;
     const fragBuffering = frag.stats.buffering;
@@ -827,18 +827,15 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
       label: `append-${type}`,
       execute: () => {
         chunkStats.executeStart = self.performance.now();
-        if (checkTimestampOffset) {
-          const track = this.tracks[type];
-          if (track) {
-            const sb = track.buffer;
-            if (sb) {
-              const delta = fragStart - sb.timestampOffset;
-              if (Math.abs(delta) >= 0.1) {
-                this.log(
-                  `Updating audio SourceBuffer timestampOffset to ${fragStart} (delta: ${delta}) sn: ${sn})`,
-                );
-                sb.timestampOffset = fragStart;
-              }
+
+        const track = this.tracks[type];
+        if (track) {
+          const sb = track.buffer;
+          if (sb) {
+            if (checkTimestampOffset) {
+              this.updateTimestampOffset(sb, fragStart, 0.1, type, sn, cc);
+            } else if (offset !== undefined && Number.isFinite(offset)) {
+              this.updateTimestampOffset(sb, offset, 0.000001, type, sn, cc);
             }
           }
         }
@@ -1593,6 +1590,23 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
     }
   }
 
+  private updateTimestampOffset(
+    sb: ExtendedSourceBuffer,
+    timestampOffset: number,
+    tolerance: number,
+    type: SourceBufferName,
+    sn: number | 'initSegment',
+    cc: number,
+  ) {
+    const delta = timestampOffset - sb.timestampOffset;
+    if (Math.abs(delta) >= tolerance) {
+      this.log(
+        `Updating ${type} SourceBuffer timestampOffset to ${timestampOffset} (sn: ${sn} cc: ${cc})`,
+      );
+      sb.timestampOffset = timestampOffset;
+    }
+  }
+
   // This method must result in an updateend event; if remove is not called, onSBUpdateEnd must be called manually
   private removeExecutor(
     type: SourceBufferName,
 
@@ -583,7 +583,11 @@ export default class GapController extends TaskLoop {
               let moreToLoad = false;
               let pos = startProvisioned.end;
               while (pos < startTime) {
-                const provisioned = fragmentTracker.getPartialFragment(pos);
+                const provisioned =
+                  fragmentTracker.getAppendedFrag(
+                    pos,
+                    PlaylistLevelType.MAIN,
+                  ) || fragmentTracker.getPartialFragment(pos);
                 if (provisioned) {
                   pos += provisioned.duration;
                 } else {
 
@@ -1247,11 +1247,22 @@ export default class StreamController
       }
 
       // This would be nice if Number.isFinite acted as a typeguard, but it doesn't. See: https://github.com/Microsoft/TypeScript/issues/10038
-      const initPTS = initSegment.initPTS as number;
+      const baseTime = initSegment.initPTS as number;
       const timescale = initSegment.timescale as number;
-      if (Number.isFinite(initPTS)) {
-        this.initPTS[frag.cc] = { baseTime: initPTS, timescale };
-        hls.trigger(Events.INIT_PTS_FOUND, { frag, id, initPTS, timescale });
+      const initPTS = this.initPTS[frag.cc];
+      if (
+        Number.isFinite(baseTime) &&
+        (!initPTS ||
+          initPTS.baseTime !== baseTime ||
+          initPTS.timescale !== timescale)
+      ) {
+        this.initPTS[frag.cc] = { baseTime, timescale };
+        hls.trigger(Events.INIT_PTS_FOUND, {
+          frag,
+          id,
+          initPTS: baseTime,
+          timescale,
+        });
       }
     }
 
 
@@ -196,7 +196,8 @@ function forwardMessage(event, data, instanceNo) {
 
 function forwardWorkerLogs(logger: ILogger, instanceNo: number) {
   for (const logFn in logger) {
-    const func: ILogFunction = (message?) => {
+    logger[logFn] = function () {
+      const message = Array.prototype.join.call(arguments, ' ');
       forwardMessage(
         'workerLog',
         {
@@ -206,7 +207,6 @@ function forwardWorkerLogs(logger: ILogger, instanceNo: number) {
         instanceNo,
       );
     };
-    logger[logFn] = func;
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,8 @@ function forwardMessage(event, data, instanceNo) {`
`196`	`196`
`197`	`197`	`function forwardWorkerLogs(logger: ILogger, instanceNo: number) {`
`198`	`198`	`for (const logFn in logger) {`
`199`		`- const func: ILogFunction = (message?) => {`
	`199`	`+ logger[logFn] = function () {`
	`200`	`+ const message = Array.prototype.join.call(arguments, ' ');`
`200`	`201`	`forwardMessage(`
`201`	`202`	`'workerLog',`
`202`	`203`	`{`
`@@ -206,7 +207,6 @@ function forwardWorkerLogs(logger: ILogger, instanceNo: number) {`
`206`	`207`	`instanceNo,`
`207`	`208`	`);`
`208`	`209`	`};`
`209`		`- logger[logFn] = func;`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`