administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-12-06 13:34:13 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improve matching go2rtc stream names with cameras (#20586)
Some checks are pending
CI / AMD64 Build (push) Waiting to run
Details
CI / ARM Build (push) Waiting to run
Details
CI / Jetson Jetpack 6 (push) Waiting to run
Details
CI / AMD64 Extra Build (push) Blocked by required conditions
Details
CI / ARM Extra Build (push) Blocked by required conditions
Details
CI / Synaptics Build (push) Blocked by required conditions
Details
CI / Assemble and push default build (push) Blocked by required conditions
Details

Browse Source 
* improve matching go2rtc stream names with cameras

* fix unrelated lint issue
This commit is contained in:
Josh Hawkins 2025-10-20 10:33:02 -05:00 committed by GitHub
parent 0743cb57c2
commit c5fec3271f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/components/card/SearchThumbnail.tsx
View File

@ -150,7 +150,9 @@ export default function SearchThumbnail({
.filter( .filter(
(item) => item !== undefined && !item.includes("-verified"), (item) => item !== undefined && !item.includes("-verified"),
) )
.map((text) => getTranslatedLabel(text, searchResult.data.type)) .map((text) =>
getTranslatedLabel(text, searchResult.data.type),
)
.sort() .sort()
.join(", ") .join(", ")
.replaceAll("-verified", "")} .replaceAll("-verified", "")}

44
web/src/components/settings/CameraEditForm.tsx
View File

@ -152,36 +152,38 @@ export default function CameraEditForm({
})) }))
: defaultValues.ffmpeg.inputs; : defaultValues.ffmpeg.inputs;
// Load go2rtc streams for this camera
const go2rtcStreams = config.go2rtc?.streams || {}; const go2rtcStreams = config.go2rtc?.streams || {};
const cameraStreams: Record<string, string[]> = {}; const cameraStreams: Record<string, string[]> = {};
// Find streams that match this camera's name pattern // get candidate stream names for this camera. could be the camera's own name,
Object.entries(go2rtcStreams).forEach(([streamName, urls]) => { // any restream names referenced by this camera, or any keys under live --> streams
if (streamName.startsWith(cameraName) || streamName === cameraName) { const validNames = new Set<string>();
cameraStreams[streamName] = Array.isArray(urls) ? urls : [urls]; validNames.add(cameraName);
}
});
// Also deduce go2rtc streams from restream URLs in camera inputs // deduce go2rtc stream names from rtsp restream inputs
camera.ffmpeg?.inputs?.forEach((input, index) => { camera.ffmpeg?.inputs?.forEach((input) => {
// exclude any query strings or trailing slashes from the stream name
const restreamMatch = input.path.match( const restreamMatch = input.path.match(
/^rtsp:\/\/127\.0\.0\.1:8554\/(.+)$/, /^rtsp:\/\/127\.0\.0\.1:8554\/([^?#/]+)(?:[?#].*)?$/,
); );
if (restreamMatch) { if (restreamMatch) {
const streamName = restreamMatch[1]; const streamName = restreamMatch[1];
// Find the corresponding go2rtc stream validNames.add(streamName);
const go2rtcStream = Object.entries(go2rtcStreams).find(
([name]) =>
name === streamName ||
name === `${cameraName}_${index + 1}` ||
name === cameraName,
);
if (go2rtcStream) {
cameraStreams[go2rtcStream[0]] = Array.isArray(go2rtcStream[1])
? go2rtcStream[1]
: [go2rtcStream[1]];
} }
});
// Include live --> streams keys
const liveStreams = camera?.live?.streams;
if (liveStreams) {
Object.keys(liveStreams).forEach((key) => {
validNames.add(key);
});
}
// Map only go2rtc entries that match the collected names
Object.entries(go2rtcStreams).forEach(([name, urls]) => {
if (validNames.has(name)) {
cameraStreams[name] = Array.isArray(urls) ? urls : [urls];
} }
}); });