@camstack/addon-pipeline 1.1.27 → 1.1.29

package/dist/decoder-nodeav/index.mjs

@@ -1,5 +1,6 @@
-import { B as errMsg, V as BaseAddon, d as HWACCEL_OPTIONS, p as RingBuffer, s as DEFAULT_DECODER_HWACCEL_CONFIG, x as decoderCapability } from "../dist-CgEP_0OL.mjs";
-import { i as resolveDecoderBackend, n as RING_BUDGET_MB, r as makeSegmentName, t as DecoderFrameRingSink } from "../frame-ring-sink-B_NvPTJZ.mjs";
+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, r as makeSegmentName, t as DecoderFrameRingSink } from "../frame-ring-sink-ClEWjiRU.mjs";
+import { f as rankDecodeHwAccels } from "../ffmpeg-args-C5GPp8Cw.mjs";
 import { FrameRingReaderCache } from "@camstack/shm-ring";
 import { randomUUID } from "node:crypto";
 //#region src/decoder-nodeav/scaler-geometry.ts
@@ -915,7 +916,8 @@ var DecoderNodeAvAddon = class extends BaseAddon {
 				label: "Preferred backend",
 				options: [...HWACCEL_OPTIONS],
 				default: "auto",
-				immediate: true
+				immediate: true,
+				perNode: true
 			}), this.field({
 				type: "text",
 				key: "probedBestHwaccel",
@@ -923,6 +925,7 @@ var DecoderNodeAvAddon = class extends BaseAddon {
 				description: "Auto-detected best decoder backend on this host. Click the refresh icon to re-run the probe.",
 				readonlyField: true,
 				default: "",
+				perNode: true,
 				actions: [{
 					action: "reprobe-hwaccel",
 					icon: "refresh-cw",
@@ -932,7 +935,7 @@ var DecoderNodeAvAddon = class extends BaseAddon {
 		}] });
 	}
 	async onInitialize() {
-		const backend = await resolveDecoderBackend(this.ctx.settings, this.resolveLocalNodeId(), this.ctx.logger);
+		const backend = await resolveDecoderBackend(this.ctx.api, this.resolveLocalNodeId(), this.ctx.logger);
 		if (backend !== "nodeav") {
 			this.ctx.logger.info("node-av decoder: this node selects a different decoder backend — standing down (no decoder provider registered)", { meta: { selectedBackend: backend } });
 			return [];
@@ -966,13 +969,13 @@ var DecoderNodeAvAddon = class extends BaseAddon {
 		const resolver = this.ctx.kernel.hwaccel;
 		if (!resolver) {
 			this.ctx.logger.warn("reprobeHwaccel: no kernel hwaccel resolver — returning none");
-			await this.ctx.settings?.writeAddonStore({ probedBestHwaccel: "none" });
+			await this.updateGlobalSettings({ probedBestHwaccel: "none" });
 			return { backend: "none" };
 		}
 		try {
 			const res = await resolver.resolve();
-			const backend = res.preferred[0] ?? "none";
-			await this.ctx.settings?.writeAddonStore({ probedBestHwaccel: backend });
+			const backend = rankDecodeHwAccels(res.preferred, [])[0] ?? "none";
+			await this.updateGlobalSettings({ probedBestHwaccel: backend });
 			this.ctx.logger.info("reprobeHwaccel: wrote probedBestHwaccel", { meta: {
 				backend,
 				rationale: res.rationale,
@@ -981,7 +984,7 @@ var DecoderNodeAvAddon = class extends BaseAddon {
 			return { backend };
 		} catch (err) {
 			this.ctx.logger.warn("reprobeHwaccel failed", { meta: { error: err instanceof Error ? err.message : String(err) } });
-			await this.ctx.settings?.writeAddonStore({ probedBestHwaccel: "none" });
+			await this.updateGlobalSettings({ probedBestHwaccel: "none" });
 			return { backend: "none" };
 		}
 	}
@@ -1048,7 +1051,7 @@ var DecoderNodeAvAddon = class extends BaseAddon {
 	* ring buffer drained by `pullFrames`.
 	*/
 	wireCallbackSink(sessionId, session) {
-		const ringBuffer = new RingBuffer(FRAME_BUFFER_CAPACITY);
+		const ringBuffer = new NotifyingRingBuffer(FRAME_BUFFER_CAPACITY);
 		this.frameBuffers.set(sessionId, ringBuffer);
 		return session.onFrame((frame) => {
 			const { format } = frame;
@@ -1071,7 +1074,7 @@ var DecoderNodeAvAddon = class extends BaseAddon {
 	* — the broker opens the named segment and reads the pixels zero-copy.
 	*/
 	wireShmSink(sessionId, session) {
-		const handleRing = new RingBuffer(FRAME_BUFFER_CAPACITY);
+		const handleRing = new NotifyingRingBuffer(FRAME_BUFFER_CAPACITY);
 		this.handleBuffers.set(sessionId, handleRing);
 		return session.onFrameHandle((frame) => {
 			handleRing.push(frame.handle);
@@ -1083,6 +1086,8 @@ var DecoderNodeAvAddon = class extends BaseAddon {
 		if (!session) throw new Error(`decoder-nodeav: unknown sessionId ${sessionId}`);
 		const unsub = this.unsubscribers.get(sessionId);
 		if (unsub) unsub();
+		this.frameBuffers.get(sessionId)?.cancel();
+		this.handleBuffers.get(sessionId)?.cancel();
 		await session.destroy();
 		this.sessions.delete(sessionId);
 		this.frameBuffers.delete(sessionId);
@@ -1119,12 +1124,14 @@ var DecoderNodeAvAddon = class extends BaseAddon {
 		if (!this.sessions.has(input.sessionId)) throw new Error(`decoder-nodeav: unknown sessionId ${input.sessionId}`);
 		const ringBuffer = this.frameBuffers.get(input.sessionId);
 		if (!ringBuffer) return [];
+		if (ringBuffer.size === 0 && input.waitMs) await ringBuffer.waitForItem(input.waitMs);
 		return ringBuffer.drain(input.maxCount);
 	}
 	async pullHandles(input) {
 		if (!this.sessions.has(input.sessionId)) throw new Error(`decoder-nodeav: unknown sessionId ${input.sessionId}`);
 		const handleRing = this.handleBuffers.get(input.sessionId);
 		if (!handleRing) return [];
+		if (handleRing.size === 0 && input.waitMs) await handleRing.waitForItem(input.waitMs);
 		return handleRing.drain(input.maxCount);
 	}
 	async updateConfig(input) {