@apocaliss92/nodelink-js 0.6.6 → 0.6.7

package/dist/cli/rtsp-server.cjs

@@ -8836,6 +8836,38 @@ function createRtspFlow(transport, videoType) {
   return new H265Flow(transport);
 }
 
+// src/baichuan/stream/rtpVideoTimestamp.ts
+var U32 = 4294967296;
+var DEFAULT_VIDEO_CLOCK_RATE = 9e4;
+function deriveRtpVideoTimestamp(state, frameMicroseconds, clockRate = DEFAULT_VIDEO_CLOCK_RATE) {
+  if (frameMicroseconds === null || frameMicroseconds === void 0 || !Number.isFinite(frameMicroseconds)) {
+    return { timestamp: state.timestamp, state };
+  }
+  const curRaw = frameMicroseconds >>> 0;
+  if (state.baseUnwrappedUs === void 0) {
+    return {
+      timestamp: state.timestamp,
+      state: {
+        ...state,
+        unwrappedUs: curRaw,
+        lastRawUs: curRaw,
+        baseUnwrappedUs: curRaw,
+        baseTimestamp: state.timestamp
+      }
+    };
+  }
+  const lastRaw = state.lastRawUs ?? curRaw;
+  let forwardDelta = curRaw - lastRaw >>> 0;
+  if (forwardDelta > U32 / 2) forwardDelta = 0;
+  const unwrappedUs = (state.unwrappedUs ?? curRaw) + forwardDelta;
+  const deltaUs = unwrappedUs - state.baseUnwrappedUs;
+  const timestamp = state.baseTimestamp + Math.round(deltaUs * clockRate / 1e6) >>> 0;
+  return {
+    timestamp,
+    state: { ...state, unwrappedUs, lastRawUs: curRaw, timestamp }
+  };
+}
+
 // src/baichuan/stream/BaichuanRtspServer.ts
 init_H264Converter();
 init_H265Converter();
@@ -9410,7 +9442,10 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events3.E
     let useTcpInterleaved = false;
     let clientUdpSocket = null;
     let clientUdpSocketAudio = null;
+    let cleanedUp = false;
     const cleanup = () => {
+      if (cleanedUp) return;
+      cleanedUp = true;
       const sessionDurationMs = Date.now() - connectTime;
       const res = this.clientResources.get(clientId);
       const framesSent = res?.framesSent ?? 0;
@@ -10158,22 +10193,25 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events3.E
         resources.rtpVideoTimestamp = 0;
       if (resources.rtpVideoBaseTimestamp === void 0)
         resources.rtpVideoBaseTimestamp = resources.rtpVideoTimestamp;
-      if (resources.rtpVideoBaseMicroseconds === void 0) {
+      const { timestamp, state } = deriveRtpVideoTimestamp(
+        {
+          timestamp: resources.rtpVideoTimestamp,
+          baseTimestamp: resources.rtpVideoBaseTimestamp,
+          unwrappedUs: resources.rtpVideoUnwrappedUs,
+          lastRawUs: resources.rtpVideoLastRawUs,
+          baseUnwrappedUs: resources.rtpVideoBaseUnwrappedUs
+        },
+        frameMicroseconds,
+        videoClockRate
+      );
+      resources.rtpVideoTimestamp = timestamp;
+      resources.rtpVideoBaseTimestamp = state.baseTimestamp;
+      resources.rtpVideoUnwrappedUs = state.unwrappedUs;
+      resources.rtpVideoLastRawUs = state.lastRawUs;
+      resources.rtpVideoBaseUnwrappedUs = state.baseUnwrappedUs;
+      resources.rtpVideoLastTimestamp = timestamp;
+      if (resources.rtpVideoBaseMicroseconds === void 0)
         resources.rtpVideoBaseMicroseconds = frameMicroseconds >>> 0;
-        resources.rtpVideoLastTimestamp = resources.rtpVideoTimestamp;
-        return;
-      }
-      const baseUs = resources.rtpVideoBaseMicroseconds >>> 0;
-      const curUs = frameMicroseconds >>> 0;
-      const deltaUs = curUs - baseUs >>> 0;
-      const baseTs = (resources.rtpVideoBaseTimestamp ?? 0) >>> 0;
-      let ts = baseTs + Math.round(deltaUs * videoClockRate / 1e6) >>> 0;
-      const last = resources.rtpVideoLastTimestamp;
-      if (last !== void 0 && ts <= last >>> 0) {
-        ts = (last >>> 0) + 1 >>> 0;
-      }
-      resources.rtpVideoTimestamp = ts;
-      resources.rtpVideoLastTimestamp = ts;
     };
     const sendVideoAccessUnit = (videoType, accessUnitAnnexB, advanceTimestamp = true) => {
       const nals = _BaichuanRtspServer.splitAnnexBNals(accessUnitAnnexB);