mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-07-23 20:29:02 +03:00
Miscellaneous fixes (#23413)
CI / AMD64 Build (push) Has been cancelled
CI / ARM Build (push) Has been cancelled
CI / Jetson Jetpack 6 (push) Has been cancelled
CI / AMD64 Extra Build (push) Has been cancelled
CI / ARM Extra Build (push) Has been cancelled
CI / Synaptics Build (push) Has been cancelled
CI / Assemble and push default build (push) Has been cancelled
CI / AMD64 Build (push) Has been cancelled
CI / ARM Build (push) Has been cancelled
CI / Jetson Jetpack 6 (push) Has been cancelled
CI / AMD64 Extra Build (push) Has been cancelled
CI / ARM Extra Build (push) Has been cancelled
CI / Synaptics Build (push) Has been cancelled
CI / Assemble and push default build (push) Has been cancelled
* update e2e mock data to remove deprecated fields * remove scream audio label scream was never mapped to anything in frigate's custom labelmap, yell is used everywhere * document common audio labels * deprecate ffmpeg 5 * language tweak * add field message to recommend presets instead of manual hwaccel args * add guidance to docs on choosing a detect fps
This commit is contained in:
@@ -22,6 +22,27 @@ const ffmpegArgsWidget = (
|
||||
const ffmpeg: SectionConfigOverrides = {
|
||||
base: {
|
||||
sectionDocs: "/configuration/ffmpeg_presets",
|
||||
fieldMessages: [
|
||||
{
|
||||
key: "hwaccel-manual-not-recommended",
|
||||
field: "hwaccel_args",
|
||||
position: "after",
|
||||
messageKey: "configMessages.ffmpeg.hwaccelManualNotRecommended",
|
||||
severity: "warning",
|
||||
condition: (ctx) => {
|
||||
// Manual mode is active when hwaccel_args is an explicit args list
|
||||
// or a non-preset string
|
||||
const value = ctx.formData?.hwaccel_args;
|
||||
if (Array.isArray(value)) {
|
||||
return value.length > 0;
|
||||
}
|
||||
if (typeof value === "string") {
|
||||
return !value.startsWith("preset-");
|
||||
}
|
||||
return false;
|
||||
},
|
||||
},
|
||||
],
|
||||
fieldDocs: {
|
||||
hwaccel_args: "/configuration/ffmpeg_presets#hwaccel-presets",
|
||||
"inputs.hwaccel_args": "/configuration/ffmpeg_presets#hwaccel-presets",
|
||||
|
||||
@@ -386,11 +386,14 @@ export function FieldTemplate(props: FieldTemplateProps) {
|
||||
const beforeContent = renderCustom(beforeSpec);
|
||||
const afterContent = renderCustom(afterSpec);
|
||||
|
||||
// Read field-level conditional messages from FieldMessagesContext
|
||||
// Read field-level conditional messages from FieldMessagesContext.
|
||||
// For multi-schema fields (anyOf/oneOf), FieldTemplate renders twice for
|
||||
// the same path (wrapper + inner branch); skip the wrapper pass so the
|
||||
// message isn't shown twice, mirroring how labels/descriptions dedupe.
|
||||
const fieldPathStr = pathSegments.join(".");
|
||||
const fieldMessageSpecs = allFieldMessages.filter(
|
||||
(m) => m.field === fieldPathStr,
|
||||
);
|
||||
const fieldMessageSpecs = isMultiSchemaWrapper
|
||||
? []
|
||||
: allFieldMessages.filter((m) => m.field === fieldPathStr);
|
||||
const beforeMessages = fieldMessageSpecs.filter(
|
||||
(m) => (m.position ?? "before") === "before",
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user