@camstack/addon-pipeline 1.1.31 → 1.1.33

package/dist/stream-broker/index.js

@@ -3,9 +3,9 @@ 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_frame_handle_plane = require("../frame-handle-plane-DQNCTrpC.js");
-const require_ffmpeg_args = require("../ffmpeg-args-D6h1edXK.js");
+const require_dist = require("../dist-BrIE85BG.js");
+const require_frame_handle_plane = require("../frame-handle-plane-zMju9vmk.js");
+const require_ffmpeg_args = require("../ffmpeg-args-Dl9mLcOC.js");
 const require_frame_dropper = require("../frame-dropper-DKLM6pMz.js");
 let node_crypto = require("node:crypto");
 node_crypto = require_model_download_service_C_IHWnXx.__toESM(node_crypto);
@@ -3949,14 +3949,6 @@ var AdaptiveSession = class AdaptiveSession {
 						const frame = mediaFrame.frame;
 						if (!this.audioSender) continue;
 						const rtpTs = Math.floor(frame.timestampMicros * AdaptiveSession.PCMU_RTP_CLOCK_HZ / 1e6) >>> 0;
-						if (this.debug) this.logger.info("audio frame in (direct-feed)", { meta: {
-							phase: "session",
-							sessionId: this.sessionId,
-							timestampMicros: frame.timestampMicros,
-							dataLen: frame.data.length,
-							computedRtpTs: rtpTs,
-							codec: frame.codec
-						} });
 						this.recordAudioSourceLatency(frame.timestampMicros);
 						this.writeAudio(frame.data, rtpTs, frame.codec);
 					}
@@ -4076,14 +4068,6 @@ var AdaptiveSession = class AdaptiveSession {
 					if (mediaFrame.type === "audio") {
 						const frame = mediaFrame.frame;
 						const rtpTs = Math.floor(frame.timestampMicros * AdaptiveSession.PCMU_RTP_CLOCK_HZ / 1e6) >>> 0;
-						if (this.debug) this.logger.info("audio frame in (transcode passthrough)", { meta: {
-							phase: "session",
-							sessionId: this.sessionId,
-							timestampMicros: frame.timestampMicros,
-							dataLen: frame.data.length,
-							computedRtpTs: rtpTs,
-							codec: frame.codec
-						} });
 						this.recordAudioSourceLatency(frame.timestampMicros);
 						this.writeAudio(frame.data, rtpTs, frame.codec);
 					}
@@ -8788,6 +8772,77 @@ var EncodedRingBuffer = class {
 	}
 };
 //#endregion
+//#region src/stream-broker/stream-broker/annexb-param-sets.ts
+/**
+* Annex-B parameter-set detection for the decoder-priming path.
+*
+* The frame-handle-plane decoder (`ffmpeg -f h264|hevc -i pipe:0`) initialises
+* only once it sees the codec parameter sets (H.264 SPS+PPS / H.265 SPS+PPS,
+* plus VPS) in its Annex-B input. Most cameras carry them in-band with each
+* IDR; some (Reolink high-profile native streams) ship them ONLY in the SDP.
+* The broker harvests those SDP param sets (`sdpParameterSets`) but must not
+* blindly re-inject them ahead of every keyframe — that would duplicate the
+* sets for well-behaved cameras. This scan lets the broker inject only when a
+* keyframe's own NAL stream is missing them.
+*
+* Pure byte scanning: no allocation beyond the walk; safe on any Annex-B blob.
+*/
+/** Required parameter-set NAL types per codec (SPS, PPS). */
+var H264_SPS = 7;
+var H264_PPS = 8;
+var H265_SPS = 33;
+var H265_PPS = 34;
+function isH265Codec(codec) {
+	const c = codec.toLowerCase();
+	return c.includes("265") || c.includes("hevc");
+}
+/**
+* True when `data` already carries BOTH the SPS and the PPS the decoder needs
+* to initialise (per `codec`). Walks Annex-B NAL units by their 3- or 4-byte
+* start codes and reads each NAL header type. Returns as soon as both are seen.
+*/
+function annexBHasParameterSets(data, codec) {
+	const h265 = isH265Codec(codec);
+	const spsType = h265 ? H265_SPS : H264_SPS;
+	const ppsType = h265 ? H265_PPS : H264_PPS;
+	let hasSps = false;
+	let hasPps = false;
+	const len = data.length;
+	let i = 0;
+	while (i + 3 < len) {
+		if (data[i] === 0 && data[i + 1] === 0) {
+			let nalStart = -1;
+			if (data[i + 2] === 1) nalStart = i + 3;
+			else if (data[i + 2] === 0 && data[i + 3] === 1) nalStart = i + 4;
+			if (nalStart >= 0 && nalStart < len) {
+				const headerByte = data[nalStart];
+				const nalType = h265 ? headerByte >> 1 & 63 : headerByte & 31;
+				if (nalType === spsType) hasSps = true;
+				else if (nalType === ppsType) hasPps = true;
+				if (hasSps && hasPps) return true;
+				i = nalStart + 1;
+				continue;
+			}
+		}
+		i += 1;
+	}
+	return hasSps && hasPps;
+}
+/**
+* Concatenate raw parameter-set NAL payloads into a single Annex-B buffer
+* (each prefixed with a 4-byte start code) — the shape the decoder's stdin
+* expects. Mirrors the existing SDP-param-set replay for encoded subscribers.
+*/
+function concatParameterSetsAnnexB(parameterSets) {
+	const startCode = Buffer.from([
+		0,
+		0,
+		0,
+		1
+	]);
+	return Buffer.concat(parameterSets.flatMap((ps) => [startCode, ps]));
+}
+//#endregion
 //#region src/stream-broker/stream-broker/g711-mulaw.ts
 /**
 * G.711 µ-law encoder — converts 16-bit signed PCM samples to µ-law (ITU-T G.711).
@@ -9008,6 +9063,8 @@ var StreamBroker = class StreamBroker {
 	* falls back to the source passed to `start()`.
 	*/
 	sourceProvider = null;
+	/** Resolver for this broker's own RTSP restream URL — see `setRestreamUrlResolver`. */
+	restreamUrlResolver = null;
 	/**
 	* Manager-supplied notifier that asks the publishing addon to
 	* refresh its loopback transport (e.g. re-run
@@ -9141,6 +9198,17 @@ var StreamBroker = class StreamBroker {
 	pipeServer;
 	rtspRestreamer;
 	preBuffer;
+	/**
+	* Keyframe-aligned GOP of the EXACT packets fed to the decoder plane (i.e.
+	* param-set prepended). Replayed to a freshly-armed shm decoder session so it
+	* initialises on a keyframe (SPS/PPS) instead of the next live P-frame — the
+	* decoder cold-start fix for push-mode sessions. Populated for ALL source
+	* types (unlike `preBuffer`, which push-only sources fill for the WebRTC
+	* late-join path): an rfc4571 Reolink source has an EMPTY `preBuffer`, so this
+	* is the only GOP available to seed its decoder. `getPackets()` returns just
+	* the current GOP (from the last keyframe), so a modest retention suffices.
+	*/
+	decoderSeedBuffer;
 	encodedCallbacks = /* @__PURE__ */ new Map();
 	/**
 	* Source-RTP video subscribers — receive raw on-wire RTP bytes
@@ -9251,6 +9319,13 @@ var StreamBroker = class StreamBroker {
 	static DEFAULT_PRE_BUFFER_SEC = 10;
 	/** Maximum allowed pre-buffer duration in seconds */
 	static MAX_PRE_BUFFER_SEC = 30;
+	/**
+	* Retention for the decoder-seed GOP ring. Only ever needs to hold the
+	* current GOP (a fresh keyframe evicts the previous GOP on read), so a few
+	* seconds covers every realistic keyframe interval; cameras with a GOP longer
+	* than this fall back to the plane's live-keyframe bootstrap.
+	*/
+	static DECODER_SEED_BUFFER_SEC = 6;
 	constructor(deviceId, decoderApi, logger, audioCodecApi, localNodeId) {
 		this.deviceId = deviceId;
 		this.decoderApi = decoderApi;
@@ -9261,6 +9336,7 @@ var StreamBroker = class StreamBroker {
 		this.rtspRestreamer = new RtspRestreamer(deviceId);
 		if (logger) this.rtspRestreamer.setLogger(logger.child("rtsp"));
 		this.preBuffer = new EncodedRingBuffer(StreamBroker.DEFAULT_PRE_BUFFER_SEC);
+		this.decoderSeedBuffer = new EncodedRingBuffer(StreamBroker.DECODER_SEED_BUFFER_SEC);
 		this.audioChunkPlane = new AudioChunkPlane(logger?.child("audio-chunk-plane"));
 		this.rtspRestreamer.onSessionCountChanged(() => this.checkDemand());
 		this.pipeServer.onClientCountChanged(() => this.checkDemand());
@@ -9298,6 +9374,22 @@ var StreamBroker = class StreamBroker {
 		this.restreamers = restreamers;
 	}
 	/**
+	* Inject a manager-owned resolver for this broker's OWN RTSP restream URL
+	* (`rtsp://127.0.0.1:<port>/<token>[/muted]`). When the source is an RTP
+	* source ({@link isRtpSource}), the frame-handle decoder decodes via PULL
+	* mode from this restream instead of the broker's hand-depacketized AnnexB
+	* push feed — ffmpeg's own RTSP/RTP demuxer does the FU-A reassembly, which
+	* is robust where the AnnexB depacketizer chokes on heavily-fragmented 4K
+	* NALs (Reolink rfc4571 produced 0 decoded frames on the push path; the same
+	* stream decodes at full fps through the RTSP restream). Mirrors Scrypted's
+	* rebroadcast (prebuffer-mixin) which passes RTP through to the consumer's
+	* demuxer. Returns `null` before a restream token exists → falls back to the
+	* push path.
+	*/
+	setRestreamUrlResolver(resolver) {
+		this.restreamUrlResolver = resolver;
+	}
+	/**
 	* Inject the resolved `ffmpeg` binary path used by the "ffmpeg parser"
 	* ingress ({@link startFfmpegSourceReader}). Threaded from the manager's
 	* system-config (`ffmpeg.binaryPath`). Absent = bare `'ffmpeg'` (PATH lookup).
@@ -9451,6 +9543,7 @@ var StreamBroker = class StreamBroker {
 		await this.pipeServer.stop();
 		this.rtspRestreamer.destroy();
 		this.preBuffer.clear();
+		this.decoderSeedBuffer.clear();
 		this.pendingParamNals = [];
 		this.firstKeyframeReceived = false;
 		this.encodedCallbacks.clear();
@@ -9547,6 +9640,7 @@ var StreamBroker = class StreamBroker {
 			this.placeholderTimer = void 0;
 		}
 		this.preBuffer.clear();
+		this.decoderSeedBuffer.clear();
 		this.firstKeyframeReceived = false;
 		this.pendingParamNals = [];
 		this.rtspRestreamer.resetStreamState();
@@ -9680,7 +9774,46 @@ var StreamBroker = class StreamBroker {
 			const streamId = `${this.deviceId}/video`;
 			restreamer.pushPacket(streamId, packet);
 		}
-		if (packet.type === "video" && this.firstKeyframeReceived) this.frameHandlePlane?.pushPacket(packet);
+		if (packet.type === "video" && this.firstKeyframeReceived) {
+			const decoderPacket = this.decoderPacketWithParamSets(packet);
+			this.decoderSeedBuffer.push(decoderPacket);
+			this.frameHandlePlane?.pushPacket(decoderPacket);
+		}
+	}
+	/**
+	* Return the packet to feed the decoder plane, prepending the SDP-harvested
+	* SPS/PPS to a keyframe that lacks them in-band.
+	*
+	* The plane seeds a freshly-armed decoder session with the SINGLE keyframe
+	* packet that triggered the arm (`armPendingSessions`), so the parameter sets
+	* MUST travel inside that same packet — a separate param-set packet pushed
+	* just before it reaches only already-live sessions and is lost on the
+	* arming one. Unlike the encoded-subscriber path (`emitSdpParamSetsTo`), the
+	* decoder plane is otherwise never handed `sdpParameterSets`. Cameras that
+	* ship parameter sets ONLY in the SDP (Reolink high-profile native streams)
+	* therefore starve the `ffmpeg -i pipe:0` decoder of SPS/PPS, which loops
+	* `non-existing PPS → no frame` and produces zero decoded frames (verified
+	* live on device 592: WebRTC worked, detection decoded nothing). Only
+	* keyframes actually missing the sets are rewritten — well-behaved cameras
+	* are returned untouched — and the check runs per keyframe so a decoder
+	* restart mid-stream re-primes on the next IDR. The returned object is a
+	* fresh copy; the original `packet` fanned out to the other consumers above
+	* (WebRTC, restreamers, pre-buffer) is never mutated.
+	*/
+	decoderPacketWithParamSets(packet) {
+		if (!packet.keyframe) return packet;
+		const paramSets = this.sdpParameterSets;
+		if (!paramSets || paramSets.length === 0) return packet;
+		if (annexBHasParameterSets(packet.data, packet.codec)) return packet;
+		if (this.streamingDebug) this.logger?.info("Prepending SDP param sets to decoder keyframe (in-band SPS/PPS absent)", { meta: {
+			codec: packet.codec,
+			psCount: paramSets.length,
+			keyframeBytes: packet.data.length
+		} });
+		return {
+			...packet,
+			data: Buffer.concat([concatParameterSetsAnnexB(paramSets), packet.data])
+		};
 	}
 	onEncodedData(callback, attribution = UNKNOWN_ATTRIBUTION) {
 		this.subscriberIdCounter += 1;
@@ -10021,11 +10154,12 @@ var StreamBroker = class StreamBroker {
 		if (!codec || !this.source) return null;
 		const slash = this.deviceId.indexOf("/");
 		const numericDeviceId = slash >= 0 ? Number.parseInt(this.deviceId.slice(0, slash), 10) : Number.parseInt(this.deviceId, 10);
+		const pullModeUrl = this.isRtpSource() ? this.restreamUrlResolver?.() ?? null : null;
 		return {
 			codec,
 			...Number.isFinite(numericDeviceId) ? { numericDeviceId } : {},
 			tag: `broker:${this.deviceId}`,
-			pullModeUrl: null
+			pullModeUrl
 		};
 	}
 	/** Lazily construct the frame-handle plane, returning `null` with no decoder. */
@@ -10039,7 +10173,8 @@ var StreamBroker = class StreamBroker {
 			decoderApi: this.decoderApi,
 			logger: this.logger?.child("frame-handle-plane"),
 			resolveStreamInfo: () => this.resolveFrameHandleStreamInfo(),
-			localNodeId: this.localNodeId
+			localNodeId: this.localNodeId,
+			getSeedPackets: () => this.decoderSeedBuffer.getPackets()
 		});
 		return this.frameHandlePlane;
 	}
@@ -12433,7 +12568,7 @@ var StreamBrokerManager = class {
 		const existing = this.upsertSourceCameraStream(deviceId, input);
 		const urlRefreshed = existing !== void 0 && input.url !== void 0 && existing.url !== input.url;
 		const wasAlreadyAssigned = (PUSH_KINDS.has(kind) ? findProfileForStream(this.assignments.get(deviceId)?.map ?? {}, camStreamId) : null) !== null && existing !== void 0;
-		await this.reconcileAutoAssignment(deviceId, "publish");
+		await this.reconcileAutoAssignment(deviceId, "publish", existing === void 0);
 		if (wasAlreadyAssigned) {
 			const finalProfile = findProfileForStream(this.assignments.get(deviceId)?.map ?? {}, camStreamId);
 			if (finalProfile !== null) this.emitCamStreamDemand(deviceId, camStreamId, finalProfile);
@@ -12481,7 +12616,8 @@ var StreamBrokerManager = class {
 		const urlBefore = /* @__PURE__ */ new Map();
 		for (const d of sources) urlBefore.set(d.camStreamId, streamMapBefore?.get(d.camStreamId)?.url);
 		for (const d of sources) this.upsertSourceCameraStream(deviceId, d);
-		await this.reconcileAutoAssignment(deviceId, "publish");
+		const anyNewStream = sources.some((d) => streamMapBefore?.get(d.camStreamId) === void 0);
+		await this.reconcileAutoAssignment(deviceId, "publish", anyNewStream);
 		for (const camStreamId of reEmitDemandFor) {
 			const profile = findProfileForStream(this.assignments.get(deviceId)?.map ?? {}, camStreamId);
 			if (profile !== null) this.emitCamStreamDemand(deviceId, camStreamId, profile);
@@ -13975,14 +14111,15 @@ var StreamBrokerManager = class {
 	* assignment). When the device's assignment is operator-locked
 	* (`auto === false`) the existing map is re-applied unchanged.
 	*/
-	async reconcileAutoAssignment(deviceId, reason) {
+	async reconcileAutoAssignment(deviceId, reason, streamAdded = false) {
 		const current = this.assignments.get(deviceId);
 		const streams = [...this.cameraStreams.get(deviceId)?.values() ?? []].toSorted((a, b) => a.order - b.order);
 		const isAuto = current?.auto ?? true;
 		const newMap = !current || isAuto && this.wouldChangeAutoMap(current.map, streams) ? this.computeInitialAssignment(streams) : current.map;
 		await this.applyAssignmentUpdate(deviceId, newMap, {
 			auto: isAuto,
-			reason
+			reason,
+			streamAdded
 		});
 	}
 	wouldChangeAutoMap(current, streams) {
@@ -14027,7 +14164,7 @@ var StreamBrokerManager = class {
 		if (anyChange || current.auto !== nextAssignment.auto) {
 			this.persistProfileMap();
 			this.emitProfileSlotsChanged(deviceId);
-		} else if (opts.reason === "publish") this.emitProfileSlotsChanged(deviceId);
+		} else if (opts.reason === "publish" && opts.streamAdded) this.emitProfileSlotsChanged(deviceId);
 		this.syncProfileRestreamers(deviceId);
 	}
 	countPushConsumers(map, deviceId) {
@@ -14218,6 +14355,7 @@ var StreamBrokerManager = class {
 		const source = this.buildSourceFromCamStream(cam);
 		const broker = new StreamBroker(brokerId, this.buildDecoderCapApi(deviceId), brokerLogger, buildAudioCodecCapApi(this.api), this.localNodeId);
 		broker.setRestreamers(this.restreamers);
+		broker.setRestreamUrlResolver(() => this.rtspProvider.getEntry(brokerId)?.mutedUrl ?? null);
 		broker.setFfmpegBinaryPath(this.ffmpegConfig.binaryPath);
 		this.applyPreBufferConfig(broker, deviceId, camStreamId, cam);
 		if (this.deviceOverrides.get(deviceId)?.streamingDebug) broker.setStreamingDebug(true);

package/dist/stream-broker/index.mjs

@@ -1,8 +1,8 @@
 import { t as __require } from "../chunk-BdkLduGY.mjs";
-import { B as errMsg, G as EventCategory, H as CAM_PROFILE_ORDER, J as makeProfileBrokerId, K as createEvent, L as streamBrokerCapability, O as maskUrlCredentials, U as DeviceFeature, V as BaseAddon, W as DeviceType, Y as makeSourceBrokerId, Z as parseProfileBrokerId, at as literal, ct as record, et as _enum, h as addonWidgetsSourceCapability, j as nodePin, l as EncodeProfileSchema, lt as string, nt as boolean, ot as number, p as RingBuffer, rt as discriminatedUnion, st as object, tt as array, ut as union, y as cameraStreamsCapability, z as webrtcSessionCapability } from "../dist-DjuGmyG9.mjs";
-import { n as DecoderSessionProxy, t as FrameHandlePlane } from "../frame-handle-plane-Bkxz-TTD.mjs";
+import { B as errMsg, G as EventCategory, H as CAM_PROFILE_ORDER, J as makeProfileBrokerId, K as createEvent, L as streamBrokerCapability, O as maskUrlCredentials, U as DeviceFeature, V as BaseAddon, W as DeviceType, Y as makeSourceBrokerId, Z as parseProfileBrokerId, at as literal, ct as record, et as _enum, h as addonWidgetsSourceCapability, j as nodePin, l as EncodeProfileSchema, lt as string, nt as boolean, ot as number, p as RingBuffer, rt as discriminatedUnion, st as object, tt as array, ut as union, y as cameraStreamsCapability, z as webrtcSessionCapability } from "../dist-CfSORkv2.mjs";
+import { n as DecoderSessionProxy, t as FrameHandlePlane } from "../frame-handle-plane-C05rq9Zs.mjs";
 import { t as createFileDataPlaneHandler } from "../model-download-service-C-IHWnXx-BPy6aoAx.mjs";
-import { f as rankDecodeHwAccels, g as logBannerArgs, h as audioEncoderArgs } from "../ffmpeg-args-C5GPp8Cw.mjs";
+import { f as rankDecodeHwAccels, g as logBannerArgs, h as audioEncoderArgs } from "../ffmpeg-args-CpeRWwL4.mjs";
 import { t as FrameDropper } from "../frame-dropper-AjheBGMG.mjs";
 import { createRequire } from "node:module";
 import * as crypto$1 from "node:crypto";
@@ -3945,14 +3945,6 @@ var AdaptiveSession = class AdaptiveSession {
 						const frame = mediaFrame.frame;
 						if (!this.audioSender) continue;
 						const rtpTs = Math.floor(frame.timestampMicros * AdaptiveSession.PCMU_RTP_CLOCK_HZ / 1e6) >>> 0;
-						if (this.debug) this.logger.info("audio frame in (direct-feed)", { meta: {
-							phase: "session",
-							sessionId: this.sessionId,
-							timestampMicros: frame.timestampMicros,
-							dataLen: frame.data.length,
-							computedRtpTs: rtpTs,
-							codec: frame.codec
-						} });
 						this.recordAudioSourceLatency(frame.timestampMicros);
 						this.writeAudio(frame.data, rtpTs, frame.codec);
 					}
@@ -4072,14 +4064,6 @@ var AdaptiveSession = class AdaptiveSession {
 					if (mediaFrame.type === "audio") {
 						const frame = mediaFrame.frame;
 						const rtpTs = Math.floor(frame.timestampMicros * AdaptiveSession.PCMU_RTP_CLOCK_HZ / 1e6) >>> 0;
-						if (this.debug) this.logger.info("audio frame in (transcode passthrough)", { meta: {
-							phase: "session",
-							sessionId: this.sessionId,
-							timestampMicros: frame.timestampMicros,
-							dataLen: frame.data.length,
-							computedRtpTs: rtpTs,
-							codec: frame.codec
-						} });
 						this.recordAudioSourceLatency(frame.timestampMicros);
 						this.writeAudio(frame.data, rtpTs, frame.codec);
 					}
@@ -8784,6 +8768,77 @@ var EncodedRingBuffer = class {
 	}
 };
 //#endregion
+//#region src/stream-broker/stream-broker/annexb-param-sets.ts
+/**
+* Annex-B parameter-set detection for the decoder-priming path.
+*
+* The frame-handle-plane decoder (`ffmpeg -f h264|hevc -i pipe:0`) initialises
+* only once it sees the codec parameter sets (H.264 SPS+PPS / H.265 SPS+PPS,
+* plus VPS) in its Annex-B input. Most cameras carry them in-band with each
+* IDR; some (Reolink high-profile native streams) ship them ONLY in the SDP.
+* The broker harvests those SDP param sets (`sdpParameterSets`) but must not
+* blindly re-inject them ahead of every keyframe — that would duplicate the
+* sets for well-behaved cameras. This scan lets the broker inject only when a
+* keyframe's own NAL stream is missing them.
+*
+* Pure byte scanning: no allocation beyond the walk; safe on any Annex-B blob.
+*/
+/** Required parameter-set NAL types per codec (SPS, PPS). */
+var H264_SPS = 7;
+var H264_PPS = 8;
+var H265_SPS = 33;
+var H265_PPS = 34;
+function isH265Codec(codec) {
+	const c = codec.toLowerCase();
+	return c.includes("265") || c.includes("hevc");
+}
+/**
+* True when `data` already carries BOTH the SPS and the PPS the decoder needs
+* to initialise (per `codec`). Walks Annex-B NAL units by their 3- or 4-byte
+* start codes and reads each NAL header type. Returns as soon as both are seen.
+*/
+function annexBHasParameterSets(data, codec) {
+	const h265 = isH265Codec(codec);
+	const spsType = h265 ? H265_SPS : H264_SPS;
+	const ppsType = h265 ? H265_PPS : H264_PPS;
+	let hasSps = false;
+	let hasPps = false;
+	const len = data.length;
+	let i = 0;
+	while (i + 3 < len) {
+		if (data[i] === 0 && data[i + 1] === 0) {
+			let nalStart = -1;
+			if (data[i + 2] === 1) nalStart = i + 3;
+			else if (data[i + 2] === 0 && data[i + 3] === 1) nalStart = i + 4;
+			if (nalStart >= 0 && nalStart < len) {
+				const headerByte = data[nalStart];
+				const nalType = h265 ? headerByte >> 1 & 63 : headerByte & 31;
+				if (nalType === spsType) hasSps = true;
+				else if (nalType === ppsType) hasPps = true;
+				if (hasSps && hasPps) return true;
+				i = nalStart + 1;
+				continue;
+			}
+		}
+		i += 1;
+	}
+	return hasSps && hasPps;
+}
+/**
+* Concatenate raw parameter-set NAL payloads into a single Annex-B buffer
+* (each prefixed with a 4-byte start code) — the shape the decoder's stdin
+* expects. Mirrors the existing SDP-param-set replay for encoded subscribers.
+*/
+function concatParameterSetsAnnexB(parameterSets) {
+	const startCode = Buffer.from([
+		0,
+		0,
+		0,
+		1
+	]);
+	return Buffer.concat(parameterSets.flatMap((ps) => [startCode, ps]));
+}
+//#endregion
 //#region src/stream-broker/stream-broker/g711-mulaw.ts
 /**
 * G.711 µ-law encoder — converts 16-bit signed PCM samples to µ-law (ITU-T G.711).
@@ -9004,6 +9059,8 @@ var StreamBroker = class StreamBroker {
 	* falls back to the source passed to `start()`.
 	*/
 	sourceProvider = null;
+	/** Resolver for this broker's own RTSP restream URL — see `setRestreamUrlResolver`. */
+	restreamUrlResolver = null;
 	/**
 	* Manager-supplied notifier that asks the publishing addon to
 	* refresh its loopback transport (e.g. re-run
@@ -9137,6 +9194,17 @@ var StreamBroker = class StreamBroker {
 	pipeServer;
 	rtspRestreamer;
 	preBuffer;
+	/**
+	* Keyframe-aligned GOP of the EXACT packets fed to the decoder plane (i.e.
+	* param-set prepended). Replayed to a freshly-armed shm decoder session so it
+	* initialises on a keyframe (SPS/PPS) instead of the next live P-frame — the
+	* decoder cold-start fix for push-mode sessions. Populated for ALL source
+	* types (unlike `preBuffer`, which push-only sources fill for the WebRTC
+	* late-join path): an rfc4571 Reolink source has an EMPTY `preBuffer`, so this
+	* is the only GOP available to seed its decoder. `getPackets()` returns just
+	* the current GOP (from the last keyframe), so a modest retention suffices.
+	*/
+	decoderSeedBuffer;
 	encodedCallbacks = /* @__PURE__ */ new Map();
 	/**
 	* Source-RTP video subscribers — receive raw on-wire RTP bytes
@@ -9247,6 +9315,13 @@ var StreamBroker = class StreamBroker {
 	static DEFAULT_PRE_BUFFER_SEC = 10;
 	/** Maximum allowed pre-buffer duration in seconds */
 	static MAX_PRE_BUFFER_SEC = 30;
+	/**
+	* Retention for the decoder-seed GOP ring. Only ever needs to hold the
+	* current GOP (a fresh keyframe evicts the previous GOP on read), so a few
+	* seconds covers every realistic keyframe interval; cameras with a GOP longer
+	* than this fall back to the plane's live-keyframe bootstrap.
+	*/
+	static DECODER_SEED_BUFFER_SEC = 6;
 	constructor(deviceId, decoderApi, logger, audioCodecApi, localNodeId) {
 		this.deviceId = deviceId;
 		this.decoderApi = decoderApi;
@@ -9257,6 +9332,7 @@ var StreamBroker = class StreamBroker {
 		this.rtspRestreamer = new RtspRestreamer(deviceId);
 		if (logger) this.rtspRestreamer.setLogger(logger.child("rtsp"));
 		this.preBuffer = new EncodedRingBuffer(StreamBroker.DEFAULT_PRE_BUFFER_SEC);
+		this.decoderSeedBuffer = new EncodedRingBuffer(StreamBroker.DECODER_SEED_BUFFER_SEC);
 		this.audioChunkPlane = new AudioChunkPlane(logger?.child("audio-chunk-plane"));
 		this.rtspRestreamer.onSessionCountChanged(() => this.checkDemand());
 		this.pipeServer.onClientCountChanged(() => this.checkDemand());
@@ -9294,6 +9370,22 @@ var StreamBroker = class StreamBroker {
 		this.restreamers = restreamers;
 	}
 	/**
+	* Inject a manager-owned resolver for this broker's OWN RTSP restream URL
+	* (`rtsp://127.0.0.1:<port>/<token>[/muted]`). When the source is an RTP
+	* source ({@link isRtpSource}), the frame-handle decoder decodes via PULL
+	* mode from this restream instead of the broker's hand-depacketized AnnexB
+	* push feed — ffmpeg's own RTSP/RTP demuxer does the FU-A reassembly, which
+	* is robust where the AnnexB depacketizer chokes on heavily-fragmented 4K
+	* NALs (Reolink rfc4571 produced 0 decoded frames on the push path; the same
+	* stream decodes at full fps through the RTSP restream). Mirrors Scrypted's
+	* rebroadcast (prebuffer-mixin) which passes RTP through to the consumer's
+	* demuxer. Returns `null` before a restream token exists → falls back to the
+	* push path.
+	*/
+	setRestreamUrlResolver(resolver) {
+		this.restreamUrlResolver = resolver;
+	}
+	/**
 	* Inject the resolved `ffmpeg` binary path used by the "ffmpeg parser"
 	* ingress ({@link startFfmpegSourceReader}). Threaded from the manager's
 	* system-config (`ffmpeg.binaryPath`). Absent = bare `'ffmpeg'` (PATH lookup).
@@ -9447,6 +9539,7 @@ var StreamBroker = class StreamBroker {
 		await this.pipeServer.stop();
 		this.rtspRestreamer.destroy();
 		this.preBuffer.clear();
+		this.decoderSeedBuffer.clear();
 		this.pendingParamNals = [];
 		this.firstKeyframeReceived = false;
 		this.encodedCallbacks.clear();
@@ -9543,6 +9636,7 @@ var StreamBroker = class StreamBroker {
 			this.placeholderTimer = void 0;
 		}
 		this.preBuffer.clear();
+		this.decoderSeedBuffer.clear();
 		this.firstKeyframeReceived = false;
 		this.pendingParamNals = [];
 		this.rtspRestreamer.resetStreamState();
@@ -9676,7 +9770,46 @@ var StreamBroker = class StreamBroker {
 			const streamId = `${this.deviceId}/video`;
 			restreamer.pushPacket(streamId, packet);
 		}
-		if (packet.type === "video" && this.firstKeyframeReceived) this.frameHandlePlane?.pushPacket(packet);
+		if (packet.type === "video" && this.firstKeyframeReceived) {
+			const decoderPacket = this.decoderPacketWithParamSets(packet);
+			this.decoderSeedBuffer.push(decoderPacket);
+			this.frameHandlePlane?.pushPacket(decoderPacket);
+		}
+	}
+	/**
+	* Return the packet to feed the decoder plane, prepending the SDP-harvested
+	* SPS/PPS to a keyframe that lacks them in-band.
+	*
+	* The plane seeds a freshly-armed decoder session with the SINGLE keyframe
+	* packet that triggered the arm (`armPendingSessions`), so the parameter sets
+	* MUST travel inside that same packet — a separate param-set packet pushed
+	* just before it reaches only already-live sessions and is lost on the
+	* arming one. Unlike the encoded-subscriber path (`emitSdpParamSetsTo`), the
+	* decoder plane is otherwise never handed `sdpParameterSets`. Cameras that
+	* ship parameter sets ONLY in the SDP (Reolink high-profile native streams)
+	* therefore starve the `ffmpeg -i pipe:0` decoder of SPS/PPS, which loops
+	* `non-existing PPS → no frame` and produces zero decoded frames (verified
+	* live on device 592: WebRTC worked, detection decoded nothing). Only
+	* keyframes actually missing the sets are rewritten — well-behaved cameras
+	* are returned untouched — and the check runs per keyframe so a decoder
+	* restart mid-stream re-primes on the next IDR. The returned object is a
+	* fresh copy; the original `packet` fanned out to the other consumers above
+	* (WebRTC, restreamers, pre-buffer) is never mutated.
+	*/
+	decoderPacketWithParamSets(packet) {
+		if (!packet.keyframe) return packet;
+		const paramSets = this.sdpParameterSets;
+		if (!paramSets || paramSets.length === 0) return packet;
+		if (annexBHasParameterSets(packet.data, packet.codec)) return packet;
+		if (this.streamingDebug) this.logger?.info("Prepending SDP param sets to decoder keyframe (in-band SPS/PPS absent)", { meta: {
+			codec: packet.codec,
+			psCount: paramSets.length,
+			keyframeBytes: packet.data.length
+		} });
+		return {
+			...packet,
+			data: Buffer.concat([concatParameterSetsAnnexB(paramSets), packet.data])
+		};
 	}
 	onEncodedData(callback, attribution = UNKNOWN_ATTRIBUTION) {
 		this.subscriberIdCounter += 1;
@@ -10017,11 +10150,12 @@ var StreamBroker = class StreamBroker {
 		if (!codec || !this.source) return null;
 		const slash = this.deviceId.indexOf("/");
 		const numericDeviceId = slash >= 0 ? Number.parseInt(this.deviceId.slice(0, slash), 10) : Number.parseInt(this.deviceId, 10);
+		const pullModeUrl = this.isRtpSource() ? this.restreamUrlResolver?.() ?? null : null;
 		return {
 			codec,
 			...Number.isFinite(numericDeviceId) ? { numericDeviceId } : {},
 			tag: `broker:${this.deviceId}`,
-			pullModeUrl: null
+			pullModeUrl
 		};
 	}
 	/** Lazily construct the frame-handle plane, returning `null` with no decoder. */
@@ -10035,7 +10169,8 @@ var StreamBroker = class StreamBroker {
 			decoderApi: this.decoderApi,
 			logger: this.logger?.child("frame-handle-plane"),
 			resolveStreamInfo: () => this.resolveFrameHandleStreamInfo(),
-			localNodeId: this.localNodeId
+			localNodeId: this.localNodeId,
+			getSeedPackets: () => this.decoderSeedBuffer.getPackets()
 		});
 		return this.frameHandlePlane;
 	}
@@ -12429,7 +12564,7 @@ var StreamBrokerManager = class {
 		const existing = this.upsertSourceCameraStream(deviceId, input);
 		const urlRefreshed = existing !== void 0 && input.url !== void 0 && existing.url !== input.url;
 		const wasAlreadyAssigned = (PUSH_KINDS.has(kind) ? findProfileForStream(this.assignments.get(deviceId)?.map ?? {}, camStreamId) : null) !== null && existing !== void 0;
-		await this.reconcileAutoAssignment(deviceId, "publish");
+		await this.reconcileAutoAssignment(deviceId, "publish", existing === void 0);
 		if (wasAlreadyAssigned) {
 			const finalProfile = findProfileForStream(this.assignments.get(deviceId)?.map ?? {}, camStreamId);
 			if (finalProfile !== null) this.emitCamStreamDemand(deviceId, camStreamId, finalProfile);
@@ -12477,7 +12612,8 @@ var StreamBrokerManager = class {
 		const urlBefore = /* @__PURE__ */ new Map();
 		for (const d of sources) urlBefore.set(d.camStreamId, streamMapBefore?.get(d.camStreamId)?.url);
 		for (const d of sources) this.upsertSourceCameraStream(deviceId, d);
-		await this.reconcileAutoAssignment(deviceId, "publish");
+		const anyNewStream = sources.some((d) => streamMapBefore?.get(d.camStreamId) === void 0);
+		await this.reconcileAutoAssignment(deviceId, "publish", anyNewStream);
 		for (const camStreamId of reEmitDemandFor) {
 			const profile = findProfileForStream(this.assignments.get(deviceId)?.map ?? {}, camStreamId);
 			if (profile !== null) this.emitCamStreamDemand(deviceId, camStreamId, profile);
@@ -13971,14 +14107,15 @@ var StreamBrokerManager = class {
 	* assignment). When the device's assignment is operator-locked
 	* (`auto === false`) the existing map is re-applied unchanged.
 	*/
-	async reconcileAutoAssignment(deviceId, reason) {
+	async reconcileAutoAssignment(deviceId, reason, streamAdded = false) {
 		const current = this.assignments.get(deviceId);
 		const streams = [...this.cameraStreams.get(deviceId)?.values() ?? []].toSorted((a, b) => a.order - b.order);
 		const isAuto = current?.auto ?? true;
 		const newMap = !current || isAuto && this.wouldChangeAutoMap(current.map, streams) ? this.computeInitialAssignment(streams) : current.map;
 		await this.applyAssignmentUpdate(deviceId, newMap, {
 			auto: isAuto,
-			reason
+			reason,
+			streamAdded
 		});
 	}
 	wouldChangeAutoMap(current, streams) {
@@ -14023,7 +14160,7 @@ var StreamBrokerManager = class {
 		if (anyChange || current.auto !== nextAssignment.auto) {
 			this.persistProfileMap();
 			this.emitProfileSlotsChanged(deviceId);
-		} else if (opts.reason === "publish") this.emitProfileSlotsChanged(deviceId);
+		} else if (opts.reason === "publish" && opts.streamAdded) this.emitProfileSlotsChanged(deviceId);
 		this.syncProfileRestreamers(deviceId);
 	}
 	countPushConsumers(map, deviceId) {
@@ -14214,6 +14351,7 @@ var StreamBrokerManager = class {
 		const source = this.buildSourceFromCamStream(cam);
 		const broker = new StreamBroker(brokerId, this.buildDecoderCapApi(deviceId), brokerLogger, buildAudioCodecCapApi(this.api), this.localNodeId);
 		broker.setRestreamers(this.restreamers);
+		broker.setRestreamUrlResolver(() => this.rtspProvider.getEntry(brokerId)?.mutedUrl ?? null);
 		broker.setFfmpegBinaryPath(this.ffmpegConfig.binaryPath);
 		this.applyPreBufferConfig(broker, deviceId, camStreamId, cam);
 		if (this.deviceOverrides.get(deviceId)?.streamingDebug) broker.setStreamingDebug(true);

package/dist/stream-broker/remoteEntry.js

@@ -30,7 +30,7 @@ async function d(e) {
 	}
 }
 async function f() {
-	return l ||= d(() => import("./_virtual_mf-localSharedImportMap___mfe_internal__addon_stream_broker_widgets-D567z31g.mjs")).catch((e) => {
+	return l ||= d(() => import("./_virtual_mf-localSharedImportMap___mfe_internal__addon_stream_broker_widgets-DPFAbcUo.mjs")).catch((e) => {
 		throw l = void 0, e;
 	}), l;
 }