@camstack/addon-pipeline 1.1.32 → 1.1.33

package/dist/audio-analyzer/index.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_model_download_service_C_IHWnXx = require("../model-download-service-C-IHWnXx-DxM2DSns.js");
-const require_dist = require("../dist-Cwc0TUQr.js");
+const require_dist = require("../dist-BrIE85BG.js");
 const require_node_topology_platform = require("../node-topology-platform-CFZ7F4xW.js");
 let node_fs = require("node:fs");
 node_fs = require_model_download_service_C_IHWnXx.__toESM(node_fs);
@@ -508,7 +508,7 @@ var AudioAnalyzerProvider = class {
 			}
 			this.classifyCallCount++;
 			const meaningful = result.labels.filter((l) => l.score >= .15 && l.className.toLowerCase() !== "silence");
-			if (meaningful.length > 0) this.log.info("audio classification", {
+			if (meaningful.length > 0) this.log.debug("audio classification", {
 				tags: chunk.deviceId !== void 0 ? { deviceId: chunk.deviceId } : void 0,
 				meta: {
 					top: meaningful.slice(0, 4).map((l) => `${l.className}(${(l.score * 100).toFixed(0)}%)`).join(", "),

package/dist/audio-analyzer/index.mjs

@@ -1,5 +1,5 @@
 import { t as __require } from "../chunk-BdkLduGY.mjs";
-import { B as errMsg, D as mapAudioLabelToMacro, V as BaseAddon, _ as audioAnalyzerCapability, g as audioAnalysisCapability, n as AUDIO_BACKEND_CHOICES, o as DEFAULT_AUDIO_ANALYZER_CONFIG, q as hydrateSchema, u as HF_BASE_URL } from "../dist-DjuGmyG9.mjs";
+import { B as errMsg, D as mapAudioLabelToMacro, V as BaseAddon, _ as audioAnalyzerCapability, g as audioAnalysisCapability, n as AUDIO_BACKEND_CHOICES, o as DEFAULT_AUDIO_ANALYZER_CONFIG, q as hydrateSchema, u as HF_BASE_URL } from "../dist-CfSORkv2.mjs";
 import { t as pickNodePlatformArch } from "../node-topology-platform-BkR_k6WT.mjs";
 import { r as downloadFile } from "../model-download-service-C-IHWnXx-BPy6aoAx.mjs";
 import * as fs from "node:fs";
@@ -503,7 +503,7 @@ var AudioAnalyzerProvider = class {
 			}
 			this.classifyCallCount++;
 			const meaningful = result.labels.filter((l) => l.score >= .15 && l.className.toLowerCase() !== "silence");
-			if (meaningful.length > 0) this.log.info("audio classification", {
+			if (meaningful.length > 0) this.log.debug("audio classification", {
 				tags: chunk.deviceId !== void 0 ? { deviceId: chunk.deviceId } : void 0,
 				meta: {
 					top: meaningful.slice(0, 4).map((l) => `${l.className}(${(l.score * 100).toFixed(0)}%)`).join(", "),

package/dist/audio-codec-ffmpeg/index.js

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_dist = require("../dist-Cwc0TUQr.js");
+const require_dist = require("../dist-BrIE85BG.js");
 let node_crypto = require("node:crypto");
 let node_child_process = require("node:child_process");
 //#region src/audio-codec-ffmpeg/ffmpeg-audio-process.ts
@@ -615,6 +615,82 @@ var OggOpusFramer = class {
 	}
 };
 //#endregion
+//#region src/audio-codec-ffmpeg/adts.ts
+/**
+* ADTS framing for raw AAC access units.
+*
+* The audio decode path runs `ffmpeg -f aac -i pipe:0` — the **ADTS** demuxer,
+* which requires each frame to begin with a 7-byte ADTS header (0xFFF sync).
+* But every AAC source that reaches the decoder delivers **raw** AAC access
+* units with no ADTS header: push sources (Reolink Baichuan) emit one bare
+* codec frame per packet, and rfc3640 (RTP AAC) depacketization yields bare
+* AUs too. Piping those straight into `-f aac` fails with
+* `Invalid data found when processing input` → no PCM → a silent WebRTC audio
+* track. Wrapping each raw AU in an ADTS header (built from the source
+* sample-rate / channel-count / AAC object type) makes the demuxer accept it.
+*
+* Opus is handled separately (Ogg encapsulation); this module is AAC-only.
+*/
+/** MPEG-4 AAC sampling-frequency index table (ISO/IEC 14496-3). */
+var AAC_SAMPLE_RATES = [
+	96e3,
+	88200,
+	64e3,
+	48e3,
+	44100,
+	32e3,
+	24e3,
+	22050,
+	16e3,
+	12e3,
+	11025,
+	8e3,
+	7350
+];
+/** AAC-LC is object type 2; the ADTS `profile` field is objectType - 1. */
+var DEFAULT_AAC_OBJECT_TYPE = 2;
+/** Resolve the ADTS sampling-frequency index for a sample rate (default 16 kHz → 8). */
+function aacSampleRateIndex(sampleRate) {
+	const idx = AAC_SAMPLE_RATES.indexOf(sampleRate);
+	return idx >= 0 ? idx : AAC_SAMPLE_RATES.indexOf(16e3);
+}
+/**
+* True when `buf` already begins with an ADTS syncword (0xFFF) + MPEG layer 0.
+* Raw AAC AUs never do; ADTS-framed frames always do. Lets the wrapper pass
+* already-framed input through untouched.
+*/
+function hasAdtsSync(buf) {
+	return buf.length >= 2 && buf[0] === 255 && (buf[1] & 246) === 240;
+}
+/**
+* Build the 7-byte ADTS header (no CRC) for a payload of `payloadLength` bytes.
+*/
+function buildAdtsHeader(config, payloadLength) {
+	const objectType = config.aacObjectType ?? DEFAULT_AAC_OBJECT_TYPE;
+	const profile = Math.max(0, objectType - 1) & 3;
+	const freqIdx = aacSampleRateIndex(config.sampleRate) & 15;
+	const chanCfg = Math.max(1, config.channels) & 7;
+	const frameLength = payloadLength + 7;
+	const h = Buffer.alloc(7);
+	h[0] = 255;
+	h[1] = 241;
+	h[2] = profile << 6 | freqIdx << 2 | chanCfg >> 2 & 1;
+	h[3] = (chanCfg & 3) << 6 | frameLength >> 11 & 3;
+	h[4] = frameLength >> 3 & 255;
+	h[5] = (frameLength & 7) << 5 | 31;
+	h[6] = 252;
+	return h;
+}
+/**
+* Return `frame` framed as ADTS: unchanged when it already carries an ADTS
+* sync, otherwise the 7-byte header prepended. Pure; the input is never mutated.
+*/
+function wrapAacAsAdts(frame, config) {
+	if (hasAdtsSync(frame)) return Buffer.from(frame.buffer, frame.byteOffset, frame.byteLength);
+	const payload = Buffer.from(frame.buffer, frame.byteOffset, frame.byteLength);
+	return Buffer.concat([buildAdtsHeader(config, payload.length), payload]);
+}
+//#endregion
 //#region src/audio-codec-ffmpeg/ffmpeg-audio-decode-session.ts
 var FfmpegAudioDecodeSession = class {
 	logger;
@@ -632,6 +708,14 @@ var FfmpegAudioDecodeSession = class {
 	* which pipe their encoded frames straight through.
 	*/
 	oggFramer;
+	/**
+	* ADTS framing config, present ONLY when the codec is AAC. `ffmpeg -f aac`
+	* is the ADTS demuxer, but every AAC source delivers raw AAC access units
+	* (push sources emit bare frames; rfc3640 depacketization yields bare AUs) —
+	* piping those in raw fails `Invalid data found when processing input` → no
+	* PCM → silent WebRTC audio. Each frame is ADTS-wrapped before ffmpeg.
+	*/
+	adtsConfig;
 	residual = Buffer.alloc(0);
 	nextPts = 0;
 	destroyed = false;
@@ -646,6 +730,10 @@ var FfmpegAudioDecodeSession = class {
 			channelCount: Math.max(1, params.sourceChannels),
 			serial: serialFromSeed(params.oggSerialSeed ?? "audio-codec-ffmpeg-opus")
 		}) : null;
+		this.adtsConfig = resolveAudioCodecAlias(params.codec) === "aac" ? {
+			sampleRate: params.sourceSampleRate,
+			channels: Math.max(1, params.sourceChannels)
+		} : null;
 		const args = buildAudioDecodeArgs(params);
 		this.process = new FfmpegAudioProcess({
 			ffmpegPath: params.ffmpegPath,
@@ -669,6 +757,10 @@ var FfmpegAudioDecodeSession = class {
 			this.process.write(this.oggFramer.framePacket(packet));
 			return;
 		}
+		if (this.adtsConfig) {
+			this.process.write(wrapAacAsAdts(data, this.adtsConfig));
+			return;
+		}
 		this.process.write(data);
 	}
 	handleStdout(chunk) {
@@ -895,6 +987,29 @@ var AudioCodecFfmpegAddon = class extends require_dist.BaseAddon {
 		if (!entry) return false;
 		return input.kind === "decode" ? entry.canDecode : entry.canEncode;
 	}
+	/**
+	* The BARE cluster node id this addon runs on (e.g. `hub`) — stamped into a
+	* session's return so the caller pins its follow-up `pushEncodedFrame` /
+	* `pullPcm` / `closeSession` to the same node. `ctx.kernel.localNodeId` is
+	* the COMPOUND `<node>/<addon>` form (e.g. `hub/audio-codec-ffmpeg`), but the
+	* cap route resolver matches an explicit `nodeId` against the bare node id
+	* (`classifyExplicitNode`: `nodeId === hubNodeId`). Returning the compound
+	* form makes every pinned call fall through to a remote-Moleculer dispatch
+	* for a non-existent service → `Services waiting is timed out` → no WebRTC
+	* audio, cluster-wide. Strip the addon suffix. Mirrors `decoder-ffmpeg`'s
+	* `resolveLocalNodeId`.
+	*
+	* TODO(arch): this bare-node normalization is duplicated across
+	* `decoder-ffmpeg`, `decoder-nodeav`, `audio-codec-ffmpeg`, and
+	* `decoder-backend-keys.normalizeDecoderNodeId`. It should live ONCE on the
+	* shared surface — either a bare `ctx.kernel.nodeId` accessor alongside the
+	* compound `localNodeId`, or a base-addon helper — so no addon can leak the
+	* compound `<node>/<addon>` id into a routing `nodeId` again (this exact bug).
+	*/
+	resolveLocalNodeId() {
+		const raw = this.ctx.kernel.localNodeId ?? "local";
+		return raw.includes("/") ? raw.split("/")[0] : raw;
+	}
 	async createDecodeSession(input) {
 		const codec = resolveAudioCodecAlias(input.codec);
 		const entry = CODEC_CATALOG.find((e) => resolveAudioCodecAlias(e.codec) === codec);
@@ -926,7 +1041,7 @@ var AudioCodecFfmpegAddon = class extends require_dist.BaseAddon {
 		});
 		return {
 			sessionId,
-			nodeId: this.ctx.kernel.localNodeId ?? "local"
+			nodeId: this.resolveLocalNodeId()
 		};
 	}
 	async createEncodeSession(input) {
@@ -960,7 +1075,7 @@ var AudioCodecFfmpegAddon = class extends require_dist.BaseAddon {
 		});
 		return {
 			sessionId,
-			nodeId: this.ctx.kernel.localNodeId ?? "local"
+			nodeId: this.resolveLocalNodeId()
 		};
 	}
 	async closeSession(input) {

package/dist/audio-codec-ffmpeg/index.mjs

@@ -1,4 +1,4 @@
-import { B as errMsg, V as BaseAddon, v as audioCodecCapability } from "../dist-DjuGmyG9.mjs";
+import { B as errMsg, V as BaseAddon, v as audioCodecCapability } from "../dist-CfSORkv2.mjs";
 import { randomUUID } from "node:crypto";
 import { spawn } from "node:child_process";
 //#region src/audio-codec-ffmpeg/ffmpeg-audio-process.ts
@@ -611,6 +611,82 @@ var OggOpusFramer = class {
 	}
 };
 //#endregion
+//#region src/audio-codec-ffmpeg/adts.ts
+/**
+* ADTS framing for raw AAC access units.
+*
+* The audio decode path runs `ffmpeg -f aac -i pipe:0` — the **ADTS** demuxer,
+* which requires each frame to begin with a 7-byte ADTS header (0xFFF sync).
+* But every AAC source that reaches the decoder delivers **raw** AAC access
+* units with no ADTS header: push sources (Reolink Baichuan) emit one bare
+* codec frame per packet, and rfc3640 (RTP AAC) depacketization yields bare
+* AUs too. Piping those straight into `-f aac` fails with
+* `Invalid data found when processing input` → no PCM → a silent WebRTC audio
+* track. Wrapping each raw AU in an ADTS header (built from the source
+* sample-rate / channel-count / AAC object type) makes the demuxer accept it.
+*
+* Opus is handled separately (Ogg encapsulation); this module is AAC-only.
+*/
+/** MPEG-4 AAC sampling-frequency index table (ISO/IEC 14496-3). */
+var AAC_SAMPLE_RATES = [
+	96e3,
+	88200,
+	64e3,
+	48e3,
+	44100,
+	32e3,
+	24e3,
+	22050,
+	16e3,
+	12e3,
+	11025,
+	8e3,
+	7350
+];
+/** AAC-LC is object type 2; the ADTS `profile` field is objectType - 1. */
+var DEFAULT_AAC_OBJECT_TYPE = 2;
+/** Resolve the ADTS sampling-frequency index for a sample rate (default 16 kHz → 8). */
+function aacSampleRateIndex(sampleRate) {
+	const idx = AAC_SAMPLE_RATES.indexOf(sampleRate);
+	return idx >= 0 ? idx : AAC_SAMPLE_RATES.indexOf(16e3);
+}
+/**
+* True when `buf` already begins with an ADTS syncword (0xFFF) + MPEG layer 0.
+* Raw AAC AUs never do; ADTS-framed frames always do. Lets the wrapper pass
+* already-framed input through untouched.
+*/
+function hasAdtsSync(buf) {
+	return buf.length >= 2 && buf[0] === 255 && (buf[1] & 246) === 240;
+}
+/**
+* Build the 7-byte ADTS header (no CRC) for a payload of `payloadLength` bytes.
+*/
+function buildAdtsHeader(config, payloadLength) {
+	const objectType = config.aacObjectType ?? DEFAULT_AAC_OBJECT_TYPE;
+	const profile = Math.max(0, objectType - 1) & 3;
+	const freqIdx = aacSampleRateIndex(config.sampleRate) & 15;
+	const chanCfg = Math.max(1, config.channels) & 7;
+	const frameLength = payloadLength + 7;
+	const h = Buffer.alloc(7);
+	h[0] = 255;
+	h[1] = 241;
+	h[2] = profile << 6 | freqIdx << 2 | chanCfg >> 2 & 1;
+	h[3] = (chanCfg & 3) << 6 | frameLength >> 11 & 3;
+	h[4] = frameLength >> 3 & 255;
+	h[5] = (frameLength & 7) << 5 | 31;
+	h[6] = 252;
+	return h;
+}
+/**
+* Return `frame` framed as ADTS: unchanged when it already carries an ADTS
+* sync, otherwise the 7-byte header prepended. Pure; the input is never mutated.
+*/
+function wrapAacAsAdts(frame, config) {
+	if (hasAdtsSync(frame)) return Buffer.from(frame.buffer, frame.byteOffset, frame.byteLength);
+	const payload = Buffer.from(frame.buffer, frame.byteOffset, frame.byteLength);
+	return Buffer.concat([buildAdtsHeader(config, payload.length), payload]);
+}
+//#endregion
 //#region src/audio-codec-ffmpeg/ffmpeg-audio-decode-session.ts
 var FfmpegAudioDecodeSession = class {
 	logger;
@@ -628,6 +704,14 @@ var FfmpegAudioDecodeSession = class {
 	* which pipe their encoded frames straight through.
 	*/
 	oggFramer;
+	/**
+	* ADTS framing config, present ONLY when the codec is AAC. `ffmpeg -f aac`
+	* is the ADTS demuxer, but every AAC source delivers raw AAC access units
+	* (push sources emit bare frames; rfc3640 depacketization yields bare AUs) —
+	* piping those in raw fails `Invalid data found when processing input` → no
+	* PCM → silent WebRTC audio. Each frame is ADTS-wrapped before ffmpeg.
+	*/
+	adtsConfig;
 	residual = Buffer.alloc(0);
 	nextPts = 0;
 	destroyed = false;
@@ -642,6 +726,10 @@ var FfmpegAudioDecodeSession = class {
 			channelCount: Math.max(1, params.sourceChannels),
 			serial: serialFromSeed(params.oggSerialSeed ?? "audio-codec-ffmpeg-opus")
 		}) : null;
+		this.adtsConfig = resolveAudioCodecAlias(params.codec) === "aac" ? {
+			sampleRate: params.sourceSampleRate,
+			channels: Math.max(1, params.sourceChannels)
+		} : null;
 		const args = buildAudioDecodeArgs(params);
 		this.process = new FfmpegAudioProcess({
 			ffmpegPath: params.ffmpegPath,
@@ -665,6 +753,10 @@ var FfmpegAudioDecodeSession = class {
 			this.process.write(this.oggFramer.framePacket(packet));
 			return;
 		}
+		if (this.adtsConfig) {
+			this.process.write(wrapAacAsAdts(data, this.adtsConfig));
+			return;
+		}
 		this.process.write(data);
 	}
 	handleStdout(chunk) {
@@ -891,6 +983,29 @@ var AudioCodecFfmpegAddon = class extends BaseAddon {
 		if (!entry) return false;
 		return input.kind === "decode" ? entry.canDecode : entry.canEncode;
 	}
+	/**
+	* The BARE cluster node id this addon runs on (e.g. `hub`) — stamped into a
+	* session's return so the caller pins its follow-up `pushEncodedFrame` /
+	* `pullPcm` / `closeSession` to the same node. `ctx.kernel.localNodeId` is
+	* the COMPOUND `<node>/<addon>` form (e.g. `hub/audio-codec-ffmpeg`), but the
+	* cap route resolver matches an explicit `nodeId` against the bare node id
+	* (`classifyExplicitNode`: `nodeId === hubNodeId`). Returning the compound
+	* form makes every pinned call fall through to a remote-Moleculer dispatch
+	* for a non-existent service → `Services waiting is timed out` → no WebRTC
+	* audio, cluster-wide. Strip the addon suffix. Mirrors `decoder-ffmpeg`'s
+	* `resolveLocalNodeId`.
+	*
+	* TODO(arch): this bare-node normalization is duplicated across
+	* `decoder-ffmpeg`, `decoder-nodeav`, `audio-codec-ffmpeg`, and
+	* `decoder-backend-keys.normalizeDecoderNodeId`. It should live ONCE on the
+	* shared surface — either a bare `ctx.kernel.nodeId` accessor alongside the
+	* compound `localNodeId`, or a base-addon helper — so no addon can leak the
+	* compound `<node>/<addon>` id into a routing `nodeId` again (this exact bug).
+	*/
+	resolveLocalNodeId() {
+		const raw = this.ctx.kernel.localNodeId ?? "local";
+		return raw.includes("/") ? raw.split("/")[0] : raw;
+	}
 	async createDecodeSession(input) {
 		const codec = resolveAudioCodecAlias(input.codec);
 		const entry = CODEC_CATALOG.find((e) => resolveAudioCodecAlias(e.codec) === codec);
@@ -922,7 +1037,7 @@ var AudioCodecFfmpegAddon = class extends BaseAddon {
 		});
 		return {
 			sessionId,
-			nodeId: this.ctx.kernel.localNodeId ?? "local"
+			nodeId: this.resolveLocalNodeId()
 		};
 	}
 	async createEncodeSession(input) {
@@ -956,7 +1071,7 @@ var AudioCodecFfmpegAddon = class extends BaseAddon {
 		});
 		return {
 			sessionId,
-			nodeId: this.ctx.kernel.localNodeId ?? "local"
+			nodeId: this.resolveLocalNodeId()
 		};
 	}
 	async closeSession(input) {

package/dist/decoder-ffmpeg/index.js

@@ -2,9 +2,9 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_dist = require("../dist-Cwc0TUQr.js");
-const require_frame_ring_sink = require("../frame-ring-sink-DvdhCFr3.js");
-const require_ffmpeg_args = require("../ffmpeg-args-D6h1edXK.js");
+const require_dist = require("../dist-BrIE85BG.js");
+const require_frame_ring_sink = require("../frame-ring-sink-B-DxHelU.js");
+const require_ffmpeg_args = require("../ffmpeg-args-Dl9mLcOC.js");
 const require_frame_dropper = require("../frame-dropper-DKLM6pMz.js");
 let _camstack_shm_ring = require("@camstack/shm-ring");
 let node_crypto = require("node:crypto");
@@ -114,6 +114,13 @@ var HWACCEL_FALLBACK_WINDOW_MS = 4e3;
 * session down (`destroy`) cancels the pending re-dial.
 */
 var PULL_REDIAL_DELAY_MS = 3e3;
+/**
+* Safety ceiling for the current-GOP replay buffer (push mode). A GOP resets on
+* every keyframe so this is never reached by a well-behaved stream; it only
+* bounds a pathological long/no-keyframe stream. When exceeded, only the
+* keyframe is retained — enough to re-prime the decoder's SPS/PPS on a re-spawn.
+*/
+var MAX_GOP_BUFFER_BYTES = 16 * 1024 * 1024;
 var FfmpegDecoderSession = class {
 	config;
 	logger;
@@ -185,6 +192,18 @@ var FfmpegDecoderSession = class {
 	handleCallbacks = /* @__PURE__ */ new Set();
 	frameDropper;
 	inputPackets = 0;
+	/**
+	* Current-GOP Annex-B packet bytes (push mode), from the most recent keyframe
+	* forward. Replayed keyframe-first into every freshly-spawned child so a
+	* hwaccel cascade re-spawn (`vaapi → qsv → software`) or a config restart
+	* resumes on a keyframe instead of the live mid-GOP P-frame the dead child had
+	* already consumed — which the fallback child would otherwise choke on
+	* (`non-existing PPS 0`) until the next live keyframe. Mirrors the reference
+	* NVR libav decoder, which replays its buffered packet list to each hwaccel
+	* candidate. Reset on each keyframe; unused in pull mode.
+	*/
+	gopBuffer = [];
+	gopBufferBytes = 0;
 	outputFrames = 0;
 	droppedFrames = 0;
 	startTime = Date.now();
@@ -280,6 +299,7 @@ var FfmpegDecoderSession = class {
 		this.process = child;
 		this.spawnedAtMs = Date.now();
 		child.stdin?.on("error", () => {});
+		this.replayGopBuffer(child);
 		child.stdout?.on("data", (chunk) => {
 			if (child === this.process) this.handleStdout(chunk);
 		});
@@ -491,14 +511,50 @@ var FfmpegDecoderSession = class {
 	pushPacket(packet) {
 		if (this.destroyed) return;
 		if (this.pullUrl !== null) return;
-		if (this.process === null && !this.spawnAttempted) this.spawnFfmpeg();
+		this.recordGop(packet);
+		this.inputPackets++;
+		if (this.process === null && !this.spawnAttempted) {
+			this.spawnFfmpeg();
+			return;
+		}
 		const stdin = this.process?.stdin;
 		if (!stdin) return;
-		this.inputPackets++;
 		try {
 			stdin.write(packet.data);
 		} catch {}
 	}
+	/**
+	* Accumulate the current GOP for the keyframe-first re-spawn replay. Reset on
+	* each keyframe; P-frames before the first keyframe are ignored (useless to
+	* prime a decoder). A pathological long/no-keyframe GOP is capped to the
+	* keyframe alone (enough to re-prime SPS/PPS).
+	*/
+	recordGop(packet) {
+		if (packet.keyframe) {
+			this.gopBuffer = [packet.data];
+			this.gopBufferBytes = packet.data.length;
+			return;
+		}
+		if (this.gopBuffer.length === 0) return;
+		this.gopBuffer.push(packet.data);
+		this.gopBufferBytes += packet.data.length;
+		if (this.gopBufferBytes > MAX_GOP_BUFFER_BYTES) {
+			const keyframe = this.gopBuffer[0];
+			this.gopBuffer = [keyframe];
+			this.gopBufferBytes = keyframe.length;
+		}
+	}
+	/** Replay the buffered GOP (keyframe-first) into a freshly-spawned push child. */
+	replayGopBuffer(child) {
+		if (this.pullUrl !== null || this.gopBuffer.length === 0) return;
+		const stdin = child.stdin;
+		if (!stdin) return;
+		for (const buf of this.gopBuffer) try {
+			stdin.write(buf);
+		} catch {
+			return;
+		}
+	}
 	onFrame(callback) {
 		this.frameCallbacks.add(callback);
 		return () => {
@@ -709,7 +765,16 @@ var DecoderFfmpegAddon = class extends require_dist.BaseAddon {
 		if (!this.config.probedBestHwaccel) this.reprobeHwaccel().catch((err) => {
 			this.ctx.logger.warn("ffmpeg: auto-reprobe hwaccel failed", { meta: { error: err instanceof Error ? err.message : String(err) } });
 		});
-		const backend = await require_frame_ring_sink.resolveDecoderBackend(this.ctx.api, this.resolveLocalNodeId(), this.ctx.logger);
+		let backend;
+		try {
+			backend = require_frame_ring_sink.resolveOwnDecoderBackend(await this.resolveGlobalStore(this.resolveLocalNodeId()));
+		} catch (err) {
+			this.ctx.logger.warn("decoder-ffmpeg: own-store backend read failed — using default", { meta: {
+				default: require_frame_ring_sink.DEFAULT_DECODER_BACKEND,
+				error: err instanceof Error ? err.message : String(err)
+			} });
+			backend = require_frame_ring_sink.DEFAULT_DECODER_BACKEND;
+		}
 		if (backend !== "ffmpeg") {
 			this.ctx.logger.info("ffmpeg decoder: this node selects a different decoder backend — standing down (no decoder provider registered)", { meta: { selectedBackend: backend } });
 			return [];

package/dist/decoder-ffmpeg/index.mjs

@@ -1,6 +1,6 @@
-import { B as errMsg, V as BaseAddon, d as HWACCEL_OPTIONS, s as DEFAULT_DECODER_HWACCEL_CONFIG, x as decoderCapability } from "../dist-DjuGmyG9.mjs";
-import { a as resolveDecoderBackend, i as NotifyingRingBuffer, n as RING_BUDGET_MB, s as DEFAULT_DECODER_BACKEND, t as DecoderFrameRingSink } from "../frame-ring-sink-sY-8XUsH.mjs";
-import { a as codecToInputFormat, c as maxDecodeWidth, d as pickDecodeHwAccel, f as rankDecodeHwAccels, i as channelsForPixel, l as parseAvailableGpuScaleFilters, m as resolveGpuScaleFilter, n as DEFAULT_VAAPI_RENDER_DEVICE, o as computeOutputGeometry, p as rawPixelForFormat, r as buildFfmpegDecodeArgs, s as isSoftwareHwAccel, t as DECODE_HWACCEL_RANK, u as parseFfmpegOutputDims } from "../ffmpeg-args-C5GPp8Cw.mjs";
+import { B as errMsg, V as BaseAddon, d as HWACCEL_OPTIONS, s as DEFAULT_DECODER_HWACCEL_CONFIG, x as decoderCapability } from "../dist-CfSORkv2.mjs";
+import { c as DEFAULT_DECODER_BACKEND, i as NotifyingRingBuffer, n as RING_BUDGET_MB, s as resolveOwnDecoderBackend, t as DecoderFrameRingSink } from "../frame-ring-sink-B_WjDX0x.mjs";
+import { a as codecToInputFormat, c as maxDecodeWidth, d as pickDecodeHwAccel, f as rankDecodeHwAccels, i as channelsForPixel, l as parseAvailableGpuScaleFilters, m as resolveGpuScaleFilter, n as DEFAULT_VAAPI_RENDER_DEVICE, o as computeOutputGeometry, p as rawPixelForFormat, r as buildFfmpegDecodeArgs, s as isSoftwareHwAccel, t as DECODE_HWACCEL_RANK, u as parseFfmpegOutputDims } from "../ffmpeg-args-CpeRWwL4.mjs";
 import { t as FrameDropper } from "../frame-dropper-AjheBGMG.mjs";
 import { FrameRingReaderCache } from "@camstack/shm-ring";
 import { randomUUID } from "node:crypto";
@@ -110,6 +110,13 @@ var HWACCEL_FALLBACK_WINDOW_MS = 4e3;
 * session down (`destroy`) cancels the pending re-dial.
 */
 var PULL_REDIAL_DELAY_MS = 3e3;
+/**
+* Safety ceiling for the current-GOP replay buffer (push mode). A GOP resets on
+* every keyframe so this is never reached by a well-behaved stream; it only
+* bounds a pathological long/no-keyframe stream. When exceeded, only the
+* keyframe is retained — enough to re-prime the decoder's SPS/PPS on a re-spawn.
+*/
+var MAX_GOP_BUFFER_BYTES = 16 * 1024 * 1024;
 var FfmpegDecoderSession = class {
 	config;
 	logger;
@@ -181,6 +188,18 @@ var FfmpegDecoderSession = class {
 	handleCallbacks = /* @__PURE__ */ new Set();
 	frameDropper;
 	inputPackets = 0;
+	/**
+	* Current-GOP Annex-B packet bytes (push mode), from the most recent keyframe
+	* forward. Replayed keyframe-first into every freshly-spawned child so a
+	* hwaccel cascade re-spawn (`vaapi → qsv → software`) or a config restart
+	* resumes on a keyframe instead of the live mid-GOP P-frame the dead child had
+	* already consumed — which the fallback child would otherwise choke on
+	* (`non-existing PPS 0`) until the next live keyframe. Mirrors the reference
+	* NVR libav decoder, which replays its buffered packet list to each hwaccel
+	* candidate. Reset on each keyframe; unused in pull mode.
+	*/
+	gopBuffer = [];
+	gopBufferBytes = 0;
 	outputFrames = 0;
 	droppedFrames = 0;
 	startTime = Date.now();
@@ -276,6 +295,7 @@ var FfmpegDecoderSession = class {
 		this.process = child;
 		this.spawnedAtMs = Date.now();
 		child.stdin?.on("error", () => {});
+		this.replayGopBuffer(child);
 		child.stdout?.on("data", (chunk) => {
 			if (child === this.process) this.handleStdout(chunk);
 		});
@@ -487,14 +507,50 @@ var FfmpegDecoderSession = class {
 	pushPacket(packet) {
 		if (this.destroyed) return;
 		if (this.pullUrl !== null) return;
-		if (this.process === null && !this.spawnAttempted) this.spawnFfmpeg();
+		this.recordGop(packet);
+		this.inputPackets++;
+		if (this.process === null && !this.spawnAttempted) {
+			this.spawnFfmpeg();
+			return;
+		}
 		const stdin = this.process?.stdin;
 		if (!stdin) return;
-		this.inputPackets++;
 		try {
 			stdin.write(packet.data);
 		} catch {}
 	}
+	/**
+	* Accumulate the current GOP for the keyframe-first re-spawn replay. Reset on
+	* each keyframe; P-frames before the first keyframe are ignored (useless to
+	* prime a decoder). A pathological long/no-keyframe GOP is capped to the
+	* keyframe alone (enough to re-prime SPS/PPS).
+	*/
+	recordGop(packet) {
+		if (packet.keyframe) {
+			this.gopBuffer = [packet.data];
+			this.gopBufferBytes = packet.data.length;
+			return;
+		}
+		if (this.gopBuffer.length === 0) return;
+		this.gopBuffer.push(packet.data);
+		this.gopBufferBytes += packet.data.length;
+		if (this.gopBufferBytes > MAX_GOP_BUFFER_BYTES) {
+			const keyframe = this.gopBuffer[0];
+			this.gopBuffer = [keyframe];
+			this.gopBufferBytes = keyframe.length;
+		}
+	}
+	/** Replay the buffered GOP (keyframe-first) into a freshly-spawned push child. */
+	replayGopBuffer(child) {
+		if (this.pullUrl !== null || this.gopBuffer.length === 0) return;
+		const stdin = child.stdin;
+		if (!stdin) return;
+		for (const buf of this.gopBuffer) try {
+			stdin.write(buf);
+		} catch {
+			return;
+		}
+	}
 	onFrame(callback) {
 		this.frameCallbacks.add(callback);
 		return () => {
@@ -705,7 +761,16 @@ var DecoderFfmpegAddon = class extends BaseAddon {
 		if (!this.config.probedBestHwaccel) this.reprobeHwaccel().catch((err) => {
 			this.ctx.logger.warn("ffmpeg: auto-reprobe hwaccel failed", { meta: { error: err instanceof Error ? err.message : String(err) } });
 		});
-		const backend = await resolveDecoderBackend(this.ctx.api, this.resolveLocalNodeId(), this.ctx.logger);
+		let backend;
+		try {
+			backend = resolveOwnDecoderBackend(await this.resolveGlobalStore(this.resolveLocalNodeId()));
+		} catch (err) {
+			this.ctx.logger.warn("decoder-ffmpeg: own-store backend read failed — using default", { meta: {
+				default: DEFAULT_DECODER_BACKEND,
+				error: err instanceof Error ? err.message : String(err)
+			} });
+			backend = DEFAULT_DECODER_BACKEND;
+		}
 		if (backend !== "ffmpeg") {
 			this.ctx.logger.info("ffmpeg decoder: this node selects a different decoder backend — standing down (no decoder provider registered)", { meta: { selectedBackend: backend } });
 			return [];