Naming: Color Grading and Video Scopes for Lumetri; External Video Output (#1880)

Fixes #1868. Display labels only; effect ids (lumetri, ...), panel ids, automation ids, preference keys and project data are unchanged.

- Lumetri Color/Scopes/Presets -> Color Grading / Video Scopes / Color Grading Presets in the UI and all 16 catalogs; old names still resolve for panels, shortcuts, automation and Effects-panel search.
- FCP7 XML, FCPXML and EDL exports keep writing the previous Lumetri names, so interchange output is unchanged.
- Mercury Transmit -> External Video Output, shown disabled ("This preference is not available yet.") until it exists.
- Ultra Key, Warp Stabilizer and Morph Cut keep their names until RFC-0029 settles.
This commit is contained in:
Alzi authored and GitHub committed 2026-11-09 04:45:53 +01:00
1 parent bbe8ae217a
commit 41977bab41
86 files changed
+885 -338

No files matched your search

+3 -3
View File
@@ -75,7 +75,7 @@ procedural demo footage (`crates/media/src/generators.rs`); no external media. R
| `crates/golden/goldens/graphic_title.png` | FilmCraft contributors | Original work: golden reference rendered by FilmCraft (crates/golden/tests/golden.rs, scene `graphic_title`) from procedurally generated media and bundled OFL fonts | MIT OR Apache-2.0 |
| `crates/golden/goldens/lumetri_basic.png` | FilmCraft contributors | Original work: golden reference rendered by FilmCraft (crates/golden/tests/golden.rs, scene `lumetri_basic`) from procedurally generated media | MIT OR Apache-2.0 |
| `crates/golden/goldens/lumetri_hdr_pq.png` | FilmCraft contributors | Original work: golden reference rendered by FilmCraft (crates/golden/tests/golden.rs, scene `lumetri_hdr_pq`) from procedurally generated media re-encoded as Rec. 2100 PQ | MIT OR Apache-2.0 |
| `crates/golden/goldens/lumetri_presets_grid.png` | FilmCraft contributors | Original work: golden reference rendered by FilmCraft (crates/golden/tests/golden.rs, `lumetri_presets_grid`): FilmCraft's own Lumetri presets on its procedural preview picture | MIT OR Apache-2.0 |
| `crates/golden/goldens/lumetri_presets_grid.png` | FilmCraft contributors | Original work: golden reference rendered by FilmCraft (crates/golden/tests/golden.rs, `lumetri_presets_grid`): FilmCraft's own Color Grading presets on its procedural preview picture | MIT OR Apache-2.0 |
| `crates/golden/goldens/text_burnin.png` | FilmCraft contributors | Original work: golden reference rendered by FilmCraft (crates/golden/tests/golden.rs, scene `text_burnin`) from procedurally generated media | MIT OR Apache-2.0 |
| `crates/golden/goldens/transform_opacity.png` | FilmCraft contributors | Original work: golden reference rendered by FilmCraft (crates/golden/tests/golden.rs, scene `transform_opacity`) from procedurally generated media | MIT OR Apache-2.0 |
| `crates/golden/goldens/transition_cross_dissolve.png` | FilmCraft contributors | Original work: golden reference rendered by FilmCraft (crates/golden/tests/golden.rs, scene `transition_cross_dissolve`) from procedurally generated media | MIT OR Apache-2.0 |
@@ -118,8 +118,8 @@ is traced or derived from Adobe artwork.
| Align / distribute / paragraph-alignment glyphs in the graphics panel | `crates/ui-egui/src/panels/graphics.rs` (`align_glyph`): bars and lines drawn with the egui painter |
| Demo footage (ocean sunset, aurora, city night, dunes, forest, plasma), bars and tone, counting leader, colour matte | `crates/media/src/generators.rs` |
| Built-in graphics templates (Lower Third – Slab / Rule, Ticker – Crawl, Title – Centered / Boxed, End Credits – Roll, Callout – Pointer / Tag) and their placeholder text | `crates/project/src/gtemplate.rs` (`builtin_templates`): original designs defined in code with the bundled Inter font; thumbnails are rendered at runtime, no template, image or font files |
| Lumetri "Look" presets (Teal & Orange, Warm Film, …) | `crates/render/src/effects.rs` (`apply_look`): procedural colour transforms, not LUT files |
| Lumetri Presets (Effects panel: Cinematic, Film Emulation, Monochrome, Technical) and their preview picture | `crates/render/src/lumetri_presets.rs`: Lumetri parameter values chosen by contributors, descriptive names, and a procedural preview picture (dusk sky, ridges, lake, grey ramp, colour chips) |
| Color Grading "Look" presets (Teal & Orange, Warm Film, …) | `crates/render/src/effects.rs` (`apply_look`): procedural colour transforms, not LUT files |
| Color Grading Presets (Effects panel: Cinematic, Film Emulation, Monochrome, Technical) and their preview picture | `crates/render/src/lumetri_presets.rs`: Color Grading parameter values chosen by contributors, descriptive names, and a procedural preview picture (dusk sky, ridges, lake, grey ramp, colour chips) |
| Colour palette and layout metrics | `crates/ui-egui/src/theme.rs`: colour values and sizes only; no artwork |
## Optional build input: craft-fonts
+7 -5
View File
@@ -7,7 +7,9 @@
**Stage: alpha** · next: beta, ~19 points of ready-for-real-work and ~400–700 h away, plus opening Premiere's `.prproj` ([why](docs/target-app-parity.md#stage); passes the [core-workflow gate](docs/roadmap.md#alpha-gate))
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-22 · **Change:** minor (ProRes alpha final-run conformance and native macOS validation; language table: Czech, #1156) · **Target:** Adobe Premiere Pro 2026 (26.5.2)
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-08 · **Change:** minor (ProRes alpha final-run conformance and native macOS validation; language table: Czech, #1156) · **Target:** Adobe Premiere Pro 2026 (26.5.2)
> **Naming update (2026-11-08):** First-party feature labels now follow the selected ArtCraft naming scheme in [PR #1880](https://github.com/storytold/filmcraft/pull/1880). Capabilities, estimates and parity scores were not re-measured.
Progress toward parity with Adobe Premiere Pro. This page is the summary; the detail is in
[docs/target-app-parity.md](docs/target-app-parity.md) (assessment, methodology, calibration),
@@ -118,7 +120,7 @@ Ranked; detail and "done when" in [docs/roadmap.md](docs/roadmap.md) and [docs/g
- **2026-10-12:** Transform's motion-blur shutter on adjustment layers uses the sequence frame rate instead of 24 fps, so a 360° shutter in a 60 fps sequence spans one frame, not 2.5 (#1088)
- **2026-10-10 (changed media):** Settings ▸ Media ▸ Automatically refresh growing files works: media files that change on disk while the project is open (a recording still being written, a render written over the file a clip uses) are read again every *Refresh growing files every* seconds and as soon as the window comes back to the front: the new length, picture and identity, without an undo step (`media.refreshChanged`, `media_watch`).
- **2026-10-10 (re-measure):** full parity re-measure against Premiere Pro 26.5.2: menu label diff 338 / 366 (92%), installed bundle listings (10 UI languages, exporter and codec frameworks), 188 open issues. Breadth ~86% (file formats now counted), ready ~55%, stage **alpha**; progress docs reorganized ([target-app-parity](docs/target-app-parity.md), [gaps](docs/gaps.md), [roadmap](docs/roadmap.md), [codec](docs/codec-parity.md), [file-format](docs/file-format-parity.md), [hardware](docs/hardware-parity.md), [UI](docs/ui-parity.md), [localization](docs/localization-parity.md)).
- **2026-10-10:** ~75 community PRs merged: GPU export rendering (Auto) with Vignette, Video Limiter and Lumetri basic / creative / vignette on the GPU (#421); Linux NVDEC H.264 / HEVC decode (#549); text-to-speech narrations with Kokoro-82M (#278); Japanese for the whole interface (#449) and Ukrainian menus (#407); ALSA default-device fallback (#254, fixes #23); drop import into the timeline (#517); system appearance (#505); timecode scrub editing (#576); NVENC RGBA input (#486); marker CSV export (#454); many fixes (#526–#575).
- **2026-10-10:** ~75 community PRs merged: GPU export rendering (Auto) with Vignette, Video Limiter and Color Grading basic / creative / vignette on the GPU (#421); Linux NVDEC H.264 / HEVC decode (#549); text-to-speech narrations with Kokoro-82M (#278); Japanese for the whole interface (#449) and Ukrainian menus (#407); ALSA default-device fallback (#254, fixes #23); drop import into the timeline (#517); system appearance (#505); timecode scrub editing (#576); NVENC RGBA input (#486); marker CSV export (#454); many fixes (#526–#575).
- **2026-10-09:** release 0.5.0. NVENC H.265 export on Windows, Main and Main 10 HDR (#328, #360); NVENC H.264 export (#386); VA-API H.264 / HEVC decode (#358); Source monitor playback (#423); multi-stream container audio, schema v13 (#361); New Sequence and Sequence Settings dialogs (#269, #355); Spanish for the panels (#238); background decoders and memory stress tests (#385, #381).
- **2026-10-08 (Source range dragging):** implicit full-clip In/Out, video-only/audio-only/linked both controls, picture/waveform drag gestures and one-command undoable timeline placement. Shared Source/Program draggable frame-bounded handles and range translation, cancellation, Source marker/navigation routing and marked-range playback/looping.
- **2026-10-08 (Source playback):** normal forward playback for video/audio media and subclips in the Source monitor, an independent Source clock, Play/Pause and focused Space, frame stepping, device-clock audio with wall-clock fallback, seeking, and end-of-clip stopping. Windows desktop review verified a real video file and standalone WAV, including In/Out marking. Reverse/shuttle Source playback and source sequences remain unsupported; no parity percentage changed.
@@ -144,7 +146,7 @@ Ranked; detail and "done when" in [docs/roadmap.md](docs/roadmap.md) and [docs/g
- **2026-10-02 (late):** export parity (M6.5): built-in preset library + user presets, full Export-mode settings (loudness normalization, image/name/timecode overlays, captions, range), export queue, Quick Export, Premiere-style image-sequence export, `filmcraft-cli export --preset`; media import (M9.14): MXF OP1a/OP-Atom (new `crates/mxf`, H.264/DNx/ProRes/PCM, timecode), Ogg Opus (new `crates/ogg`), image sequences as clips, BWF timecode. 1373 tests.
- **2026-10-02 (panels):** complete Lumetri Scopes (new `filmcraft-scopes` crate: Vectorscope YUV/HLS, Histogram, Parade RGB/YUV/RGB-White, Waveform RGB/Luma/YC/YC no Chroma; wrench menu with presets, colour space, brightness, scale; < 1 ms per scope at 1080p; `scopes.read` returns the numbers); Metadata panel (editable log fields, undoable `metadata.set`), Timecode panel, Events panel (event log of failed commands, jobs, auto-save), Progress panel (jobs with Cancel), Reference Monitor (parked or ganged, picture or scopes).
- **2026-10-02 (panels):** complete Video Scopes (new `filmcraft-scopes` crate: Vectorscope YUV/HLS, Histogram, Parade RGB/YUV/RGB-White, Waveform RGB/Luma/YC/YC no Chroma; wrench menu with presets, colour space, brightness, scale; < 1 ms per scope at 1080p; `scopes.read` returns the numbers); Metadata panel (editable log fields, undoable `metadata.set`), Timecode panel, Events panel (event log of failed commands, jobs, auto-save), Progress panel (jobs with Cancel), Reference Monitor (parked or ganged, picture or scopes).
- **2026-10-02 (evening):** performance (M4.8): `cargo xtask bench` (decode, seek, playback, scrub, timeline UI, export, project I/O, memory; results in docs/performance.md) and `perf.stats` for agents; HEVC transform/SAO 2.5× cheaper; late frames skip non-reference pictures (4K CPU per displayed frame halved, cold seeks 20–45% faster); decoders stay bit-exact. 1270 tests.
- **2026-10-02 (later):** all 93 video effects (+Legacy/Obsolete bins), all 53 audio effects with Parametric/Graphic EQ, Multiband Compressor and Dynamics editor windows, all 84 video transitions (+21 Legacy), Settings dialog (16 categories, most wired), remaining menu items (Scene Edit Detection, Find, Normalize Mix Track, Simplify Sequence, Automate to Sequence, search bins, templates, Project Settings with scratch disks, ALE and selection-as-project export, system report); project schema v11. 1258 tests.
@@ -156,7 +158,7 @@ Ranked; detail and "done when" in [docs/roadmap.md](docs/roadmap.md) and [docs/g
- **2026-10-01 (M12 multicam):** Synchronize / Merge Clips / Create Multi-Camera Source Sequence (sync by In, Out, timecode ± hours, clip markers, or audio: GCC-PHAT cross-correlation, offsets recovered to the sample on noisy multi-mic recordings), multi-camera clips (angle render, Switch Audio), Program monitor Multi-Camera view with live switching (keys 1–9, one undo step per pass), Ctrl+1–9 cuts, Enable / Flatten / Edit Cameras, project schema v7. Fixed: nested sequence audio was silent.
- **2026-10-01 (evening):** M11 done: offline media with our own slate and the Link Media dialog (fingerprint-checked relink, folder remap, search), proxies (create in background / attach / toggle; export stays full-res) with ingest settings, Project Manager (collect, consolidate + transcode). Fixed: GOP cache deadlock when a rayon decoder inside a parallel export re-entered the same source.
- **2026-10-01 (M7.4):** Essential Sound panel: Dialogue/Music/SFX/Ambience types, Loudness auto-match (BS.1770, exact to the target), Repair (noise, rumble, hum, new DeEsser and spectral DeReverb), Clarity (dynamics, EQ presets, Enhance Speech DSP chain), Creative reverb / stereo width, ducking that writes Volume keyframes, presets; all `essentialSound.*` commands, effects visible and keyframable in Effect Controls.
- **2026-10-01 (night):** M8 colour: camera log curves and gamuts from published specs, colour-managed pipeline (PQ/HLG working spaces, Interpret Footage, BT.2390 tone mapping), HDR export signalling verified with ffprobe, LUTs (.cube/.3dl, tetrahedral CPU + WGSL, project library, Lumetri Input LUT / Look), Colour Match, Lumetri section bypass, HDR scopes.
- **2026-10-01 (night):** M8 colour: camera log curves and gamuts from published specs, colour-managed pipeline (PQ/HLG working spaces, Interpret Footage, BT.2390 tone mapping), HDR export signalling verified with ffprobe, LUTs (.cube/.3dl, tetrahedral CPU + WGSL, project library, Color Grading Input LUT / Look), Colour Match, Color Grading section bypass, HDR scopes.
- **2026-10-01 (night):** DNxHD/DNxHR decoder + encoder (SMPTE ST 2019-1) with MOV export; AV1 decoder (spec v1.0.0 + Errata 1, all decoding tools incl. film grain) bit-exact against libdav1d, wired into MP4/WebM/MKV import with key-frame-checked seeking.
- **2026-10-01 (later):** text engine (shaping, bidi, line breaking) + Type/Shape/Pen tools + graphic clips + graphics panel; Trim Monitor + dynamic trimming; Keyboard Shortcuts editor; audio mixer with automation. Fixed: MP4 muxer wrote unreadable all-empty sample tables; system font scan race.
@@ -167,7 +169,7 @@ Ranked; detail and "done when" in [docs/roadmap.md](docs/roadmap.md) and [docs/g
- **2026-09-30 (evening):** Opus decoder (RFC 6716/8251, range-exact on every conformance vector, ~80–110× realtime 48 kHz stereo) wired into WebM/MKV and MP4 import.
- **2026-09-30 (afternoon):** Matroska/WebM import; LUFS meters; clip audio effects on the DSP crate.
- **2026-09-30 (midday):** HEVC decoder, Matroska/WebM demuxer and audio DSP merged; HEVC import wired; asset rules (AGENTS.md, ATTRIBUTION.md, `cargo xtask assets`); README with hero screenshot and the Craft family.
- **2026-09-30 (late morning):** keyframe value/velocity graphs; xtask gates; H.264 MP4 export; Lumetri curves, wheels, looks, HSL secondary.
- **2026-09-30 (late morning):** keyframe value/velocity graphs; xtask gates; H.264 MP4 export; Color Grading curves, wheels, looks, HSL secondary.
- **2026-09-30 (early morning):** H.264 decoder, ProRes, AAC; GPU compositor; MCP; Premiere 26 visual fidelity pass.
## Revision history
+2 -2
View File
@@ -89,7 +89,7 @@ on the sRGB curve).
## Grading signal (`grade`)
Lumetri's controls work on a 0…1 signal. `GradeSpace` picks it from the working space:
Color Grading's controls work on a 0…1 signal. `GradeSpace` picks it from the working space:
| Working space | Signal of working-linear `c` (1.0 = 203 cd/m² in HDR) | 1.0 means |
|---|---|---|
@@ -97,7 +97,7 @@ Lumetri's controls work on a 0…1 signal. `GradeSpace` picks it from the workin
| Rec. 2100 PQ | `PQ⁻¹(c·203/10000) / PQ⁻¹(W/10000)` (SMPTE ST 2084) | HDR White `W` cd/m² |
| Rec. 2100 HLG | `F = c·203/W`, `Y = BT.2020 luma(F)`, `E = F·Y^((1−γ)/γ)`, signal = HLG OETF(E), γ = 1.2 + 0.42·log10(W/1000) (BT.2100 inverse OOTF, note 5f) | display peak `W` |
`W` is Lumetri's HDR White (Basic Correction) or HDR Range (Curves), default 1000 cd/m². HDR
`W` is Color Grading's HDR White (Basic Correction) or HDR Range (Curves), default 1000 cd/m². HDR
values above `W` are signals above 1 and are kept (PQ to 10 000 cd/m², HLG to signal 1.5). Checked
values: PQ 100 / 203 / 1000 cd/m² = 0.508 / 0.581 / 0.752 of the plain PQ signal (BT.2408); HLG on
a 1000 cd/m² display: 203 cd/m² = 0.75, 26 cd/m² (18 % grey) ≈ 0.38 (BT.2408).
+2 -2
View File
@@ -1,11 +1,11 @@
//! The grading signal colour correctors (Lumetri) work on.
//! The grading signal colour correctors (Color Grading) work on.
//!
//! Grading controls (whites / blacks, highlights / shadows, contrast, curves, wheels, keys) are
//! defined on a perceptual signal from 0 (black) to 1 (white), not on linear light. In an SDR
//! working space that signal is the sRGB-encoded display value, and 1 is SDR white.
//!
//! In an HDR working space (Rec. 2100 PQ or HLG) the signal follows the working space's own
//! transfer function and is **normalised to HDR White** (cd/m², Lumetri ▸ Basic Correction ▸ HDR
//! transfer function and is **normalised to HDR White** (cd/m², Color Grading ▸ Basic Correction ▸ HDR
//! White; the curves have their own HDR Range): signal 1 is HDR White, so the sliders and curves
//! span 0 … HDR White nits the way they span black … white in SDR, and highlights above HDR
//! White (speculars) are values above 1 that pass through instead of clipping:
+24 -24
View File
@@ -1,13 +1,13 @@
//! Colour commands: colour management (`sequence.colorSettings`, `clip.interpretFootage`,
//! `color.spaces`, `media.colorInfo`), the project LUT library (`lut.*`), Lumetri LUT slots and
//! `color.spaces`, `media.colorInfo`), the project LUT library (`lut.*`), Color Grading LUT slots and
//! section switches (`lumetri.*`).
//!
//! Lumetri commands address a clip by `clip` (default: the first selected video clip with
//! Lumetri Color, else the first selected video clip — Lumetri is added if missing).
//! Color Grading commands address a clip by `clip` (default: the first selected video clip with
//! Color Grading, else the first selected video clip — Color Grading is added if missing).
//!
//! Lumetri Presets (Effects panel): `lumetri.presets` lists them, `lumetri.applyPreset` adds a
//! Lumetri Color configured as the preset to clips (one undo step), `lumetri.presetThumbnails`
//! renders a folder's thumbnail grid (our Lumetri on the procedural preview picture) to a PNG.
//! Color Grading Presets (Effects panel): `lumetri.presets` lists them, `lumetri.applyPreset` adds a
//! Color Grading configured as the preset to clips (one undo step), `lumetri.presetThumbnails`
//! renders a folder's thumbnail grid (our Color Grading on the procedural preview picture) to a PNG.
use filmcraft_color::{ColorSpace, Lut, LutFormat, WorkingSpace};
use filmcraft_project::{ClipId, ItemId, ItemKind, ParamValue, ProjectLut, TrackKind};
@@ -45,11 +45,11 @@ pub(crate) fn commands() -> Vec<CommandSpec> {
interpret,
),
query("color.spaces", "List Colour Spaces", "{}", spaces),
query("lumetri.presets", "List Lumetri Presets", r#"{"folder":str?}"#, list_presets),
spec("lumetri.applyPreset", "Apply Lumetri Preset", &[], r#"{"name":str,"clips":[id]?}"#, has_seq, apply_preset),
query("lumetri.presets", "List Color Grading Presets", r#"{"folder":str?}"#, list_presets),
spec("lumetri.applyPreset", "Apply Color Grading Preset", &[], r#"{"name":str,"clips":[id]?}"#, has_seq, apply_preset),
query(
"lumetri.presetThumbnails",
"Lumetri Preset Thumbnails",
"Color Grading Preset Thumbnails",
r#"{"folder":str?,"names":[str]?,"width":n=160,"columns":n=4,"path":str?}"#,
preset_thumbnails,
),
@@ -75,7 +75,7 @@ pub(crate) fn commands() -> Vec<CommandSpec> {
query("lumetri.exportCube", "Export .cube…", r#"{"clip":id?,"path":str,"size":n=33}"#, export_cube),
spec(
"lumetri.setSection",
"Toggle Lumetri Section",
"Toggle Color Grading Section",
&[],
r#"{"clip":id?,"section":"basic"|"creative"|"curves"|"wheels"|"hsl"|"vignette","on":bool?}"#,
has_seq,
@@ -166,10 +166,10 @@ fn export(s: &mut Session, p: &Value) -> Result<Value> {
Ok(json!({"path": path, "bytes": text.len()}))
}
/// `lumetri.exportCube`: the grade of a clip's Lumetri Color (also the result of `lumetri.applyMatch`)
/// `lumetri.exportCube`: the grade of a clip's Color Grading (also the result of `lumetri.applyMatch`)
/// as a 3D `.cube` LUT: its per-pixel colour pipeline sampled on a `size³` lattice in the sequence's
/// output encoding, so the table applied to the ungraded frame gives the render. `clip` defaults to
/// the first selected clip that has Lumetri. The vignette, sharpen and the HSL Secondary denoise
/// the first selected clip that has Color Grading. The vignette, sharpen and the HSL Secondary denoise
/// and blur cannot live in a LUT: they are left out and named, with the other effects on the clip,
/// in `leftOut`. The grade is sampled at the playhead (inside the clip). Nothing in the project
/// changes.
@@ -182,11 +182,11 @@ fn export_cube(s: &mut Session, p: &Value) -> Result<Value> {
let clip = match clip_p(p, "clip") {
Some(c) => c,
None if p.get("clip").is_some_and(|v| !v.is_null()) => return Err(bad(CMD, "`clip` must be a clip id")),
None => s.state.selection.iter().copied().find(has_lumetri).ok_or_else(|| bad(CMD, "select a clip with Lumetri Color (or pass `clip`)"))?,
None => s.state.selection.iter().copied().find(has_lumetri).ok_or_else(|| bad(CMD, "select a clip with Color Grading (or pass `clip`)"))?,
};
let (_, it) = q.find_item(clip).ok_or_else(|| bad(CMD, format!("no clip {}", clip.0)))?;
if !has_lumetri(&clip) {
return Err(bad(CMD, "the clip has no enabled Lumetri Color to export"));
return Err(bad(CMD, "the clip has no enabled Color Grading to export"));
}
let t = it.effect_time_at(s.playhead().clamp(it.start, (it.end() - filmcraft_time::Tick(1)).max(it.start)));
let lumetri: Vec<&filmcraft_project::EffectInstance> = it.effects.iter().filter(|e| e.effect == "lumetri").collect();
@@ -204,7 +204,7 @@ fn export_cube(s: &mut Session, p: &Value) -> Result<Value> {
Ok(json!({"clip": clip.0, "path": path, "size": size, "bytes": text.len(), "leftOut": left_out}))
}
/// The target clip and the index of its Lumetri effect (applying Lumetri when missing).
/// The target clip and the index of its Color Grading effect (applying Color Grading when missing).
pub(crate) fn lumetri_clip(s: &mut Session, p: &Value, cmd: &str) -> Result<(ClipId, usize)> {
let seq = s.active_sequence().ok_or_else(|| bad(cmd, "no active sequence"))?;
let video = |c: &ClipId| seq.find_item(*c).is_some_and(|(t, _)| seq.track(t).is_some_and(|t| t.kind == TrackKind::Video));
@@ -221,16 +221,16 @@ pub(crate) fn lumetri_clip(s: &mut Session, p: &Value, cmd: &str) -> Result<(Cli
s.execute("effects.apply", json!({"clips": [clip.0], "effect": "lumetri"}))?;
}
let seq = s.active_sequence().ok_or_else(|| bad(cmd, "no active sequence"))?;
let idx = seq.find_item(clip).and_then(|(_, it)| it.effects.iter().position(|e| e.effect == "lumetri")).ok_or_else(|| bad(cmd, "no Lumetri"))?;
let idx = seq.find_item(clip).and_then(|(_, it)| it.effects.iter().position(|e| e.effect == "lumetri")).ok_or_else(|| bad(cmd, "no Color Grading"))?;
Ok((clip, idx))
}
/// Set a Lumetri parameter (inserting it when an older project's instance lacks it).
/// Set a Color Grading parameter (inserting it when an older project's instance lacks it).
pub(crate) fn set_lumetri_param(s: &mut Session, clip: ClipId, idx: usize, param: &str, v: ParamValue, label: &str) -> Result<()> {
let param = param.to_string();
s.edit_sequence(label, |q, _, _| {
let (_, it) = q.find_item_mut(clip).ok_or(filmcraft_edit::EditError::NoItem(clip))?;
let e = it.effects.get_mut(idx).ok_or_else(|| bad("lumetri", "no Lumetri"))?;
let e = it.effects.get_mut(idx).ok_or_else(|| bad("lumetri", "no Color Grading"))?;
e.params.entry(param.clone()).or_insert_with(|| filmcraft_project::Param::new(v.clone())).value = v.clone();
Ok(())
})?;
@@ -273,7 +273,7 @@ fn set_section(s: &mut Session, p: &Value) -> Result<Value> {
.and_then(|(_, it)| it.effects.get(idx).and_then(|e| e.param(param)).and_then(|v| v.value.as_bool()))
.unwrap_or(param != "hsl_on");
let v = bool_p(p, "on").unwrap_or(!cur);
set_lumetri_param(s, clip, idx, param, ParamValue::Bool(v), "Lumetri Section")?;
set_lumetri_param(s, clip, idx, param, ParamValue::Bool(v), "Color Grading Section")?;
Ok(json!({"clip": clip.0, "param": param, "on": v}))
}
@@ -432,12 +432,12 @@ fn list_presets(_: &mut Session, p: &Value) -> Result<Value> {
Ok(json!({"folders": filmcraft_render::lumetri_presets::FOLDERS, "presets": v}))
}
/// Lumetri Presets ▸ apply: a new Lumetri Color configured as the preset on each video clip
/// Color Grading Presets ▸ apply: a new Color Grading configured as the preset on each video clip
/// (added at the end of the clip's effects, like `effects.apply`).
fn apply_preset(s: &mut Session, p: &Value) -> Result<Value> {
let cmd = "lumetri.applyPreset";
let name = str_p(p, "name").ok_or_else(|| bad(cmd, "need `name`"))?;
let preset = filmcraft_render::lumetri_presets::find(name).ok_or_else(|| bad(cmd, format!("no Lumetri preset `{name}`")))?;
let preset = filmcraft_render::lumetri_presets::find(name).ok_or_else(|| bad(cmd, format!("no Color Grading preset `{name}`")))?;
let clips = crate::commands::clips_p(s, p);
if clips.is_empty() {
return Err(bad(cmd, "select clips first"));
@@ -481,7 +481,7 @@ fn preset_thumbnails(s: &mut Session, p: &Value) -> Result<Value> {
Ok(out)
}
/// Lumetri ▸ Color Wheels & Match ▸ Apply Match (see `filmcraft_render::color_match`): match the
/// Color Grading ▸ Color Wheels & Match ▸ Apply Match (see `filmcraft_render::color_match`): match the
/// clip at the playhead to the sequence frame at the reference time. Sets the three wheels, their
/// lightness and Basic saturation in one undo step.
fn apply_match(s: &mut Session, p: &Value) -> Result<Value> {
@@ -496,7 +496,7 @@ fn apply_match(s: &mut Session, p: &Value) -> Result<Value> {
return Err(bad("lumetri.applyMatch", "the reference frame is inside the clip being matched; pick a frame from another shot"));
}
let base = it.effects[idx].clone();
// the current shot as Lumetri sees it: the clip with its Lumetri switched off
// the current shot as Color Grading sees it: the clip with its Color Grading switched off
let mut probe = (*s.project).clone();
if let Some((_, pi)) = probe.sequence_mut(seq_id).and_then(|q| q.find_item_mut(clip)) {
pi.effects[idx].enabled = false;
@@ -520,7 +520,7 @@ fn apply_match(s: &mut Session, p: &Value) -> Result<Value> {
];
s.edit_sequence("Apply Match", |q, _, _| {
let (_, it) = q.find_item_mut(clip).ok_or(filmcraft_edit::EditError::NoItem(clip))?;
let e = it.effects.get_mut(idx).ok_or_else(|| bad("lumetri.applyMatch", "no Lumetri"))?;
let e = it.effects.get_mut(idx).ok_or_else(|| bad("lumetri.applyMatch", "no Color Grading"))?;
for (k, v) in &values {
let prm = e.params.entry(k.to_string()).or_insert_with(|| filmcraft_project::Param::new(v.clone()));
prm.keyframes.clear();
+5 -5
View File
@@ -203,7 +203,7 @@ fn lumetri_presets_list_apply_and_thumbnails() {
assert_eq!(r["folders"], json!(["Cinematic", "Film Emulation", "Monochrome", "Technical"]));
let mono = s.execute("lumetri.presets", json!({"folder": "monochrome"})).unwrap();
assert!(mono["presets"].as_array().unwrap().iter().all(|p| p["folder"] == "Monochrome"));
// apply: one undo step adding a configured Lumetri Color at the end of the clip's effects
// apply: one undo step adding a configured Color Grading at the end of the clip's effects
let before = s.active_sequence().unwrap().find_item(clip).unwrap().1.effects.len();
let r = s.execute("lumetri.applyPreset", json!({"name": "Neutral Mono"})).unwrap();
assert_eq!(r["clips"], 1);
@@ -243,7 +243,7 @@ fn hdr_lumetri_and_mastering_metadata_through_commands() {
assert!((m1[k] / m0[k] - 2.0).abs() < 0.08, "channel {k}: {m0:?} → {m1:?}");
}
assert!(up.px.as_chunks::<4>().0.iter().any(|p| p[1] > 1.2), "values above reference white survive");
// HDR White / HDR Specular / HDR Range are ordinary Lumetri parameters
// HDR White / HDR Specular / HDR Range are ordinary Color Grading parameters
s.execute("effects.setParam", json!({"clip": clip.0, "effect": idx, "param": "hdr_white", "value": 2000.0})).unwrap();
s.execute("effects.setParam", json!({"clip": clip.0, "effect": idx, "param": "hdr_specular", "value": -50.0})).unwrap();
s.execute("effects.setParam", json!({"clip": clip.0, "effect": idx, "param": "curves_hdr_range", "value": 4000.0})).unwrap();
@@ -381,7 +381,7 @@ fn export_cube_exports_an_apply_match_result_and_refuses_what_it_cannot() {
let mut s = demo();
let clip = pick_clip(&mut s);
let path = tmp("nolumetri.cube");
// no Lumetri on the clip: nothing to export, and the command does not add one
// no Color Grading on the clip: nothing to export, and the command does not add one
assert!(s.execute("lumetri.exportCube", json!({"path": path})).is_err());
assert!(s.execute("lumetri.exportCube", json!({"clip": clip.0, "path": path})).is_err());
assert!(!std::path::Path::new(&path).exists());
@@ -397,7 +397,7 @@ fn export_cube_exports_an_apply_match_result_and_refuses_what_it_cannot() {
let lut = Lut3d::parse_cube(&std::fs::read_to_string(&path).unwrap()).unwrap();
let grey = lut.apply([0.5, 0.5, 0.5]);
assert!((0..3).any(|k| (grey[k] - 0.5).abs() > 0.002), "the match grades: {grey:?}");
// a Lumetri that is switched off is not a grade to export
// a Color Grading that is switched off is not a grade to export
let set_enabled = |s: &mut Session, on: bool| {
s.edit_sequence("toggle", |q, _, _| {
let (_, it) = q.find_item_mut(clip).unwrap();
@@ -435,7 +435,7 @@ fn export_cube_goes_through_the_host_and_refuses_a_masked_lumetri() {
s.execute("lumetri.exportCube", json!({"path": path, "size": 9})).unwrap();
assert!(files.read_file(path).unwrap().starts_with(b"TITLE"));
assert!(!std::path::Path::new(path).exists());
// a LUT has no spatial input: a masked Lumetri is an error, not a whole-frame grade
// a LUT has no spatial input: a masked Color Grading is an error, not a whole-frame grade
s.edit_sequence("mask", |q, _, _| {
let (_, it) = q.find_item_mut(clip).unwrap();
it.effects.iter_mut().filter(|e| e.effect == "lumetri").for_each(|e| e.masks.push(Mask::new("m", MaskPath::rect(0.0, 0.0, 100.0, 100.0))));
+2 -2
View File
@@ -1,4 +1,4 @@
//! `scopes.read`: Lumetri Scopes as numbers (M8.9), so agents can check colour without looking.
//! `scopes.read`: Video Scopes as numbers (M8.9), so agents can check colour without looking.
//! It renders the active sequence at the playhead (or `time`), computes the scopes with
//! `filmcraft-scopes` and returns levels in percent (per channel and per column range), histogram
//! bins, and the densest vectorscope spots with their angle and saturation.
@@ -121,7 +121,7 @@ fn scopes_read(s: &mut Session, p: &Value) -> Result<Value> {
pub(crate) fn commands() -> Vec<CommandSpec> {
vec![CommandSpec {
id: "scopes.read",
label: "Read Lumetri Scopes",
label: "Read Video Scopes",
menu: &[],
shortcut: None,
params: r#"{"scopes":["waveform","parade","histogram","vectorscopeYuv","vectorscopeHls"]?,"waveformType":"rgb|luma|yc|ycNoChroma"?,"paradeType":"rgb|yuv|rgbWhite"?,"colorSpace":"auto|601|709|2100"?,"clamp":bool=true,"columns":n=8,"peaks":n=8,"bins":bool=true,"scale":0.5,"time":ticks?|"frame"|"seconds"|"timecode"}"#,
+2 -2
View File
@@ -198,7 +198,7 @@ fn simplify_sequence_makes_a_clean_copy() {
assert_eq!(w[0].end(), w[1].start);
}
assert_eq!(r["closedGaps"].as_i64().unwrap(), orig.video_tracks[0].items[1].duration.0);
// effects: Gaussian Blur and the demo's Lumetri gone, Motion & Opacity kept
// effects: Gaussian Blur and the demo's Color Grading gone, Motion & Opacity kept
assert!(q.video_tracks.iter().flat_map(|t| &t.items).all(|i| i.effects.iter().all(|e| e.def().is_some_and(|d| d.intrinsic))));
assert!(q.video_tracks[0].items[0].effect("motion").is_some());
// the original is untouched
@@ -277,7 +277,7 @@ fn flash_cue_markers_round_trip() {
assert!(s.active_sequence().unwrap().markers.iter().all(|m| m.kind != MarkerKind::FlashCue));
}
/// Apply Video Transition (Cmd+D) at both ends of an adjustment layer with Lumetri Color fades the
/// Apply Video Transition (Cmd+D) at both ends of an adjustment layer with Color Grading fades the
/// grade in and out, as on a clip: halfway through each dissolve the picture is about halfway
/// between the original and the graded frame, not the original with a hard cut after it.
#[test]
+13 -4
View File
@@ -61,6 +61,9 @@ pub struct Field {
pub enabled_by: Option<&'static str>,
/// Whether FilmCraft acts on the value (false = remembered for parity, no effect yet).
pub wired: bool,
/// Drawn greyed out with "This preference is not available yet.": the preference is remembered
/// but there is nothing behind it yet (`playback.enableTransmit`).
pub unavailable: bool,
}
#[derive(Clone, Copy, Debug)]
@@ -90,7 +93,7 @@ pub struct Category {
}
const fn f(key: &'static str, label: &'static str, kind: Kind, wired: bool) -> Row {
Row::Field(Field { key, label, kind, indent: false, enabled_by: None, wired })
Row::Field(Field { key, label, kind, indent: false, enabled_by: None, wired, unavailable: false })
}
const fn b(key: &'static str, label: &'static str, wired: bool) -> Row {
@@ -98,7 +101,13 @@ const fn b(key: &'static str, label: &'static str, wired: bool) -> Row {
}
const fn sub(key: &'static str, label: &'static str, kind: Kind, by: &'static str, wired: bool) -> Row {
Row::Field(Field { key, label, kind, indent: true, enabled_by: Some(by), wired })
Row::Field(Field { key, label, kind, indent: true, enabled_by: Some(by), wired, unavailable: false })
}
/// A switch with nothing behind it yet: drawn greyed out with the "not available yet" hint, and
/// still remembered, so the preference round-trips without pretending to work.
const fn pending(key: &'static str, label: &'static str) -> Row {
Row::Field(Field { key, label, kind: Kind::Bool, indent: false, enabled_by: None, wired: false, unavailable: true })
}
const fn int(min: f64, max: f64, unit: &'static str) -> Kind {
@@ -363,7 +372,7 @@ pub(super) static CATEGORIES: &[Category] = &[
f("color.hdrGraphicsWhite", "HDR Graphics White (Nits)", Kind::Choice(HDR_WHITE), false),
],
),
Row::Note("For color management parameters, go to the Settings tab in the Lumetri Color panel."),
Row::Note("For color management parameters, go to the Settings tab in the Color Grading panel."),
],
},
Category {
@@ -521,7 +530,7 @@ pub(super) static CATEGORIES: &[Category] = &[
f("playback.postrollSeconds", "Postroll", float(0.0, 60.0, 0, "seconds"), true),
f("playback.stepManyFrames", "Step forward/back many", int(1.0, 1000.0, "frames"), true),
b("playback.pauseEncoderQueue", "Pause Media Encoder queue during playback", false),
b("playback.enableTransmit", "Enable Mercury Transmit", false),
pending("playback.enableTransmit", "Enable External Video Output"),
b("playback.disableVideoInBackground", "Disable video output when in the background", false),
b("playback.draftDecode", "Draft decoding at reduced playback resolution (H.264: faster, some frames less filtered)", true),
f("playback.hardwareDecoding", "Hardware decoding", Kind::Choice(HW_DECODE), true),
+4
View File
@@ -880,6 +880,10 @@ fn hardware_decoding_setting_drives_the_decoder_switch() {
set(&mut s, "playback.hardwareDecoding", json!("auto"));
assert!(filmcraft_codecs::hw::hardware_decoding());
assert!(settings::field("playback.hardwareDecoding").is_some_and(|f| f.wired && matches!(f.kind, Kind::Choice(_))));
// External Video Output has nothing behind it yet: it stays in the schema and round-trips, and
// the dialog greys it out with the "not available yet" hint instead of pretending it works.
let transmit = settings::field("playback.enableTransmit").expect("playback.enableTransmit");
assert!(!transmit.wired && transmit.unavailable, "External Video Output must not claim to work");
}
/// Settings ▸ Timeline ▸ "Place files dropped onto the Timeline directly on the Timeline": on by default.
+29 -1
View File
@@ -53,7 +53,7 @@ pub const PANELS: &[&str] = &[
"Essential Graphics",
"Text",
"Properties",
"Lumetri Color",
"Color Grading",
];
pub const DEFAULT_PRESET: &str = "FilmCraft Default";
@@ -426,6 +426,8 @@ fn category_of(id: &str, menu: &[&str]) -> String {
"view" => "View".into(),
"app" | "help" | "mode" => "Application".into(),
"captions" => "Captions".into(),
// Keep legacy command ids stable without exposing their old feature name.
"lumetri" => "Color Grading".into(),
"tts" => "Text to Speech".into(),
_ => menu.first().map(|s| s.to_string()).unwrap_or_else(|| {
let mut c = prefix.chars();
@@ -1055,6 +1057,7 @@ fn check_panel(panel: Option<&str>) -> std::result::Result<Option<&'static str>,
"sourcemonitor" => "source",
"projects" => "project",
"timelines" => "timeline",
"lumetricolor" | "colorgrade" => "colorgrading",
_ => n.as_str(),
};
PANELS
@@ -1269,3 +1272,28 @@ pub fn commands() -> Vec<CommandSpec> {
}),
]
}
#[cfg(test)]
mod naming_tests {
use super::{Binding, CommandInfo, Platform, check_panel, convert};
#[test]
fn grading_shortcut_category_preserves_legacy_command_identity() {
let command = CommandInfo::new("lumetri.setLook", "Set Creative Look", &[], Some("Cmd+Alt+L"));
assert_eq!(command.category, "Color Grading");
assert_eq!(command.id, "lumetri.setLook");
assert_eq!(command.label, "Set Creative Look");
assert!(command.menu.is_empty());
assert_eq!(command.defaults, [("Cmd+Alt+L".to_string(), None)]);
}
#[test]
fn grading_shortcuts_import_old_and_current_panel_names() {
for name in ["Lumetri Color", "Color Grade", "Color Grading"] {
assert_eq!(check_panel(Some(name)).unwrap(), Some("Color Grading"));
let bindings = convert(vec![Binding::new("playback.toggle", "Cmd+1", Some(name))], Some(Platform::Mac));
assert_eq!(bindings.len(), 1);
assert_eq!(bindings[0].panel.as_deref(), Some("Color Grading"));
}
}
}
@@ -1,5 +1,5 @@
asset: lumetri_basic.png
title: Lumetri Color basic correction
title: Color Grading basic correction
author: FilmCraft contributors
source: original work (rendered by FilmCraft's own renderer from a procedurally generated project; no external media)
license: MIT OR Apache-2.0
@@ -1,5 +1,5 @@
asset: lumetri_hdr_pq.png
title: Lumetri grading in a Rec. 2100 PQ sequence (HDR White, HDR Specular), tone mapped
title: Color Grading in a Rec. 2100 PQ sequence (HDR White, HDR Specular), tone mapped
author: FilmCraft contributors
source: original work (rendered by FilmCraft's own renderer from a procedurally generated project; no external media)
license: MIT OR Apache-2.0
@@ -1,5 +1,5 @@
asset: lumetri_presets_grid.png
title: Lumetri Presets thumbnail grid
title: Color Grading Presets thumbnail grid
author: FilmCraft contributors
source: original work (rendered by FilmCraft's own renderer from a procedurally generated project; no external media)
license: MIT OR Apache-2.0
+7 -6
View File
@@ -245,7 +245,7 @@ fn gaussian_blur() -> Scene {
b.at(12)
}
/// Lumetri Color basic correction: temperature, exposure, contrast, highlights/shadows, saturation.
/// Color Grading basic correction: temperature, exposure, contrast, highlights/shadows, saturation.
fn lumetri_basic() -> Scene {
let mut b = Builder::new(1);
let bg = b.demo(DemoScene::OceanSunset);
@@ -459,7 +459,7 @@ fn hdr_tone_map() -> Scene {
b.at(12)
}
/// HDR grading: Rec. 2100 PQ footage in a PQ sequence, graded by Lumetri in the PQ signal
/// HDR grading: Rec. 2100 PQ footage in a PQ sequence, graded by Color Grading in the PQ signal
/// (exposure, contrast over HDR White, HDR Specular pulling the speculars in), shown tone mapped.
fn lumetri_hdr_pq() -> Scene {
let mut b = Builder::new(1);
@@ -615,7 +615,7 @@ fn scenes() -> Vec<(&'static str, &'static str, fn() -> Scene)> {
("transform_opacity", "Motion transform and opacity", transform_opacity),
("blend_modes", "Blend modes (Multiply, Screen, Overlay, Difference)", blend_modes),
("gaussian_blur", "Gaussian Blur effect", gaussian_blur),
("lumetri_basic", "Lumetri Color basic correction", lumetri_basic),
("lumetri_basic", "Color Grading basic correction", lumetri_basic),
("crop", "Crop effect", crop),
("transition_cross_dissolve", "Cross Dissolve at 50%", || transition("cross_dissolve", 24)),
("transition_dip_to_black", "Dip to Black at 25%", || transition("dip_to_black", 21)),
@@ -627,7 +627,7 @@ fn scenes() -> Vec<(&'static str, &'static str, fn() -> Scene)> {
("graphic_rich_text", "Per-character text styles and a box pinned around the text", graphic_rich_text),
("log_to_rec709", "Colour management: S-Log3/S-Gamut3.Cine footage to Rec. 709 (tone mapped)", log_to_rec709),
("hdr_tone_map", "Colour management: Rec. 2100 PQ footage tone mapped into a Rec. 709 sequence", hdr_tone_map),
("lumetri_hdr_pq", "Lumetri grading in a Rec. 2100 PQ sequence (HDR White, HDR Specular), tone mapped", lumetri_hdr_pq),
("lumetri_hdr_pq", "Color Grading in a Rec. 2100 PQ sequence (HDR White, HDR Specular), tone mapped", lumetri_hdr_pq),
("mask_blur", "Masks: Gaussian Blur inside a feathered ellipse mask", mask_blur),
("mask_color", "Masks: Black & White inside an expanded polygon minus a feathered Bezier mask", mask_color),
("mask_inverted", "Masks: Mosaic outside an inverted ellipse mask at 80% opacity", mask_inverted),
@@ -708,7 +708,7 @@ goldens!(
vfx_stylize
);
/// Effects panel ▸ Lumetri Presets thumbnail grid: every built-in preset graded by our Lumetri on
/// Effects panel ▸ Color Grading Presets thumbnail grid: every built-in preset graded by our Color Grading on
/// the procedural preview picture (`filmcraft_render::lumetri_presets`).
#[test]
fn lumetri_presets_grid() {
@@ -716,7 +716,8 @@ fn lumetri_presets_grid() {
let img = lp::grid(&lp::presets(), 6, 96, 54);
let rgba = Rgba8::new(img.w as u32, img.h as u32, img.over_black_rgba8());
let name = "lumetri_presets_grid";
let d = assert_golden(&golden_path(name), &rgba, Tolerance::RENDER, "Lumetri Presets thumbnail grid", &format!("crates/golden/tests/golden.rs ({name})"));
let d =
assert_golden(&golden_path(name), &rgba, Tolerance::RENDER, "Color Grading Presets thumbnail grid", &format!("crates/golden/tests/golden.rs ({name})"));
eprintln!("{name}: {d}");
}
+3 -2
View File
@@ -738,9 +738,10 @@ pub(crate) fn transition_effect(name: &str, audio: bool, report: &mut Report) ->
})
}
/// Display name of a transition (for documents).
/// Name of a transition in a document (the name an export has always written, so a UI rename does
/// not change the file).
pub(crate) fn transition_name(e: &EffectInstance) -> String {
e.def().map(|d| d.name.to_string()).unwrap_or_else(|| e.effect.clone())
e.def().map(|d| filmcraft_project::interchange_name(d).to_string()).unwrap_or_else(|| e.effect.clone())
}
/// Label from a document label name (Premiere label names; FCP7 names like "Good Take" ignored).
+2 -1
View File
@@ -1401,7 +1401,8 @@ impl Exp<'_, '_> {
return;
};
let media = if kind == TrackKind::Video { "video" } else { "audio" };
self.open_effect(def.name, def.id, def.category.get(1).copied().unwrap_or("Filter"), "filter", media, e.enabled);
// the name an export has always written, so a UI rename does not change the file
self.open_effect(filmcraft_project::interchange_name(def), def.id, def.category.get(1).copied().unwrap_or("Filter"), "filter", media, e.enabled);
for pd in &def.params {
let Some(p) = e.params.get(pd.id) else { continue };
match &p.value {
+1 -1
View File
@@ -1097,7 +1097,7 @@ impl Exp<'_, '_> {
}
}
for e in standard_effects(it) {
let n = e.def().map(|d| d.name).unwrap_or(&e.effect).to_string();
let n = e.def().map(|d| filmcraft_project::interchange_name(d).to_string()).unwrap_or_else(|| e.effect.clone());
let r = self.effect(&n, &e.effect);
let tag = if kind == TrackKind::Video { "filter-video" } else { "filter-audio" };
let mut s = format!("<{tag} ref=\"{r}\" name=\"{}\"", crate::xml::escape_attr(&n));
+20
View File
@@ -377,6 +377,26 @@ fn rich_roundtrip() {
assert_eq!(structure(&imp2.project, imp2.sequences[0], TrackKind::Video), structure(&p, s, TrackKind::Video));
}
/// #1868: renaming the panel does not change an export. FCP7 XML and FCPXML keep writing the
/// effect name other applications read back, so a file exported today matches one exported before.
#[test]
fn grading_keeps_its_interchange_name() {
let (mut p, s) = rich_project();
let first = p.sequence(s).unwrap().video_tracks[0].items[0].id;
let (_, it) = p.sequence_mut(s).unwrap().find_item_mut(first).unwrap();
it.effects.push(filmcraft_project::find_effect("lumetri").unwrap().instance());
let (fcp7, _) = export(&p, s, Format::Fcp7Xml, &ExportOptions::default()).unwrap();
let fcp7 = String::from_utf8(fcp7).unwrap();
assert!(fcp7.contains("<name>Lumetri Color</name>"), "{fcp7}");
assert!(!fcp7.contains("Color Grading"), "{fcp7}");
let (fcpxml, _) = export(&p, s, Format::Fcpxml, &ExportOptions::default()).unwrap();
let fcpxml = String::from_utf8(fcpxml).unwrap();
assert!(fcpxml.contains("name=\"Lumetri Color\""), "{fcpxml}");
assert!(!fcpxml.contains("Color Grading"), "{fcpxml}");
// the label the user sees is the current one
assert_eq!(filmcraft_project::find_effect("lumetri").unwrap().name, "Color Grading");
}
#[test]
fn version_5_and_generators() {
let (mut p, s) = rich_project();
+63 -2
View File
@@ -418,7 +418,7 @@ fn build_effects() -> Vec<EffectDef> {
),
video(
"lumetri",
"Lumetri Color",
"Color Grading",
COLOR_CORR,
vec![
grp(b("basic_on", "Basic Correction", true), "Basic Correction"),
@@ -895,7 +895,32 @@ pub fn find_effect(id: &str) -> Option<&'static EffectDef> {
/// Case-insensitive lookup by id or display name.
pub fn find_effect_by_name(name: &str) -> Option<&'static EffectDef> {
let n = name.to_ascii_lowercase();
effect_defs().iter().find(|e| e.id == n || e.name.to_ascii_lowercase() == n)
// Old human-readable names are import/automation aliases, never display labels.
let legacy_id = match n.as_str() {
"lumetri" | "lumetri color" | "color grade" => Some("lumetri"),
_ => None,
};
legacy_id.and_then(find_effect).or_else(|| effect_defs().iter().find(|e| e.id == n || e.name.to_ascii_lowercase() == n))
}
/// Names a user may still type into the Effects panel search for an effect whose display label
/// changed (`"Lumetri"` → Color Grading). Search terms only: never display labels, never written
/// to a project or an interchange file.
pub fn search_aliases(def: &EffectDef) -> &'static [&'static str] {
match def.id {
"lumetri" => &["Lumetri", "Lumetri Color", "Color Grade"],
_ => &[],
}
}
/// The name an interchange file (FCP7 XML, FCPXML, EDL) writes for an effect: the name it had
/// before the UI rename, so a rename never changes an export. Display labels come from
/// [`EffectDef::name`]; this is the stable name other applications read back.
pub fn interchange_name(def: &EffectDef) -> &'static str {
match def.id {
"lumetri" => "Lumetri Color",
_ => def.name,
}
}
/// Intrinsic video effects every video track item carries (Motion, Opacity, Time Remapping).
@@ -923,4 +948,40 @@ mod tests {
assert_eq!(find_effect_by_name("Gaussian Blur").unwrap().id, "gaussian_blur");
assert_eq!(intrinsic_video().len(), 3);
}
#[test]
fn descriptive_names_preserve_legacy_lookup_and_project_ids() {
for (id, old, label) in [
("lumetri", "Lumetri Color", "Color Grading"),
("lumetri", "Color Grade", "Color Grading"),
("ultra_key", "Ultra Key", "Ultra Key"),
("warp_stabilizer", "Warp Stabilizer", "Warp Stabilizer"),
("morph_cut", "Morph Cut", "Morph Cut"),
] {
let def = find_effect(id).unwrap();
assert_eq!(def.name, label);
assert_eq!(find_effect_by_name(old).unwrap().id, id);
assert_eq!(find_effect_by_name(&old.to_uppercase()).unwrap().id, id);
assert_eq!(find_effect_by_name(label).unwrap().id, id);
let saved = serde_json::to_value(def.instance()).unwrap();
assert_eq!(saved["effect"], id);
let loaded: EffectInstance = serde_json::from_value(saved).unwrap();
assert_eq!(loaded, def.instance());
}
}
#[test]
fn interchange_names_keep_exports_stable_across_the_rename() {
// FCP7 XML, FCPXML and EDL write the name other applications read back, so renaming a
// display label must not change a byte of an export.
let lumetri = find_effect("lumetri").unwrap();
assert_eq!(lumetri.name, "Color Grading");
assert_eq!(interchange_name(lumetri), "Lumetri Color");
for id in ["gaussian_blur", "cross_dissolve", "ultra_key", "warp_stabilizer"] {
let def = find_effect(id).unwrap();
assert_eq!(interchange_name(def), def.name, "{id}");
}
// and a file naming the old label still imports as the same effect
assert_eq!(find_effect_by_name(interchange_name(lumetri)).unwrap().id, "lumetri");
}
}
+1 -1
View File
@@ -1191,7 +1191,7 @@ mod tests {
"Unsharp Mask",
],
),
("Color Correction", &["ASC CDL", "Brightness & Contrast", "Lumetri Color", "Tint", "Video Limiter", "Vignette"]),
("Color Correction", &["ASC CDL", "Brightness & Contrast", "Color Grading", "Tint", "Video Limiter", "Vignette"]),
("Distort", &["Corner Pin", "Lens Distortion", "Magnify", "Mirror", "Spherize", "Turbulent Displace", "Twirl", "Warp Stabilizer", "Wave Warp"]),
("Generate", &["4-Color Gradient", "Gradient"]),
("Image Control", &["Black & White", "Channel Mix", "Color Pass", "Color Replace", "Gamma Correction", "Invert", "Rounded Crop"]),
+1 -1
View File
@@ -20,7 +20,7 @@ pub enum ParamValue {
Bool(bool),
Choice(u32),
Text(String),
/// Curve control points (x, y) in 0..1, sorted by x (Lumetri curves).
/// Curve control points (x, y) in 0..1, sorted by x (Color Grading curves).
Curve(Vec<[f32; 2]>),
/// A mask path (Bézier vertices in clip pixels); interpolates vertex-wise.
Path(crate::mask::MaskPath),
+2 -2
View File
@@ -36,7 +36,7 @@ use filmcraft_time::{FrameRate, TICKS_PER_SECOND, Tick, TimeRange};
use serde::{Deserialize, Serialize};
pub use caption::{Caption, CaptionAlign, CaptionAnchor, CaptionFormat, CaptionStyle, CaptionTrack, plain_text};
pub use effect::{EffectDef, EffectInstance, EffectKind, ParamDef, ParamKind, effect_defs, find_effect};
pub use effect::{EffectDef, EffectInstance, EffectKind, ParamDef, ParamKind, effect_defs, find_effect, interchange_name, search_aliases};
pub use essential::{AudioType, EssentialSound};
pub use find::{FindOp, FindQuery, FindRow, SearchBin};
pub use graphic_design::{CharStyle, GraphicMeta, LayerExtra, Pin, PinTarget, Roll, RollMode, SourceGraphic, StyleRun};
@@ -96,7 +96,7 @@ pub struct Project {
pub items: BTreeMap<ItemId, ProjectItem>,
/// Monotonic id source for all id types.
pub next_id: u64,
/// The project's LUT library (Lumetri Input LUT / Creative Look "Browse…"). LUT files are
/// The project's LUT library (Color Grading Input LUT / Creative Look "Browse…"). LUT files are
/// embedded, so projects render without the original files.
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub luts: Vec<ProjectLut>,
+1 -1
View File
@@ -60,7 +60,7 @@ impl ProjectView {
pub const MAX_PLAYHEAD: Tick = Tick(10_000_000 * TICKS_PER_SECOND);
}
/// A LUT imported into the project (`lut.import`). Lumetri refers to it as `lib:<id>`.
/// A LUT imported into the project (`lut.import`). Color Grading refers to it as `lib:<id>`.
/// Largest embedded LUT source accepted from a project or import (8 MiB).
pub const MAX_LUT_TEXT_BYTES: usize = 8 << 20;
+11 -2
View File
@@ -9,8 +9,17 @@
use crate::effect::{EffectDef, EffectKind, ParamDef, ang, b, ch, col, fs, pt};
/// Top-level Effects panel folders, in Premiere's order.
pub const EFFECT_TOP_FOLDERS: &[&str] = &["Presets", "Lumetri Presets", "Audio Effects", "Audio Transitions", "Video Effects", "Video Transitions", "Legacy"];
/// Stable key used in saved Effects-panel state and automation paths.
pub const COLOR_PRESETS_FOLDER_KEY: &str = "Lumetri Presets";
/// Presentation is separate from folder identity so saved expansion state keeps working.
pub fn effect_folder_label(key: &str) -> &str {
if key == COLOR_PRESETS_FOLDER_KEY { "Color Grading Presets" } else { key }
}
/// Top-level Effects panel keys, in their established order.
pub const EFFECT_TOP_FOLDERS: &[&str] =
&["Presets", COLOR_PRESETS_FOLDER_KEY, "Audio Effects", "Audio Transitions", "Video Effects", "Video Transitions", "Legacy"];
/// The ten `Video Transitions` sub-folders, in panel order.
pub const VIDEO_TRANSITION_FOLDERS: &[&str] =
+4 -4
View File
@@ -1,4 +1,4 @@
//! Lumetri ▸ Color Wheels & Match ▸ **Apply Match**: grade the current clip so its colour matches
//! Color Grading ▸ Color Wheels & Match ▸ **Apply Match**: grade the current clip so its colour matches
//! a reference frame. A documented, non-ML method:
//!
//! 1. Both frames are downsampled (≤ 96 px wide) and converted to **Oklab** (Björn Ottosson, 2020),
@@ -10,9 +10,9 @@
//! 20°–75°, chroma 0.02–0.2, L 0.25–0.92) are down-weighted (×0.2) in the colour statistics, so
//! faces do not drive the cast; afterwards the solved cast is scaled down until the mean hue of
//! the current frame's skin pixels moves by at most 8°.
//! 4. The match is solved **in Lumetri's own parameters** — the three colour wheels (x, y), their
//! 4. The match is solved **in Color Grading's own parameters** — the three colour wheels (x, y), their
//! lightness sliders and Basic saturation (10 unknowns) — by damped Gauss–Newton
//! (Levenberg–Marquardt) with numerical derivatives through the real Lumetri implementation
//! (Levenberg–Marquardt) with numerical derivatives through the real Color Grading implementation
//! ([`crate::effects::apply`]), so the result is an ordinary, editable grade. A small penalty
//! on the parameters keeps the grade minimal when the statistics are already close.
@@ -200,7 +200,7 @@ fn graded_stats(img: &Image, base: &EffectInstance, x: &[f32; 10], skin_protect:
}
/// Solve the grade that matches `current` (the clip before its wheels) to `reference`. `base` is
/// the clip's Lumetri instance (its other settings are kept; wheels and saturation are solved).
/// the clip's Color Grading instance (its other settings are kept; wheels and saturation are solved).
pub fn solve(current: &Image, reference: &Image, base: &EffectInstance, skin_protect: bool) -> Match {
let cur = shrink(current, 96);
let refs = stats(&shrink(reference, 96), skin_protect);
+6 -6
View File
@@ -24,14 +24,14 @@ pub struct FxCtx<'a> {
/// Formatted sequence timecode (for the Timecode effect).
pub timecode: &'a str,
pub clip_name: &'a str,
/// The project (LUT library for Lumetri); `None` in isolated effect tests.
/// The project (LUT library for Color Grading); `None` in isolated effect tests.
pub project: Option<&'a filmcraft_project::Project>,
/// The clip's surroundings (other frames, other tracks, sequence geometry) for temporal,
/// track-reading and reframing effects; `None` in isolated tests and adjustment layers.
pub env: Option<&'a dyn crate::vfx::FxEnv>,
/// Sequence frame rate (shutter-angle motion blur); also known where `env` is `None`.
pub frame_rate: f64,
/// The sequence's working colour space: Lumetri grades HDR (PQ / HLG) working spaces in their
/// The sequence's working colour space: Color Grading grades HDR (PQ / HLG) working spaces in their
/// own signal, normalised to HDR White ([`filmcraft_color::GradeSpace`]).
pub working: filmcraft_color::WorkingSpace,
}
@@ -630,7 +630,7 @@ fn within_unit(v: [f32; 3], hdr: bool, f: impl Fn([f32; 3]) -> [f32; 3]) -> [f32
o.map(|q| q * m)
}
/// The luma (encoded, 0..1) down to which the Lumetri highlight / shadow lift scales a pixel by
/// The luma (encoded, 0..1) down to which the Color Grading highlight / shadow lift scales a pixel by
/// `new luma / luma`, preserving its hue exactly as it always has; below it the scale is held at
/// this luma's and the rest of the lift is added equally to the channels, so a trace of chroma in
/// a near-black pixel is not multiplied into a speck (#2094). About 5/255 in sRGB. Mirrored in
@@ -1275,7 +1275,7 @@ pub fn hue_lut(points: &[[f32; 2]], n: usize) -> Option<Vec<f32>> {
Some(lut[n - 1..2 * n - 1].to_vec())
}
/// Lumetri's other "vs Sat" curves (Luma vs Sat, Sat vs Sat): neutral 0.5 where there are no
/// Color Grading's other "vs Sat" curves (Luma vs Sat, Sat vs Sat): neutral 0.5 where there are no
/// points, like the hue curves, but over a straight 0..1 axis. Black and white are not neighbours,
/// so the curve does not wrap; it stays flat beyond its outermost points.
pub fn vs_sat_lut(points: &[[f32; 2]], n: usize) -> Option<Vec<f32>> {
@@ -1447,7 +1447,7 @@ fn hsl_key(v: [f32; 3], hc: f32, hr: f32, smin: f32, lmin: f32, lmax: f32, soft:
mh * ms * ml
}
/// Lumetri ▸ HSL Secondary: key on hue / saturation / lightness, Refine (Denoise, Blur) the key,
/// Color Grading ▸ HSL Secondary: key on hue / saturation / lightness, Refine (Denoise, Blur) the key,
/// then correct inside it (or show the mask).
///
/// - **Denoise** removes speckle from the key: a median filter (radius 1–3 px at full
@@ -1801,7 +1801,7 @@ mod lumetri_cpu_parity_tests {
}
}
/// #719: positive Roundness rounds the Lumetri vignette (it used to be ignored), +100
/// #719: positive Roundness rounds the Color Grading vignette (it used to be ignored), +100
/// is a circle and negative values widen the oval, on the CPU path and the GPU op alike.
#[test]
fn lumetri_vignette_roundness_shapes_the_vignette() {
+1 -1
View File
@@ -1127,7 +1127,7 @@ impl FxOp {
}
}
/// Horizontal scale of the Lumetri vignette's coordinates for a Roundness of `vround`
/// Horizontal scale of the Color Grading vignette's coordinates for a Roundness of `vround`
/// (−1 … 1) on a frame `aspect` wide. At 0 the vignette is an ellipse that follows the
/// frame; positive values move it towards a circle (1 = a true circle), negative values
/// stretch it into a wider oval. Non-finite or out-of-range input never yields NaN.
+4 -4
View File
@@ -1,4 +1,4 @@
//! A clip's Lumetri grade sampled on a 3D lattice, for Lumetri's Export .cube (#4127).
//! A clip's Color Grading grade sampled on a 3D lattice, for Color Grading's Export .cube (#4127).
//!
//! The lattice is an image of `size³` pixels holding every grid colour as an encoded (display) RGB
//! value, so that running the grade's own CPU effect on it gives the grade of each colour, and the
@@ -58,7 +58,7 @@ fn tabulable(e: &EffectInstance, t: Tick, left_out: &mut Vec<&'static str>) -> E
e
}
/// Sample the Lumetri effects `effects` (in order; disabled ones are skipped) at effect time `t`
/// Sample the Color Grading effects `effects` (in order; disabled ones are skipped) at effect time `t`
/// on a `size³` lattice in the sequence's output encoding. Only Rec. 709 sequences without wide
/// gamut are supported: the HDR and wide-gamut pipelines grade in another signal.
pub fn sample_lumetri(
@@ -77,7 +77,7 @@ pub fn sample_lumetri(
return Err(format!("`size` must be between {MIN_SIZE} and {MAX_SIZE}"));
}
if effects.iter().any(|e| e.enabled && e.effect == "lumetri" && !e.masks.is_empty()) {
return Err("Lumetri Color with masks cannot be exported to a LUT: a LUT has no spatial input".into());
return Err("Color Grading with masks cannot be exported to a LUT: a LUT has no spatial input".into());
}
let mut left_out = Vec::new();
let graded: Vec<EffectInstance> = effects.iter().filter(|e| e.enabled && e.effect == "lumetri").map(|e| tabulable(e, t, &mut left_out)).collect();
@@ -198,7 +198,7 @@ mod tests {
let s = sample(&[&e], 5);
let id = Lut3d::identity(5);
let worst = s.lut.data.iter().zip(&id.data).flat_map(|(a, b)| (0..3).map(move |k| (a[k] - b[k]).abs())).fold(0.0, f32::max);
assert!(worst < 1.0 / 255.0, "a disabled Lumetri grades nothing: {worst}");
assert!(worst < 1.0 / 255.0, "a disabled Color Grading grades nothing: {worst}");
for bad in [0, 1, MAX_SIZE + 1, usize::MAX] {
assert!(sample_lumetri(&[&e], None, Tick::ZERO, 24.0, &ColorPipeline::REC709, bad, "t").is_err(), "{bad}");
}
+1 -1
View File
@@ -1,4 +1,4 @@
//! Lumetri in HDR working spaces (known cd/m² values through PQ and HLG) and HSL Secondary ▸
//! Color Grading in HDR working spaces (known cd/m² values through PQ and HLG) and HSL Secondary ▸
//! Refine (Denoise, Blur of the key).
use filmcraft_color::{GradeSpace, REFERENCE_WHITE_NITS, WorkingSpace};
+6 -6
View File
@@ -1,5 +1,5 @@
//! Lumetri Presets (Effects panel ▸ Lumetri Presets): built-in Lumetri Color looks, and their
//! thumbnails rendered by our own Lumetri on a generated preview picture.
//! Color Grading Presets (Effects panel ▸ Color Grading Presets): built-in Color Grading looks, and their
//! thumbnails rendered by our own Color Grading on a generated preview picture.
//!
//! The presets are original work: parameter values chosen by FilmCraft contributors, named
//! descriptively (no third-party look names, LUTs or preview images). The preview picture
@@ -15,10 +15,10 @@ use filmcraft_time::Tick;
use crate::Image;
use crate::effects::{FxCtx, apply};
/// One preset: a Lumetri Color instance with these parameters (the rest at their defaults).
/// One preset: a Color Grading instance with these parameters (the rest at their defaults).
#[derive(Clone, Debug)]
pub struct LumetriPreset {
/// Sub-folder of Lumetri Presets.
/// Sub-folder of Color Grading Presets.
pub folder: &'static str,
pub name: &'static str,
pub description: &'static str,
@@ -26,7 +26,7 @@ pub struct LumetriPreset {
}
impl LumetriPreset {
/// A Lumetri Color effect instance configured as the preset.
/// A Color Grading effect instance configured as the preset.
pub fn instance(&self) -> EffectInstance {
let mut e = match find_effect("lumetri") {
Some(def) => def.instance(),
@@ -236,7 +236,7 @@ pub fn thumbnail(preset: &LumetriPreset, w: usize, h: usize) -> Image {
}
/// A grid of thumbnails (`cols` columns of `w`×`h` cells, 4 px gaps over a dark background), in
/// the order given: the Effects panel's thumbnail view of a Lumetri Presets folder.
/// the order given: the Effects panel's thumbnail view of a Color Grading Presets folder.
pub fn grid(presets: &[LumetriPreset], cols: usize, w: usize, h: usize) -> Image {
const GAP: usize = 4;
let cols = cols.max(1);
+4 -4
View File
@@ -1,6 +1,6 @@
//! LUT resolution for Lumetri (Input LUT, Creative Look) and the built-in LUTs.
//! LUT resolution for Color Grading (Input LUT, Creative Look) and the built-in LUTs.
//!
//! Lumetri stores a LUT reference as text:
//! Color Grading stores a LUT reference as text:
//! * `""` — none;
//! * `lib:<id>` — a LUT in the project's LUT library (`Project::luts`, imported `.cube`/`.3dl`);
//! * `builtin:<id>` — a LUT FilmCraft generates from code: camera log → Rec. 709 conversions
@@ -125,7 +125,7 @@ fn cached(key: CacheKey, make: impl FnOnce() -> Option<Lut>) -> Option<Arc<Lut>>
Some(l)
}
/// Resolve a Lumetri LUT reference (see module docs). `None` for "" or unknown references.
/// Resolve a Color Grading LUT reference (see module docs). `None` for "" or unknown references.
pub fn resolve(project: Option<&Project>, spec: &str) -> Option<Arc<Lut>> {
let spec = spec.trim();
if let Some(id) = spec.strip_prefix("builtin:") {
@@ -166,7 +166,7 @@ mod tests {
let b = builtins().iter().find(|b| b.id == "slog3-sgamut3cine-to-rec709").unwrap();
let l = b.generate();
// S-Log3 mid grey (code 420; the LUT sees video-range normalised values like the rest of
// Lumetri) → ≈ 18 % linear on the sRGB curve
// Color Grading) → ≈ 18 % linear on the sRGB curve
let g = l.apply([(420.0 - 64.0) / 876.0; 3]);
assert!((g[0] - filmcraft_color::linear_to_srgb(0.18)).abs() < 0.03, "{g:?}");
assert!(resolve(None, "builtin:slog3-sgamut3cine-to-rec709").is_some());
+2 -2
View File
@@ -53,7 +53,7 @@ pub const HASH_VERSION: &str = "filmcraft-preview-v1";
/// Calibration (M4 Pro, shared with other jobs; 1080p 23.976 sequence, Full playback resolution,
/// 8 s of playback ≈ 192 frames, counted by the Program monitor's dropped-frame stats):
/// * 1080p H.264 High clip, no effects (no bar, est. 3.5 ms): 11 dropped;
/// * same clip + Lumetri, Sharpen, Levels, Tint (red, est. 183 ms): 189–191 dropped, ≤ 17 on time;
/// * same clip + Color Grading, Sharpen, Levels, Tint (red, est. 183 ms): 189–191 dropped, ≤ 17 on time;
/// * after Render Effects In to Out (green; ProRes preview rendered at ~3 fps): 25–46 dropped on
/// the first play right after the render (frame workers still busy with live renders queued
/// before it), then 0–1 dropped on every later play.
@@ -385,7 +385,7 @@ fn hash_source(h: &mut Fnv128, project: &Project, id: ItemId, kind: TrackKind, d
///
/// Three tiers from timing every effect at its defaults on a 1920×1080 frame on an M4 Pro
/// (`cargo test -p filmcraft-render --release -- --ignored effect_costs --nocapture` prints the
/// table): heavy ≥ 30 ms (blurs/sharpen at real radii, Lumetri, Levels, keyers…), medium 10–30 ms,
/// table): heavy ≥ 30 ms (blurs/sharpen at real radii, Color Grading, Levels, keyers…), medium 10–30 ms,
/// light < 10 ms. Unknown ids count as medium.
pub fn effect_cost_ms(id: &str) -> f64 {
match id {
+1 -1
View File
@@ -1,6 +1,6 @@
# filmcraft-scopes
Video scope maths for the Lumetri Scopes panel (layer L3; depends only on `filmcraft-color` and
Video scope maths for the Video Scopes panel (layer L3; depends only on `filmcraft-color` and
`serde`; no UI, builds for wasm32). The UI (`crates/ui-egui/src/panels/scopes.rs`) draws what this
crate computes; `scopes.read` (`crates/engine/src/scopes.rs`) returns it as numbers for agents.
+1 -1
View File
@@ -43,7 +43,7 @@ pub const SKIN_TONE_DEG: f32 = 123.0;
// ------------------------------------------------------------------------------------ settings
/// A scope of the Lumetri Scopes panel.
/// A scope of the Video Scopes panel.
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub enum ScopeKind {
+2 -2
View File
@@ -112,7 +112,7 @@ Timeline sequence tabs retain their sequence-opening, closing and horizontal reo
On desktop each floating panel opens in its own OS window. Tool panels are palettes: they stay
above other windows and hide while another application is active. The video viewers (Program,
Source, Reference Monitor, Lumetri Scopes) are normal windows, say on a second display: they
Source, Reference Monitor, Video Scopes) are normal windows, say on a second display: they
stack with the main window and stay shown in the background. A floating window moves by its
title bar, resizes from every edge and splits like the main window. While a modal dialog is open
(Settings, Recovery, Revert, a file dialog), the native windows are dimmed and take no input.
@@ -174,7 +174,7 @@ leave custom markers visible. Selecting a preset clears the override, preserving
The opaque sRGB editor lives in `widgets::color_picker`, independently of marker models,
dialogs and project commands. Callers provide a `ColorDraft`, automation registry and id
prefix. Its HSV conversion operates on sRGB channels; using linear-light saturation would
make the center too white. Lumetri's grading wheels remain separate: they edit grading
make the center too white. Color Grading's grading wheels remain separate: they edit grading
offsets. Existing effect/graphics pickers retain their alpha/float/color-space semantics.
The same author and hex values are available to Source marker commands. Existing markers
+30 -2
View File
@@ -92,8 +92,8 @@ impl PanelKind {
PanelKind::Tools => "Tools",
PanelKind::AudioMeters => "Audio Meters",
PanelKind::AudioTrackMixer => "Audio Track Mixer",
PanelKind::LumetriColor => "Lumetri Color",
PanelKind::LumetriScopes => "Lumetri Scopes",
PanelKind::LumetriColor => "Color Grading",
PanelKind::LumetriScopes => "Video Scopes",
PanelKind::EssentialGraphics => "Essential Graphics",
PanelKind::EssentialSound => "Essential Sound",
PanelKind::TextToSpeech => "Text to Speech",
@@ -111,6 +111,12 @@ impl PanelKind {
}
pub fn from_name(s: &str) -> Option<PanelKind> {
let n = s.to_ascii_lowercase().replace([' ', '_', '-'], "");
if n == "colorgrade" || n == "lumetricolor" {
return Some(PanelKind::LumetriColor);
}
if n == "videoscopes" || n == "lumetriscopes" {
return Some(PanelKind::LumetriScopes);
}
Self::ALL.iter().copied().find(|p| format!("{p:?}").to_ascii_lowercase() == n || p.title().to_ascii_lowercase().replace(' ', "") == n)
}
/// Window-menu shortcut (Premiere: Shift+1..9).
@@ -998,3 +1004,25 @@ mod tests {
assert_eq!(read(&split), (None, vec![]));
}
}
#[cfg(test)]
mod naming_tests {
use super::PanelKind;
#[test]
fn grading_panel_names_keep_old_aliases_and_serialization() {
for name in ["Lumetri Color", "Color Grade", "Color Grading", "LumetriColor"] {
assert_eq!(PanelKind::from_name(name), Some(PanelKind::LumetriColor));
}
for name in ["Lumetri Scopes", "Video Scopes", "LumetriScopes"] {
assert_eq!(PanelKind::from_name(name), Some(PanelKind::LumetriScopes));
}
assert_eq!(PanelKind::LumetriColor.title(), "Color Grading");
assert_eq!(PanelKind::LumetriScopes.title(), "Video Scopes");
for panel in [PanelKind::LumetriColor, PanelKind::LumetriScopes] {
let saved = serde_json::to_value(panel).unwrap();
let loaded: PanelKind = serde_json::from_value(saved).unwrap();
assert_eq!(loaded, panel);
}
}
}
+63
View File
@@ -507,3 +507,66 @@ mod bcp47_tests {
}
}
}
#[cfg(test)]
mod feature_name_tests {
#[test]
fn renamed_feature_labels_have_translations_in_every_catalog() {
let catalogs = [
("bs", include_str!("i18n/bs.tsv")),
("cs", include_str!("i18n/cs.tsv")),
("de", include_str!("i18n/de.tsv")),
("es", include_str!("i18n/es.tsv")),
("fr", include_str!("i18n/fr.tsv")),
("id", include_str!("i18n/id.tsv")),
("it", include_str!("i18n/it.tsv")),
("ja", include_str!("i18n/ja.tsv")),
("ko", include_str!("i18n/ko.tsv")),
("pl", include_str!("i18n/pl.tsv")),
("pt-br", include_str!("i18n/pt-br.tsv")),
("ru", include_str!("i18n/ru.tsv")),
("sv", include_str!("i18n/sv.tsv")),
("tr", include_str!("i18n/tr.tsv")),
("uk", include_str!("i18n/uk.tsv")),
("zh-cn", include_str!("i18n/zh-cn.tsv")),
];
for (language, catalog) in catalogs {
let (entries, errors) = super::catalog::parse_entries(catalog);
assert!(errors.is_empty(), "{language}: {errors:?}");
assert!(
entries.iter().all(|(_, source, translated)| !source.contains("Lumetri") && !translated.contains("Lumetri")),
"{language}: old display mark"
);
for key in [
"List Color Grading Presets",
"Apply Color Grading Preset",
"Color Grading Preset Thumbnails",
"Toggle Color Grading Section",
"Color Grading Section",
"Read Video Scopes",
"Color Grading",
"Video Scopes",
"Color Grading Presets",
"Add Color Grading to clip",
"For color management parameters, go to the Settings tab in the Color Grading panel.",
"Ultra Key",
"Warp Stabilizer",
"Morph Cut",
"Enable External Video Output",
] {
assert_eq!(
entries.iter().filter(|(context, source, _)| context.is_empty() && source == key).count(),
1,
"{language}: duplicate or missing {key}"
);
assert!(
catalog.lines().any(|line| {
let mut fields = line.split('\t');
fields.next() == Some("") && fields.next() == Some(key) && fields.next().is_some_and(|text| !text.is_empty())
}),
"{language}: missing {key}"
);
}
}
}
}
+12 -7
View File
@@ -188,8 +188,8 @@
Link Media… Poveži medije…
Linked Selection Povezani odabir
Lock Guides Zaključaj vodilice
Lumetri Color Lumetri boja
Lumetri Scopes Lumetri skopovi
Color Grading Gradacija boja
Video Scopes Video skopovi
Magnification Uvećanje
Make Offline… Učini nedostupnim…
Make Subclip… Napravi podklip…
@@ -908,7 +908,7 @@
Clip Volume Jačina klipa
(no clip selected) (nije odabran klip)
Master · {name} Glavno · {name}
Add Lumetri Color to clip Dodaj Lumetri boju na klip
Add Color Grading to clip Dodaj gradaciju boja isječku
Input LUT Ulazni LUT
Temperature Temperatura
Tint Preliv
@@ -1683,7 +1683,7 @@
Elliptical Eliptično
Emboss Reljef
Enable HSL Secondary Omogući HSL sekundarno
Enable Mercury Transmit Omogući Mercury Transmit
Enable External Video Output Omogući vanjski video izlaz
Enable ProRes hardware accelerated encoding, if available Omogući hardverski ubrzano ProRes kodiranje, ako je dostupno
Enable clip and XMP metadata linking Omogući povezivanje metapodataka klipa i XMP-a
Enable developer mode Omogući razvojni način
@@ -1751,7 +1751,7 @@
Focus Size Veličina fokusa
Fold Motion Pokret preklapanja
Foldback Povratni monitoring
For color management parameters, go to the Settings tab in the Lumetri Color panel. Za parametre upravljanja bojama idite na karticu Postavke u panelu Lumetri boja.
For color management parameters, go to the Settings tab in the Color Grading panel. Za parametre upravljanja bojama otvorite karticu Postavke na panelu Gradacija boja.
Format Format
Four Scopes (RGB, 8 bit) Četiri skopa (RGB, 8-bitno)
Four Scopes (YUV, float, no clamp) Četiri skopa (YUV, pokretni zarez, bez ograničenja)
@@ -2019,7 +2019,7 @@
Luma Key Luma ključ
Luma Source Izvor lume
Luma and Chroma Luma i hroma
Lumetri Presets Lumetri predlošci
Color Grading Presets Predlošci gradacije boja
Luminance Luminansa
Luminance Threshold Prag luminanse
Luminosity Osvijetljenost
@@ -3125,7 +3125,6 @@
Left align text Poravnaj tekst lijevo
Looping GIF, 640×360 at 15 fps GIF u petlji, 640×360 pri 15 fps
Lower First Prvo donje
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR (Avid)
MXF OP1a MXF OP1a
@@ -3626,3 +3625,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master H.264 High 10 (10-bitno 4:2:0) u veličini sekvence, konstantan kvalitet CRF 16, AAC 320 kbps; 10-bitni master
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10-bitno 4:2:0, svaka sličica je ključna), CRF 12, AAC 320 kbps; međuformat pogodan za montažu
List Color Grading Presets Prikaži predloške gradacije boja
Apply Color Grading Preset Primijeni predložak gradacije boja
Color Grading Preset Thumbnails Sličice predložaka gradacije boja
Toggle Color Grading Section Uključi/isključi odjeljak gradacije boja
Color Grading Section Odjeljak gradacije boja
Read Video Scopes Očitaj video skopove
Can't render this file because it contains an unexpected character in line 2391 and column 7.
+12 -7
View File
@@ -197,8 +197,8 @@
Refresh Changed Media Obnovit změněná média
Linked Selection Propojený výběr
Lock Guides Zamknout vodítka
Lumetri Color Barvy Lumetri
Lumetri Scopes Obrazové měřiče Lumetri
Color Grading Barevné úpravy
Video Scopes Videoskopy
Magnification Zvětšení
Make Offline… Přepnout do režimu offline…
Make Subclip… Vytvořit podklip…
@@ -888,7 +888,7 @@
Clip Volume Hlasitost klipu
(no clip selected) (žádný vybraný klip)
Master · {name} Hlavní klip · {name}
Add Lumetri Color to clip Přidat barvy Lumetri do klipu
Add Color Grading to clip Přidat barevné úpravy do klipu
Input LUT Vstupní LUT
Color Barva
Temperature Teplota
@@ -1666,7 +1666,7 @@
Elliptical Eliptický
Emboss Reliéf
Enable HSL Secondary Povolit sekundární korekci HSL
Enable Mercury Transmit Povolit Mercury Transmit
Enable External Video Output Povolit externí výstup videa
Enable ProRes hardware accelerated encoding, if available Povolit hardwarově akcelerované kódování ProRes, je-li dostupné
Enable clip and XMP metadata linking Povolit propojení metadat klipu a XMP
Enable developer mode Povolit vývojářský režim
@@ -1734,7 +1734,7 @@
Focus Size Velikost oblasti zaostření
Fold Motion Pohyb přeložení
Foldback Zpětné přeložení
For color management parameters, go to the Settings tab in the Lumetri Color panel. Parametry správy barev najdete na kartě Nastavení v panelu Barvy Lumetri.
For color management parameters, go to the Settings tab in the Color Grading panel. Parametry správy barev najdete na kartě Nastavení v panelu Barevné úpravy.
Format Formát
Four Scopes (RGB, 8 bit) Čtyři měřiče (RGB, 8bitové)
Four Scopes (YUV, float, no clamp) Čtyři měřiče (YUV, plovoucí desetinná čárka, bez omezení)
@@ -2003,7 +2003,7 @@
Luma Key Klíčování podle jasové složky
Luma Source Zdroj jasové složky
Luma and Chroma Jasová a barevná složka
Lumetri Presets Přednastavení Lumetri
Color Grading Presets Přednastavení barevných úprav
Luminance Luminance
Luminance Threshold Práh luminance
Luminosity Světlost
@@ -3113,7 +3113,6 @@
Left align text Zarovnat text vlevo
Looping GIF, 640×360 at 15 fps Opakovaný GIF, 640×360 při 15 sn./s
Lower First Dolní půlsnímek první
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR (Avid)
MXF OP1a MXF OP1a
@@ -3644,3 +3643,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master H.264 High 10 (10bitové 4:2:0) ve velikosti sekvence, konstantní kvalita CRF 16, AAC 320 kb/s; 10bitový master
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10bitové 4:2:0, každý snímek klíčový), CRF 12, AAC 320 kb/s; mezilehlý formát vhodný pro střih
List Color Grading Presets Vypsat přednastavení barevných úprav
Apply Color Grading Preset Použít přednastavení barevných úprav
Color Grading Preset Thumbnails Náhledy přednastavení barevných úprav
Toggle Color Grading Section Přepnout sekci barevných úprav
Color Grading Section Sekce barevných úprav
Read Video Scopes Načíst videoskopy
Can't render this file because it contains an unexpected character in line 2377 and column 7.
+14 -9
View File
@@ -4,7 +4,7 @@
# German video-editing vocabulary. No proprietary localisation resource, string table or product UI
# was consulted or copied; add entries the same way. Like the German catalogs of the other Craft
# apps, text addresses the user informally ("du") and commands use the infinitive ("Projekt
# öffnen…"). Product, format and feature names (FilmCraft, ArtCraft, Lumetri, Essential Graphics,
# öffnen…"). Product, format and feature names (FilmCraft, ArtCraft, Essential Graphics,
# EDL, AAF…) keep their spelling. The catalog covers the whole interface: first every menu,
# including the native macOS app menu, then the rest of the Spanish catalog (panels, dialogs,
# effects and their parameters, presets, settings, status messages). Strings added later show in
@@ -16,7 +16,7 @@
# menu) = Voreinstellungen. "Timeline" is not translated. Further: frame = Frame, keyframe =
# Keyframe, preset = Vorgabe, footage = Material, render = rendern, application = Anwendung;
# ripple, roll, slip and slide edits keep their names (Ripple-Trimmen, Rollen-Werkzeug…); in
# Lumetri highlights = Lichter, shadows = Tiefen, midtones = Mitteltöne. Keys: Shift = Umschalt,
# Color grading highlights = Lichter, shadows = Tiefen, midtones = Mitteltöne. Keys: Shift = Umschalt,
# Option = Wahl, Ctrl = Strg.
AAF… AAF…
@@ -216,8 +216,8 @@
Link Media… Medien verknüpfen…
Linked Selection Verknüpfte Auswahl
Lock Guides Hilfslinien sperren
Lumetri Color Lumetri-Farbe
Lumetri Scopes Lumetri-Scopes
Color Grading Farbgrading
Video Scopes Videoskope
Magenta Magenta
Magnification Vergrößerung
Make Offline… Offline setzen…
@@ -926,7 +926,7 @@
Clip Volume Cliplautstärke
(no clip selected) (kein Clip ausgewählt)
Master · {name} Master · {name}
Add Lumetri Color to clip Lumetri-Farbe zum Clip hinzufügen
Add Color Grading to clip Farbgrading zum Clip hinzufügen
Input LUT Eingabe-LUT
Temperature Temperatur
Tint Tönung
@@ -1700,7 +1700,7 @@
Elliptical Elliptisch
Emboss Prägen
Enable HSL Secondary HSL-Sekundär aktivieren
Enable Mercury Transmit Mercury Transmit aktivieren
Enable External Video Output Externe Videoausgabe aktivieren
Enable ProRes hardware accelerated encoding, if available Hardwarebeschleunigte ProRes-Kodierung aktivieren, falls verfügbar
Enable clip and XMP metadata linking Verknüpfung von Clip- und XMP-Metadaten aktivieren
Enable developer mode Entwicklermodus aktivieren
@@ -1768,7 +1768,7 @@
Focus Size Fokusgröße
Fold Motion Faltbewegung
Foldback Foldback
For color management parameters, go to the Settings tab in the Lumetri Color panel. Die Parameter für das Farbmanagement findest du auf dem Reiter „Einstellungen“ des Bedienfelds „Lumetri-Farbe“.
For color management parameters, go to the Settings tab in the Color Grading panel. Die Parameter für das Farbmanagement findest du auf dem Reiter „Einstellungen“ des Bedienfelds „Farbgrading“.
Format Format
Four Scopes (RGB, 8 bit) Vier Scopes (RGB, 8 Bit)
Four Scopes (YUV, float, no clamp) Vier Scopes (YUV, Gleitkomma, unbegrenzt)
@@ -2036,7 +2036,7 @@
Luma Key Luma-Key
Luma Source Luma-Quelle
Luma and Chroma Luma und Chroma
Lumetri Presets Lumetri-Vorgaben
Color Grading Presets Farbgrading-Vorgaben
Luminance Luminanz
Luminance Threshold Luminanzschwellenwert
Luminosity Luminanz
@@ -3142,7 +3142,6 @@
Left align text Text linksbündig
Looping GIF, 640×360 at 15 fps GIF in Schleife, 640×360 mit 15 fps
Lower First Unteres Halbbild zuerst
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR (Avid)
MXF OP1a MXF OP1a
@@ -3694,3 +3693,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master H.264 High 10 (10 Bit 4:2:0) in der Größe der Sequenz, konstante Qualität CRF 16, AAC 320 kbps; ein 10-Bit-Master
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10 Bit 4:2:0, jedes Bild ein Keyframe), CRF 12, AAC 320 kbps; ein schnittfreundliches Zwischenformat
List Color Grading Presets Farbgrading-Vorgaben auflisten
Apply Color Grading Preset Farbgrading-Vorgabe anwenden
Color Grading Preset Thumbnails Vorschaubilder der Farbgrading-Vorgaben
Toggle Color Grading Section Farbgrading-Abschnitt umschalten
Color Grading Section Farbgrading-Abschnitt
Read Video Scopes Videoskope auslesen
Can't render this file because it contains an unexpected character in line 6 and column 45.
+13 -8
View File
@@ -11,7 +11,7 @@
# Clean-room: every entry was written from the plain meaning of the English text using ordinary
# Spanish video-editing vocabulary (pista, cabezal, secuencia, bandeja, procesar…). No proprietary
# localisation resource, string table or product UI was consulted or copied; add entries the same
# way. Product and technology names (FilmCraft, ArtCraft, Lumetri, ProRes, LUFS…) keep their
# way. Product and technology names (FilmCraft, ArtCraft, ProRes, LUFS…) keep their
# spelling. "video" is written without an accent, as in the rest of this catalog.
About FilmCraft Acerca de FilmCraft
@@ -202,8 +202,8 @@
Refresh Changed Media Actualizar medios cambiados
Linked Selection Selección vinculada
Lock Guides Bloquear guías
Lumetri Color Color Lumetri
Lumetri Scopes Ámbitos Lumetri
Color Grading Gradación de color
Video Scopes Medidores de vídeo
Magnification Ampliación
Make Offline… Desconectar…
Make Subclip… Crear subclip…
@@ -905,7 +905,7 @@
Clip Volume Volumen del clip
(no clip selected) (ningún clip seleccionado)
Master · {name} Maestro · {name}
Add Lumetri Color to clip Añadir Color Lumetri al clip
Add Color Grading to clip Añadir gradación de color al clip
Input LUT LUT de entrada
Color Color
Temperature Temperatura
@@ -1684,7 +1684,7 @@
Elliptical Elíptico
Emboss Relieve
Enable HSL Secondary Activar HSL secundaria
Enable Mercury Transmit Activar Mercury Transmit
Enable External Video Output Activar salida de vídeo externa
Enable ProRes hardware accelerated encoding, if available Activar la codificación ProRes acelerada por hardware, si está disponible
Enable clip and XMP metadata linking Activar la vinculación de metadatos de clip y XMP
Enable developer mode Activar el modo de desarrollador
@@ -1752,7 +1752,7 @@
Focus Size Tamaño del foco
Fold Motion Movimiento de plegado
Foldback Retorno
For color management parameters, go to the Settings tab in the Lumetri Color panel. Para los parámetros de gestión del color, ve a la pestaña Ajustes del panel Color Lumetri.
For color management parameters, go to the Settings tab in the Color Grading panel. Para los parámetros de gestión del color, vaya a la pestaña Ajustes del panel Gradación de color.
Format Formato
Four Scopes (RGB, 8 bit) Cuatro ámbitos (RGB, 8 bits)
Four Scopes (YUV, float, no clamp) Cuatro ámbitos (YUV, coma flotante, sin limitar)
@@ -2023,7 +2023,7 @@
Luma Key Incrustación de luminancia
Luma Source Origen de luminancia
Luma and Chroma Luminancia y croma
Lumetri Presets Ajustes preestablecidos de Lumetri
Color Grading Presets Ajustes preestablecidos de gradación de color
Luminance Luminancia
Luminance Threshold Umbral de luminancia
Luminosity Luminosidad
@@ -3148,7 +3148,6 @@
Left align text Alinear texto a la izquierda
Looping GIF, 640×360 at 15 fps GIF en bucle, 640×360 a 15 fps
Lower First Inferior primero
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR (Avid)
MXF OP1a MXF OP1a
@@ -3749,3 +3748,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master H.264 High 10 (10 bits 4:2:0) con el tamaño de la secuencia, calidad constante CRF 16, AAC 320 kbps; un máster de 10 bits
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10 bits 4:2:0, cada fotograma es clave), CRF 12, AAC 320 kbps; un intermedio fácil de editar
List Color Grading Presets Listar ajustes preestablecidos de gradación de color
Apply Color Grading Preset Aplicar ajuste preestablecido de gradación de color
Color Grading Preset Thumbnails Miniaturas de ajustes preestablecidos de gradación de color
Toggle Color Grading Section Alternar sección de gradación de color
Color Grading Section Sección de gradación de color
Read Video Scopes Leer medidores de vídeo
Can't render this file because it contains an unexpected character in line 3 and column 95.
+13 -8
View File
@@ -4,7 +4,7 @@
# French video-editing vocabulary. No proprietary localisation resource, string table or product UI
# was consulted or copied; add entries the same way. Commands use the infinitive ("Enregistrer
# sous…"), messages address the user as "vous", and labels use French sentence case. Product,
# format and technology names (FilmCraft, ArtCraft, Lumetri, ProRes, LUFS, EDL, AAF…) keep their
# format and technology names (FilmCraft, ArtCraft, ProRes, LUFS, EDL, AAF…) keep their
# spelling. French spacing: a space before ":", ";", "?" and "!". This catalog has the same entries
# as `es.tsv` plus the native macOS Settings menu; strings added later show in English until they
# are translated. A native-speaker review is welcome.
@@ -201,8 +201,8 @@
Refresh Changed Media Actualiser les médias modifiés
Linked Selection Sélection liée
Lock Guides Verrouiller les repères
Lumetri Color Couleur Lumetri
Lumetri Scopes Oscilloscopes Lumetri
Color Grading Étalonnage
Video Scopes Oscilloscopes vidéo
Magnification Agrandissement
Make Offline… Rendre hors ligne…
Make Subclip… Créer un sous-clip…
@@ -897,7 +897,7 @@
Clip Volume Volume du clip
(no clip selected) (aucun clip sélectionné)
Master · {name} Maître · {name}
Add Lumetri Color to clip Ajouter l'effet Couleur Lumetri au clip
Add Color Grading to clip Ajouter un étalonnage au clip
Input LUT LUT d'entrée
Color Couleur
Temperature Température
@@ -1676,7 +1676,7 @@
Elliptical Elliptique
Emboss Estampage
Enable HSL Secondary Activer HSL secondaire
Enable Mercury Transmit Activer Mercury Transmit
Enable External Video Output Activer la sortie vidéo externe
Enable ProRes hardware accelerated encoding, if available Activer l'encodage ProRes accéléré par le matériel, si disponible
Enable clip and XMP metadata linking Activer la liaison des métadonnées de clip et XMP
Enable developer mode Activer le mode développeur
@@ -1744,7 +1744,7 @@
Focus Size Taille de la mise au point
Fold Motion Mouvement de pliage
Foldback Retour
For color management parameters, go to the Settings tab in the Lumetri Color panel. Pour les paramètres de gestion des couleurs, accédez à l'onglet Paramètres du panneau Couleur Lumetri.
For color management parameters, go to the Settings tab in the Color Grading panel. Pour les paramètres de gestion des couleurs, ouvrez l’onglet Réglages du panneau Étalonnage.
Format Format
Four Scopes (RGB, 8 bit) Quatre oscilloscopes (RGB, 8 bits)
Four Scopes (YUV, float, no clamp) Quatre oscilloscopes (YUV, virgule flottante, sans écrêtage)
@@ -2013,7 +2013,7 @@
Luma Key Incrustation en luma
Luma Source Source de luma
Luma and Chroma Luma et chroma
Lumetri Presets Préréglages Lumetri
Color Grading Presets Préréglages d’étalonnage
Luminance Luminance
Luminance Threshold Seuil de luminance
Luminosity Luminosité
@@ -3131,7 +3131,6 @@
Left align text Aligner le texte à gauche
Looping GIF, 640×360 at 15 fps GIF en boucle, 640×360 à 15 fps
Lower First Trame inférieure en premier
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR (Avid)
MXF OP1a MXF OP1a
@@ -3739,3 +3738,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master H.264 High 10 (10 bits 4:2:0) à la taille de la séquence, qualité constante CRF 16, AAC 320 kbps ; un master 10 bits
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10 bits 4:2:0, chaque image est une image clé), CRF 12, AAC 320 kbps ; un intermédiaire facile à monter
List Color Grading Presets Lister les préréglages d’étalonnage
Apply Color Grading Preset Appliquer un préréglage d’étalonnage
Color Grading Preset Thumbnails Vignettes des préréglages d’étalonnage
Toggle Color Grading Section Activer ou désactiver une section d’étalonnage
Color Grading Section Section d’étalonnage
Read Video Scopes Lire les oscilloscopes vidéo
Can't render this file because it contains an unexpected character in line 5 and column 83.
+13 -8
View File
@@ -5,7 +5,7 @@
# string table or product UI was consulted or copied; add entries the same way. Commands use the
# base verb ("Simpan Sebagai…", "Tambah Penanda"), messages address the user as "Anda", and menu
# labels keep the title case of the English source. Product, format and technology names
# (FilmCraft, ArtCraft, Lumetri, ProRes, LUFS, EDL, AAF…) keep their spelling, and common loanwords
# (FilmCraft, ArtCraft, ProRes, LUFS, EDL, AAF…) keep their spelling, and common loanwords
# of the trade (render, preset, mixer, gain, ripple, roll, slip, slide, snap, scrub, offline) stay
# as they are. Decimal fractions in descriptions use a comma (29,97 fps). This catalog has the same
# entries as `es.tsv` plus the native macOS Settings menu; strings added later show in English until
@@ -206,8 +206,8 @@
Refresh Changed Media Segarkan Media yang Berubah
Linked Selection Pilihan Tertaut
Lock Guides Kunci Garis Bantu
Lumetri Color Lumetri Color
Lumetri Scopes Lumetri Scopes
Color Grading Gradasi Warna
Video Scopes Skop Video
Magnification Pembesaran
Make Offline… Jadikan Offline…
Make Subclip… Buat Subklip…
@@ -902,7 +902,7 @@
Clip Volume Volume Klip
(no clip selected) (tidak ada klip yang dipilih)
Master · {name} Master · {name}
Add Lumetri Color to clip Tambahkan Lumetri Color ke klip
Add Color Grading to clip Tambahkan Gradasi Warna ke klip
Input LUT LUT Input
Color Warna
Temperature Suhu
@@ -1681,7 +1681,7 @@
Elliptical Eliptis
Emboss Emboss
Enable HSL Secondary Aktifkan HSL Sekunder
Enable Mercury Transmit Aktifkan Mercury Transmit
Enable External Video Output Aktifkan Output Video Eksternal
Enable ProRes hardware accelerated encoding, if available Aktifkan enkode ProRes dengan akselerasi perangkat keras, jika tersedia
Enable clip and XMP metadata linking Aktifkan penautan metadata klip dan XMP
Enable developer mode Aktifkan mode pengembang
@@ -1749,7 +1749,7 @@
Focus Size Ukuran Fokus
Fold Motion Gerak Lipat
Foldback Foldback
For color management parameters, go to the Settings tab in the Lumetri Color panel. Untuk parameter manajemen warna, buka tab Pengaturan di panel Lumetri Color.
For color management parameters, go to the Settings tab in the Color Grading panel. Untuk parameter manajemen warna, buka tab Pengaturan di panel Gradasi Warna.
Format Format
Four Scopes (RGB, 8 bit) Empat Skop (RGB, 8 bit)
Four Scopes (YUV, float, no clamp) Empat Skop (YUV, float, tanpa pembatasan)
@@ -2018,7 +2018,7 @@
Luma Key Key Luma
Luma Source Sumber Luma
Luma and Chroma Luma dan Kroma
Lumetri Presets Preset Lumetri
Color Grading Presets Preset Gradasi Warna
Luminance Luminans
Luminance Threshold Ambang Luminans
Luminosity Luminositas
@@ -3133,7 +3133,6 @@
Left align text Rata kiri teks
Looping GIF, 640×360 at 15 fps GIF berulang, 640×360 pada 15 fps
Lower First Bawah Dulu
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR (Avid)
MXF OP1a MXF OP1a
@@ -3680,3 +3679,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master H.264 High 10 (10-bit 4:2:0) pada ukuran sekuens, kualitas konstan CRF 16, AAC 320 kbps; master 10-bit
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10-bit 4:2:0, setiap bingkai adalah bingkai kunci), CRF 12, AAC 320 kbps; intermediate yang mudah disunting
List Color Grading Presets Daftar Preset Gradasi Warna
Apply Color Grading Preset Terapkan Preset Gradasi Warna
Color Grading Preset Thumbnails Gambar Mini Preset Gradasi Warna
Toggle Color Grading Section Aktifkan/Nonaktifkan Bagian Gradasi Warna
Color Grading Section Bagian Gradasi Warna
Read Video Scopes Baca Skop Video
Can't render this file because it contains an unexpected character in line 6 and column 14.
+13 -8
View File
@@ -10,7 +10,7 @@
# Italian video-editing vocabulary (traccia, indicatore di riproduzione, sequenza, raccoglitore,
# attacco/stacco, fotogramma chiave, rendering…). No proprietary localisation resource, string
# table or product UI was consulted or copied, and no other FilmCraft catalog was translated from;
# add entries the same way. Product, technology and format names (FilmCraft, ArtCraft, Lumetri,
# add entries the same way. Product, technology and format names (FilmCraft, ArtCraft,
# ProRes, LUFS, H.264…) keep their spelling, as do key-cap names (Shift, Alt, Ctrl, Cmd, Opt, Esc).
# Commands are imperatives addressed with "tu"; decimals use a comma (29,97 fps).
@@ -199,8 +199,8 @@
Refresh Changed Media Aggiorna media modificati
Linked Selection Selezione collegata
Lock Guides Blocca guide
Lumetri Color Colore Lumetri
Lumetri Scopes Ambiti Lumetri
Color Grading Gradazione colore
Video Scopes Oscilloscopi video
Magnification Ingrandimento
Make Offline… Rendi offline…
Make Subclip… Crea sottoclip…
@@ -894,7 +894,7 @@
Clip Volume Volume clip
(no clip selected) (nessuna clip selezionata)
Master · {name} Master · {name}
Add Lumetri Color to clip Aggiungi Colore Lumetri alla clip
Add Color Grading to clip Aggiungi gradazione colore alla clip
Input LUT LUT di ingresso
Color Colore
Temperature Temperatura
@@ -1673,7 +1673,7 @@
Elliptical Ellittico
Emboss Rilievo
Enable HSL Secondary Abilita HSL secondario
Enable Mercury Transmit Abilita trasmissione Mercury
Enable External Video Output Abilita uscita video esterna
Enable ProRes hardware accelerated encoding, if available Abilita la codifica ProRes con accelerazione hardware, se disponibile
Enable clip and XMP metadata linking Abilita il collegamento dei metadati clip e XMP
Enable developer mode Abilita la modalità sviluppatore
@@ -1741,7 +1741,7 @@
Focus Size Dimensione messa a fuoco
Fold Motion Movimento di piegatura
Foldback Ripiegamento
For color management parameters, go to the Settings tab in the Lumetri Color panel. Per i parametri di gestione del colore, vai alla scheda Impostazioni del pannello Colore Lumetri.
For color management parameters, go to the Settings tab in the Color Grading panel. Per i parametri di gestione del colore, apri la scheda Impostazioni nel pannello Gradazione colore.
Format Formato
Four Scopes (RGB, 8 bit) Quattro ambiti (RGB, 8 bit)
Four Scopes (YUV, float, no clamp) Quattro ambiti (YUV, virgola mobile, senza limitazione)
@@ -2010,7 +2010,7 @@
Luma Key Chiave luma
Luma Source Sorgente luma
Luma and Chroma Luma e croma
Lumetri Presets Predefiniti Lumetri
Color Grading Presets Predefiniti di gradazione colore
Luminance Luminanza
Luminance Threshold Soglia luminanza
Luminosity Luminosità
@@ -3127,7 +3127,6 @@
Left align text Allinea il testo a sinistra
Looping GIF, 640×360 at 15 fps GIF in loop, 640×360 a 15 fps
Lower First Prima il campo inferiore
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR (Avid)
MXF OP1a MXF OP1a
@@ -3706,3 +3705,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master H.264 High 10 (10 bit 4:2:0) alla dimensione della sequenza, qualità costante CRF 16, AAC 320 kbps; un master a 10 bit
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10 bit 4:2:0, ogni fotogramma è un fotogramma chiave), CRF 12, AAC 320 kbps; un intermedio facile da montare
List Color Grading Presets Elenca predefiniti di gradazione colore
Apply Color Grading Preset Applica predefinito di gradazione colore
Color Grading Preset Thumbnails Miniature dei predefiniti di gradazione colore
Toggle Color Grading Section Attiva/disattiva sezione di gradazione colore
Color Grading Section Sezione di gradazione colore
Read Video Scopes Leggi oscilloscopi video
Can't render this file because it contains an unexpected character in line 3 and column 95.
+14 -9
View File
@@ -4,14 +4,14 @@
# Clean-room: every entry was written from the plain meaning of the English text using ordinary
# Japanese computing and video-editing vocabulary (クリップ, シーケンス, トラック, 再生ヘッド, ぼかし ...). No
# proprietary localisation resource, string table or product UI was consulted or copied; add entries
# the same way. Product and technology names (FilmCraft, ArtCraft, Lumetri, ProRes, LUFS ...) keep
# the same way. Product and technology names (FilmCraft, ArtCraft, ProRes, LUFS ...) keep
# their spelling.
#
# House style, so new entries read like the rest:
# - Menu commands and buttons are short noun phrases or "〜を + verb" with no する/します ending
# (別名で保存…, 編集点を追加). Tooltips and messages are です・ます sentences ending in 。
# - One half-width space between Japanese text and an adjacent Latin word, number or {placeholder}
# (Lumetri カラー, {n} 個). Half-width ":" and "( )", full-width "?". Always "…", never "...".
# ({n} 個). Half-width ":" and "( )", full-width "?". Always "…", never "...".
# - The long vowel mark is kept (フォルダー, モニター). Terms: 既定 (not デフォルト), リセット, エフェクト
# (not 効果), ぼかし, 音量, ビデオ, 再生ヘッド, イン点/アウト点.
# - "Horizontal"/"Vertical" are 水平/垂直 (guides, blur, axes); vertical text is "Vertical Text".
@@ -208,8 +208,8 @@
Link Media… メディアをリンク…
Linked Selection リンクされた選択
Lock Guides ガイドをロック
Lumetri Color Lumetri カラー
Lumetri Scopes Lumetri スコープ
Color Grading カラーグレーディング
Video Scopes ビデオスコープ
Magnification 倍率
Make Offline… オフラインに設定…
Make Subclip… サブクリップを作成…
@@ -906,7 +906,7 @@
Clip Volume クリップの音量
(no clip selected) (クリップが選択されていません)
Master · {name} マスター · {name}
Add Lumetri Color to clip クリップに Lumetri カラーを追加
Add Color Grading to clip クリップにカラーグレーディングを追加
Input LUT 入力 LUT
Color カラー
Temperature 色温度
@@ -1683,7 +1683,7 @@
Elliptical 楕円
Emboss エンボス
Enable HSL Secondary HSL セカンダリを有効にする
Enable Mercury Transmit Mercury Transmit を有効にする
Enable External Video Output 外部映像出力を有効にする
Enable ProRes hardware accelerated encoding, if available 可能な場合は、ハードウェアアクセラレーションによる ProRes エンコードを有効にする
Enable clip and XMP metadata linking クリップと XMP メタデータのリンクを有効にする
Enable developer mode 開発者モードを有効にする
@@ -1751,7 +1751,7 @@
Focus Size フォーカスのサイズ
Fold Motion フォールドモーション
Foldback フォールドバック
For color management parameters, go to the Settings tab in the Lumetri Color panel. カラーマネジメントのパラメーターは、Lumetri カラーパネルの「設定」タブにあります。
For color management parameters, go to the Settings tab in the Color Grading panel. カラーマネジメントのパラメーターは、カラーグレーディングパネルの設定タブで変更できます。
Format 形式
Four Scopes (RGB, 8 bit) 4 つのスコープ (RGB、8 bit)
Four Scopes (YUV, float, no clamp) 4 つのスコープ (YUV、浮動小数点、クランプなし)
@@ -2015,7 +2015,7 @@
Luma Key 輝度キー
Luma Source 輝度のソース
Luma and Chroma 輝度とクロマ
Lumetri Presets Lumetri プリセット
Color Grading Presets カラーグレーディングプリセット
Luminance 輝度
Luminance Threshold 輝度のしきい値
Luminosity 輝度
@@ -3138,7 +3138,6 @@
Left align text テキストを左揃え
Looping GIF, 640×360 at 15 fps ループする GIF、640×360、15 fps
Lower First 下位フィールド優先
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR (Avid)
MXF OP1a MXF OP1a
@@ -3757,3 +3756,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master シーケンスと同じサイズの H.264 High 10 (10-bit 4:2:0)、固定品質 CRF 16、AAC 320 kbps。10 ビットのマスター
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10-bit 4:2:0、すべてのフレームがキーフレーム)、CRF 12、AAC 320 kbps。編集しやすい中間ファイル
List Color Grading Presets カラーグレーディングプリセットを一覧表示
Apply Color Grading Preset カラーグレーディングプリセットを適用
Color Grading Preset Thumbnails カラーグレーディングプリセットのサムネイル
Toggle Color Grading Section カラーグレーディングのセクションを切り替え
Color Grading Section カラーグレーディングのセクション
Read Video Scopes ビデオスコープを読み取る
Can't render this file because it contains an unexpected character in line 11 and column 59.
+13 -8
View File
@@ -4,7 +4,7 @@
# Clean-room: every entry was written from the plain meaning of the English text using ordinary
# Korean video-editing vocabulary (시퀀스, 타임라인, 트랙, 클립, 재생 헤드, 빈, 렌더, 내보내기…). No
# proprietary localisation resource, string table or product UI was consulted or copied; add entries
# the same way. Product and technology names (FilmCraft, ArtCraft, Lumetri, ProRes, LUFS…) keep their
# the same way. Product and technology names (FilmCraft, ArtCraft, ProRes, LUFS…) keep their
# spelling. Hangul is drawn with an installed system font (Malgun Gothic, Apple SD Gothic Neo, Noto
# Sans CJK KR…, see cjk.rs); native-speaker review welcome.
@@ -102,7 +102,7 @@
Add Guide 안내선 추가
Add Guide… 안내선 추가…
Add keyframe 키프레임 추가
Add Lumetri Color to clip 클립에 Lumetri Color 추가
Add Color Grading to clip 클립에 색 보정 추가
Add Marker 마커 추가
Add Marker (M) 마커 추가(M)
Add media to your project. Drop files or folders anywhere in the window, or choose a source below. 프로젝트에 미디어를 추가합니다. 창 아무 곳에나 파일이나 폴더를 놓거나 아래에서 소스를 선택하세요.
@@ -1033,7 +1033,7 @@
Enable hardware accelerated decoding (requires restart) 하드웨어 가속 디코딩 사용(재시작 필요)
Enable HSL Secondary HSL 보조 사용
Enable language auto-detection 언어 자동 감지 사용
Enable Mercury Transmit Mercury Transmit 사용
Enable External Video Output 외부 비디오 출력 사용
Enable ProRes hardware accelerated encoding, if available 가능한 경우 ProRes 하드웨어 가속 인코딩 사용
Enable proxies 프록시 사용
Enable Remix 리믹스 사용
@@ -1222,7 +1222,7 @@
Font Size 글꼴 크기
Font Style 글꼴 스타일
Fonts used in the project: 프로젝트에 사용된 글꼴:
For color management parameters, go to the Settings tab in the Lumetri Color panel. 색상 관리 매개변수는 Lumetri 색상 패널의 설정 탭에서 지정합니다.
For color management parameters, go to the Settings tab in the Color Grading panel. 색 관리 매개변수는 색 보정 패널의 설정 탭에서 변경할 수 있습니다.
Forest 포레스트
Format 형식
Format and size 형식 및 크기
@@ -1754,10 +1754,9 @@
Luma Min / Max 루마 최소/최대
Luma Source 루마 소스
Luma vs Sat 휘도 대 채도
Lumetri Lumetri
Lumetri Color Lumetri 색상
Lumetri Presets Lumetri 사전 설정
Lumetri Scopes Lumetri 스코프
Color Grading 색 보정
Color Grading Presets 색 보정 사전 설정
Video Scopes 비디오 스코프
Luminance 휘도
Luminance Threshold 휘도 임계값
Luminosity 광도
@@ -3701,3 +3700,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master H.264 High 10 (10비트 4:2:0), 시퀀스 크기, 고정 품질 CRF 16, AAC 320 kbps, 10비트 마스터
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10비트 4:2:0, 모든 프레임이 키프레임), CRF 12, AAC 320 kbps, 편집하기 쉬운 중간 파일
List Color Grading Presets 색 보정 사전 설정 목록
Apply Color Grading Preset 색 보정 사전 설정 적용
Color Grading Preset Thumbnails 색 보정 사전 설정 썸네일
Toggle Color Grading Section 색 보정 섹션 전환
Color Grading Section 색 보정 섹션
Read Video Scopes 비디오 스코프 읽기
Can't render this file because it contains an unexpected character in line 2822 and column 7.
+13 -8
View File
@@ -4,7 +4,7 @@
# Polish video-editing vocabulary. No proprietary localisation resource, string table or product UI
# was consulted or copied; add entries the same way. Drafted with AI assistance; not yet reviewed by
# a native speaker. Commands use the imperative ("Otwórz projekt…"), menus and panels are nouns.
# Product, format and feature names (FilmCraft, ArtCraft, Lumetri, ProRes, EDL, AAF…) keep their
# Product, format and feature names (FilmCraft, ArtCraft, ProRes, EDL, AAF…) keep their
# spelling. Counts are written count-neutral ("Klipy: {n}") so every Polish number reads right.
#
# Terms: track = ścieżka, bin = kosz, marker = znacznik, playhead = głowica, In/Out = punkt
@@ -193,8 +193,8 @@
Refresh Changed Media Odśwież zmienione multimedia
Linked Selection Połączone zaznaczanie
Lock Guides Zablokuj linie pomocnicze
Lumetri Color Kolor Lumetri
Lumetri Scopes Wykresy Lumetri
Color Grading Korekcja kolorów
Video Scopes Wskaźniki wideo
Magnification Powiększenie
Make Offline… Ustaw jako offline…
Make Subclip… Utwórz podklip…
@@ -887,7 +887,7 @@
Clip Volume Głośność klipu
(no clip selected) (nie zaznaczono klipu)
Master · {name} Główny · {name}
Add Lumetri Color to clip Dodaj Kolor Lumetri do klipu
Add Color Grading to clip Dodaj korekcję kolorów do klipu
Input LUT Wejściowy LUT
Color Kolor
Temperature Temperatura
@@ -1665,7 +1665,7 @@
Elliptical Eliptyczne
Emboss Wytłoczenie
Enable HSL Secondary Włącz drugorzędne HSL
Enable Mercury Transmit Włącz Mercury Transmit
Enable External Video Output Włącz zewnętrzne wyjście wideo
Enable ProRes hardware accelerated encoding, if available Włącz sprzętowe kodowanie ProRes, jeśli jest dostępne
Enable clip and XMP metadata linking Włącz łączenie metadanych klipu i XMP
Enable developer mode Włącz tryb deweloperski
@@ -1733,7 +1733,7 @@
Focus Size Rozmiar ostrości
Fold Motion Ruch składania
Foldback Odsłuch
For color management parameters, go to the Settings tab in the Lumetri Color panel. Parametry zarządzania kolorem znajdziesz na karcie Ustawienia w panelu Kolor Lumetri.
For color management parameters, go to the Settings tab in the Color Grading panel. Parametry zarządzania kolorami znajdują się na karcie Ustawienia w panelu Korekcja kolorów.
Format Format
Four Scopes (RGB, 8 bit) Cztery wykresy (RGB, 8 bit)
Four Scopes (YUV, float, no clamp) Cztery wykresy (YUV, float, bez ograniczania)
@@ -2002,7 +2002,7 @@
Luma Key Klucz lumy
Luma Source Źródło lumy
Luma and Chroma Luma i chrominancja
Lumetri Presets Ustawienia Lumetri
Color Grading Presets Ustawienia korekcji kolorów
Luminance Luminancja
Luminance Threshold Próg luminancji
Luminosity Jasność
@@ -3123,7 +3123,6 @@
Left align text Wyrównaj tekst do lewej
Looping GIF, 640×360 at 15 fps Zapętlony GIF, 640×360 przy 15 kl./s
Lower First Najpierw dolne
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR (Avid)
MXF OP1a MXF OP1a
@@ -3632,3 +3631,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master H.264 High 10 (10-bit 4:2:0) w rozmiarze sekwencji, stała jakość CRF 16, AAC 320 kb/s; master 10-bitowy
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10-bit 4:2:0, każda klatka kluczowa), CRF 12, AAC 320 kb/s; plik pośredni wygodny w montażu
List Color Grading Presets Wyświetl ustawienia korekcji kolorów
Apply Color Grading Preset Zastosuj ustawienie korekcji kolorów
Color Grading Preset Thumbnails Miniatury ustawień korekcji kolorów
Toggle Color Grading Section Przełącz sekcję korekcji kolorów
Color Grading Section Sekcja korekcji kolorów
Read Video Scopes Odczytaj wskaźniki wideo
Can't render this file because it contains an unexpected character in line 6 and column 50.
+13 -8
View File
@@ -4,7 +4,7 @@
# Brazilian Portuguese video-editing vocabulary. No proprietary localisation resource, string table
# or product UI was consulted or copied; add entries the same way. Commands use the infinitive
# ("Salvar como…"), instructions use the polite imperative ("Selecione um clipe…"), and labels use
# sentence case. Product, format and technology names (FilmCraft, ArtCraft, Lumetri, ProRes, LUFS,
# sentence case. Product, format and technology names (FilmCraft, ArtCraft, ProRes, LUFS,
# EDL, AAF…) keep their spelling; decimals in prose use a comma ("29,97 fps"). This catalog has the
# same entries as `es.tsv` plus the native macOS Settings menu; strings added later show in English
# until they are translated. A native-speaker review is welcome.
@@ -203,8 +203,8 @@
Refresh Changed Media Atualizar mídia alterada
Linked Selection Seleção vinculada
Lock Guides Bloquear guias
Lumetri Color Cor Lumetri
Lumetri Scopes Escopos Lumetri
Color Grading Gradação de cor
Video Scopes Escopos de vídeo
Magnification Ampliação
Make Offline… Tornar offline…
Make Subclip… Criar subclipe…
@@ -899,7 +899,7 @@
Clip Volume Volume do clipe
(no clip selected) (nenhum clipe selecionado)
Master · {name} Mestre · {name}
Add Lumetri Color to clip Adicionar Cor Lumetri ao clipe
Add Color Grading to clip Adicionar gradação de cor ao clipe
Input LUT LUT de entrada
Color Cor
Temperature Temperatura
@@ -1678,7 +1678,7 @@
Elliptical Elíptico
Emboss Relevo
Enable HSL Secondary Ativar HSL secundário
Enable Mercury Transmit Ativar Mercury Transmit
Enable External Video Output Ativar saída de vídeo externa
Enable ProRes hardware accelerated encoding, if available Ativar a codificação ProRes acelerada por hardware, se disponível
Enable clip and XMP metadata linking Ativar a vinculação de metadados de clipe e XMP
Enable developer mode Ativar o modo de desenvolvedor
@@ -1746,7 +1746,7 @@
Focus Size Tamanho do foco
Fold Motion Movimento de dobra
Foldback Retorno
For color management parameters, go to the Settings tab in the Lumetri Color panel. Para os parâmetros de gerenciamento de cores, vá até a guia Configurações do painel Cor Lumetri.
For color management parameters, go to the Settings tab in the Color Grading panel. Para os parâmetros de gerenciamento de cores, acesse a aba Configurações no painel Gradação de cor.
Format Formato
Four Scopes (RGB, 8 bit) Quatro escopos (RGB, 8 bits)
Four Scopes (YUV, float, no clamp) Quatro escopos (YUV, ponto flutuante, sem limitar)
@@ -2015,7 +2015,7 @@
Luma Key Chave de luma
Luma Source Origem de luma
Luma and Chroma Luma e croma
Lumetri Presets Predefinições Lumetri
Color Grading Presets Predefinições de gradação de cor
Luminance Luminância
Luminance Threshold Limiar de luminância
Luminosity Luminosidade
@@ -3130,7 +3130,6 @@
Left align text Alinhar texto à esquerda
Looping GIF, 640×360 at 15 fps GIF em loop, 640×360 a 15 fps
Lower First Inferior primeiro
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR (Avid)
MXF OP1a MXF OP1a
@@ -3683,3 +3682,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master H.264 High 10 (10 bits 4:2:0) com o tamanho da sequência, qualidade constante CRF 16, AAC 320 kbps; um master de 10 bits
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10 bits 4:2:0, todo quadro é um quadro-chave), CRF 12, AAC 320 kbps; um intermediário fácil de editar
List Color Grading Presets Listar predefinições de gradação de cor
Apply Color Grading Preset Aplicar predefinição de gradação de cor
Color Grading Preset Thumbnails Miniaturas de predefinições de gradação de cor
Toggle Color Grading Section Alternar seção de gradação de cor
Color Grading Section Seção de gradação de cor
Read Video Scopes Ler escopos de vídeo
Can't render this file because it contains an unexpected character in line 6 and column 4.
+12 -7
View File
@@ -184,8 +184,8 @@
Refresh Changed Media Обновить изменённые медиа
Linked Selection Связанное выделение
Lock Guides Заблокировать направляющие
Lumetri Color Цвет Lumetri
Lumetri Scopes Осциллограммы Lumetri
Color Grading Грейдинг
Video Scopes Видеоскопы
Magnification Увеличение
Make Offline… Сделать офлайн…
Make Subclip… Создать субклип…
@@ -880,7 +880,7 @@
Clip Volume Громкость клипа
(no clip selected) (клип не выбран)
Master · {name} Мастер · {name}
Add Lumetri Color to clip Добавить «Цвет Lumetri» к клипу
Add Color Grading to clip Добавить грейдинг к клипу
Input LUT Входной LUT
Color Цвет
Temperature Температура
@@ -1659,7 +1659,7 @@
Elliptical Эллиптический
Emboss Рельеф
Enable HSL Secondary Включить вторичную коррекцию HSL
Enable Mercury Transmit Включить Mercury Transmit
Enable External Video Output Включить внешний видеовыход
Enable ProRes hardware accelerated encoding, if available Включить аппаратное ускорение кодирования ProRes, если доступно
Enable clip and XMP metadata linking Включить связывание метаданных клипов и XMP
Enable developer mode Включить режим разработчика
@@ -1727,7 +1727,7 @@
Focus Size Размер фокуса
Fold Motion Складывание
Foldback Фолдбэк
For color management parameters, go to the Settings tab in the Lumetri Color panel. Параметры управления цветом находятся на вкладке «Настройки» панели «Цвет Lumetri».
For color management parameters, go to the Settings tab in the Color Grading panel. Параметры управления цветом находятся на вкладке «Настройки» панели «Грейдинг».
Format Формат
Four Scopes (RGB, 8 bit) Четыре осциллограммы (RGB, 8 бит)
Four Scopes (YUV, float, no clamp) Четыре осциллограммы (YUV, с плавающей запятой, без отсечения)
@@ -1998,7 +1998,7 @@
Luma Key Кеинг по яркости
Luma Source Источник яркости
Luma and Chroma Яркость и цветность
Lumetri Presets Пресеты Lumetri
Color Grading Presets Пресеты грейдинга
Luminance Яркость
Luminance Threshold Порог яркости
Luminosity Светлота
@@ -3120,7 +3120,6 @@
Left align text Выровнять текст по левому краю
Looping GIF, 640×360 at 15 fps GIF-цикл, 640×360, 15 кадр/с
Lower First Нижний первым
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom (контейнер Avid)
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR от Avid
MXF OP1a MXF OP1a (один файл)
@@ -3734,3 +3733,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master H.264 High 10 (10 бит 4:2:0) в размере последовательности, постоянное качество CRF 16, AAC 320 кбит/с; 10-битный мастер
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10 бит 4:2:0, каждый кадр ключевой), CRF 12, AAC 320 кбит/с; промежуточный файл, удобный для монтажа
List Color Grading Presets Список пресетов грейдинга
Apply Color Grading Preset Применить пресет грейдинга
Color Grading Preset Thumbnails Миниатюры пресетов грейдинга
Toggle Color Grading Section Переключить раздел грейдинга
Color Grading Section Раздел грейдинга
Read Video Scopes Считать данные видеоскопов
Can't render this file because it contains an unexpected character in line 2373 and column 7.
+13 -8
View File
@@ -10,7 +10,7 @@
# Swedish video-editing vocabulary (spår, spelmarkör, sekvens, bin, snitt, nyckelbildruta,
# undertext, rendera…). No proprietary localisation resource, string table or product UI was
# consulted or copied, and no other FilmCraft catalog was translated from; add entries the same
# way. Product, technology and format names (FilmCraft, ArtCraft, Lumetri, ProRes, LUFS, H.264…)
# way. Product, technology and format names (FilmCraft, ArtCraft, ProRes, LUFS, H.264…)
# keep their spelling, as do key-cap names (Shift, Alt, Ctrl, Cmd, Opt, Esc).
# Labels use sentence case; commands are imperatives; Delete = Radera, Remove = Ta bort,
# Clear = Rensa; decimals use a comma and frame rates are written bild/s (29,97 bild/s).
@@ -196,8 +196,8 @@
Refresh Changed Media Uppdatera ändrad media
Linked Selection Länkad markering
Lock Guides Lås stödlinjer
Lumetri Color Lumetri-färg
Lumetri Scopes Lumetri-scope
Color Grading Färggradering
Video Scopes Videoskop
Magnification Förstoring
Make Offline… Gör offline…
Make Subclip… Skapa delklipp…
@@ -890,7 +890,7 @@
Clip Volume Klippvolym
(no clip selected) (inget klipp markerat)
Master · {name} Huvud · {name}
Add Lumetri Color to clip Lägg till Lumetri-färg på klippet
Add Color Grading to clip Lägg till färggradering i klippet
Input LUT Ingångs-LUT
Color Färg
Temperature Temperatur
@@ -1668,7 +1668,7 @@
Elliptical Elliptisk
Emboss Relief
Enable HSL Secondary Aktivera HSL-sekundär
Enable Mercury Transmit Aktivera Mercury Transmit
Enable External Video Output Aktivera extern videoutgång
Enable ProRes hardware accelerated encoding, if available Aktivera hårdvaruaccelererad ProRes-kodning om tillgänglig
Enable clip and XMP metadata linking Aktivera länkning av klipp- och XMP-metadata
Enable developer mode Aktivera utvecklarläge
@@ -1736,7 +1736,7 @@
Focus Size Fokusstorlek
Fold Motion Vikrörelse
Foldback Återvikning
For color management parameters, go to the Settings tab in the Lumetri Color panel. Färghanteringsparametrarna finns på fliken Inställningar i panelen Lumetri-färg.
For color management parameters, go to the Settings tab in the Color Grading panel. Öppna fliken Inställningar i panelen Färggradering för färghanteringsparametrar.
Format Format
Four Scopes (RGB, 8 bit) Fyra scope (RGB, 8 bitar)
Four Scopes (YUV, float, no clamp) Fyra scope (YUV, flyttal, ingen begränsning)
@@ -2007,7 +2007,7 @@
Luma Key Lumanyckel
Luma Source Lumakälla
Luma and Chroma Luma och kroma
Lumetri Presets Lumetri-förinställningar
Color Grading Presets Förinställningar för färggradering
Luminance Luminans
Luminance Threshold Luminanströskel
Luminosity Luminositet
@@ -3129,7 +3129,6 @@
Left align text Vänsterjustera text
Looping GIF, 640×360 at 15 fps Loopande GIF, 640×360 i 15 bild/s
Lower First Undre fält först
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR (Avid)
MXF OP1a MXF OP1a
@@ -3745,3 +3744,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master H.264 High 10 (10 bitar 4:2:0) i sekvensens storlek, konstant kvalitet CRF 16, AAC 320 kbit/s; en 10-bitars master
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10 bitar 4:2:0, varje bildruta en nyckelbildruta), CRF 12, AAC 320 kbit/s; ett redigeringsvänligt mellanformat
List Color Grading Presets Lista förinställningar för färggradering
Apply Color Grading Preset Tillämpa förinställning för färggradering
Color Grading Preset Thumbnails Miniatyrer för färggraderingsförinställningar
Toggle Color Grading Section Växla färggraderingsavsnitt
Color Grading Section Färggraderingsavsnitt
Read Video Scopes Läs av videoskop
Can't render this file because it contains an unexpected character in line 3 and column 95.
+76 -2
View File
@@ -41,6 +41,29 @@ fn catalogs_are_well_formed() {
}
}
/// A renamed feature label has to read differently from every other label in the same catalog:
/// before this, "Color Grading" and "Color Correction" both read "Farbkorrektur" in German and
/// "Цветокоррекция" in Russian, and two different features showed the same words.
#[test]
fn feature_labels_do_not_repeat_another_label() {
for l in Language::ALL {
let Some(text) = catalog_text(l) else { continue };
let code = l.code();
let (entries, errors) = catalog::parse_entries(text);
assert!(errors.is_empty(), "{code}: {errors:?}");
for feature in ["Color Grading", "Video Scopes"] {
let shown = l.tr(feature);
assert_ne!(shown, feature, "{code}: {feature} is translated");
for (_, source, translated) in &entries {
if source == feature {
continue;
}
assert_ne!(translated, &shown, "{code}: {feature} → {shown:?} repeats {source:?}");
}
}
}
}
#[test]
fn unknown_strings_pass_through_and_languages_round_trip() {
for l in Language::ALL {
@@ -305,7 +328,7 @@ fn dynamic_names() -> Vec<String> {
}
filmcraft_engine::settings::DURATION_UNITS.iter().for_each(|(_, l)| push(&mut out, l));
for top in filmcraft_project::vtransition::EFFECT_TOP_FOLDERS {
push(&mut out, top);
push(&mut out, filmcraft_project::vtransition::effect_folder_label(top));
}
for d in filmcraft_project::effect_defs() {
push(&mut out, d.name);
@@ -323,7 +346,7 @@ fn dynamic_names() -> Vec<String> {
crate::panels::project::NEW_ITEMS.iter().for_each(|(l, _)| push(&mut out, l));
// section headers keyed by their English name (collapsed state), translated when drawn
let sections = [
// Lumetri Color
// Color Grading
"Basic Correction",
"Creative",
"Curves",
@@ -885,3 +908,54 @@ fn system_language_picks_bosnian() {
}
assert_eq!(l(&["hr-HR", "bs-BA"]), Language::Bs, "Croatian has no catalog here, so the next preference wins");
}
// Check presentation values, never compatibility ids, saved keys or user-supplied text.
// Ultra Key, Warp Stabilizer and Morph Cut are not retired: they stay the shipped labels until
// RFC-0029 decides the trademark names.
fn retired_feature_label(text: &str) -> Option<&'static str> {
let lower = text.to_lowercase();
["lumetri", "mercury transmit"].into_iter().find(|retired| {
lower.match_indices(retired).any(|(start, _)| !retired.is_ascii() || lower[..start].chars().next_back().is_none_or(|c| !c.is_alphanumeric()))
})
}
#[test]
fn retired_feature_labels_stay_out_of_visible_and_translated_names() {
let source_labels = interface_strings();
for label in &source_labels {
assert_eq!(retired_feature_label(label), None, "English display label: {label}");
}
for language in Language::ALL {
for label in &source_labels {
let shown = language.tr(label);
assert_eq!(retired_feature_label(shown), None, "{}: {label} → {shown}", language.code());
}
if let Some(text) = catalog_text(language) {
for (_, source, translated) in catalog::parse_entries(text).0 {
assert_eq!(retired_feature_label(&translated), None, "{}: {source} → {translated}", language.code());
}
}
// Naming guards must not replace the documented English fallback or alter user text.
assert_eq!(language.tr("A future descriptive feature"), "A future descriptive feature");
}
}
#[test]
fn display_guard_catches_retired_marks_without_banning_descriptive_terms() {
for label in ["LUMETRI Color", "Enable Mercury Transmit", "Mercury Transmit"] {
assert!(retired_feature_label(label).is_some(), "{label}");
}
for label in [
"Color Grading",
"Video Scopes",
"Ultra Key",
"Warp Stabilizer",
"Morph Cut",
"ウルトラキー",
"Enable External Video Output",
"Volumetric Rays",
"Volumetrijske zrake",
] {
assert_eq!(retired_feature_label(label), None, "{label}");
}
}
+13 -8
View File
@@ -10,7 +10,7 @@
# Turkish video-editing vocabulary (iz, oynatma kafası, sekans, klasör, düzenleme/kesim,
# anahtar kare, dışa aktarma, işleme…). No proprietary localisation resource, string table or
# product UI was consulted or copied; add entries the same way. Product and technology names
# (FilmCraft, ArtCraft, Lumetri, ProRes, LUFS, H.264…) keep their spelling.
# (FilmCraft, ArtCraft, ProRes, LUFS, H.264…) keep their spelling.
About FilmCraft FilmCraft Hakkında
Add Audio Submix Track Ses Alt Miksaj İzi Ekle
@@ -193,8 +193,8 @@
Refresh Changed Media Değiştirilen Medyayı Yenile
Linked Selection Bağlı Seçim
Lock Guides Kılavuzları Kilitle
Lumetri Color Lumetri Rengi
Lumetri Scopes Lumetri Kapsamları
Color Grading Renk Derecelendirme
Video Scopes Video Ölçümleri
Magnification Büyütme
Make Offline… Çevrimdışı Yap…
Make Subclip… Alt Klip Oluştur…
@@ -887,7 +887,7 @@
Clip Volume Klip Ses Düzeyi
(no clip selected) (klip seçilmedi)
Master · {name} Master · {name}
Add Lumetri Color to clip Klibe Lumetri Rengi ekle
Add Color Grading to clip Klibe Renk Derecelendirme Ekle
Input LUT Giriş LUT'u
Color Renk
Temperature Sıcaklık
@@ -1665,7 +1665,7 @@
Elliptical Eliptik
Emboss Kabartma
Enable HSL Secondary İkincil HSL'yi Etkinleştir
Enable Mercury Transmit Mercury Transmit'i Etkinleştir
Enable External Video Output Harici Video Çıkışını Etkinleştir
Enable ProRes hardware accelerated encoding, if available Varsa ProRes donanım hızlandırmalı kodlamayı etkinleştir
Enable clip and XMP metadata linking Klip ve XMP üstveri bağlantısını etkinleştir
Enable developer mode Geliştirici modunu etkinleştir
@@ -1733,7 +1733,7 @@
Focus Size Odak Boyutu
Fold Motion Katlama Hareketi
Foldback Katlama
For color management parameters, go to the Settings tab in the Lumetri Color panel. Renk yönetimi parametreleri için Lumetri Rengi panelindeki Ayarlar sekmesine gidin.
For color management parameters, go to the Settings tab in the Color Grading panel. Renk yönetimi parametreleri için Renk Derecelendirme panelindeki Ayarlar sekmesini açın.
Format Biçim
Four Scopes (RGB, 8 bit) Dört Kapsam (RGB, 8 bit)
Four Scopes (YUV, float, no clamp) Dört Kapsam (YUV, kayan nokta, sınırlamasız)
@@ -2004,7 +2004,7 @@
Luma Key Luma Key
Luma Source Luma Kaynağı
Luma and Chroma Luma ve Kroma
Lumetri Presets Lumetri Hazır Ayarları
Color Grading Presets Renk Derecelendirme Hazır Ayarları
Luminance Luminans
Luminance Threshold Luminans Eşiği
Luminosity Parlaklık
@@ -3126,7 +3126,6 @@
Left align text Metni sola hizala
Looping GIF, 640×360 at 15 fps Döngüsel GIF, 15 fps'de 640×360
Lower First Önce Alt Alan
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR (Avid)
MXF OP1a MXF OP1a
@@ -3637,3 +3636,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master Sekans boyutunda H.264 High 10 (10 bit 4:2:0), sabit kalite CRF 16, AAC 320 kbps; 10 bit bir master
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra (10 bit 4:2:0, her kare bir anahtar kare), CRF 12, AAC 320 kbps; kurgu dostu bir ara dosya
List Color Grading Presets Renk Derecelendirme Hazır Ayarlarını Listele
Apply Color Grading Preset Renk Derecelendirme Hazır Ayarını Uygula
Color Grading Preset Thumbnails Renk Derecelendirme Hazır Ayarı Küçük Resimleri
Toggle Color Grading Section Renk Derecelendirme Bölümünü Aç/Kapat
Color Grading Section Renk Derecelendirme Bölümü
Read Video Scopes Video Ölçümlerini Oku
Can't render this file because it contains an unexpected character in line 3 and column 95.
+15 -2
View File
@@ -187,8 +187,8 @@
Link Media… Прив’язати медіа…
Linked Selection Пов’язане виділення
Lock Guides Заблокувати напрямні
Lumetri Color Колір Lumetri
Lumetri Scopes Відеоскопи Lumetri
Color Grading Кольорокорекція
Video Scopes Відеоскопи
Magnification Масштаб
Make Offline… Зробити автономним…
Make Subclip… Створити підкліп…
@@ -441,3 +441,16 @@
Next Наступний
Options Параметри
Enter a valid HH:MM:SS:FF timecode Введіть коректний таймкод ГГ:ХХ:СС:КК (HH:MM:SS:FF)
Ultra Key Хромакей
Warp Stabilizer Стабілізатор деформації
Morph Cut Морф-перехід
Enable External Video Output Увімкнути зовнішній відеовихід
Color Grading Presets Пресети кольорокорекції
Add Color Grading to clip Додати кольорокорекцію до кліпу
For color management parameters, go to the Settings tab in the Color Grading panel. Параметри керування кольором розташовано на вкладці «Налаштування» панелі «Кольорокорекція».
List Color Grading Presets Список пресетів кольорокорекції
Apply Color Grading Preset Застосувати пресет кольорокорекції
Color Grading Preset Thumbnails Мініатюри пресетів кольорокорекції
Toggle Color Grading Section Перемкнути розділ кольорокорекції
Color Grading Section Розділ кольорокорекції
Read Video Scopes Зчитати дані відеоскопів
1 # Ukrainian (uk) catalog. Columns separated by TAB: context <TAB> source <TAB> translation
187
188
189
190
191
192
193
194
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
+13 -8
View File
@@ -8,7 +8,7 @@
#
# 净室实现:每条译文均由英文含义直接译出,使用通用的中文视频剪辑术语(剪辑、时间轴、序列、
# 轨道、关键帧……)。未参考或复制任何专有本地化资源、字符串表或产品界面。产品与技术名称
# (FilmCraft、ArtCraft、Lumetri、ProRes、LUFS……)保留原文拼写。
# (FilmCraft、ArtCraft、ProRes、LUFS……)保留原文拼写。
About FilmCraft 关于 FilmCraft
Add Audio Submix Track 添加音频子混音轨道
Add Caption at Playhead 在播放头处添加字幕
@@ -197,8 +197,8 @@
Refresh Changed Media 刷新已更改的媒体
Linked Selection 关联选择
Lock Guides 锁定参考线
Lumetri Color Lumetri 颜色
Lumetri Scopes Lumetri 示波器
Color Grading 色彩分级
Video Scopes 视频示波器
Magnification 放大
Make Offline… 设为脱机…
Make Subclip… 创建子剪辑…
@@ -895,7 +895,7 @@
Clip Volume 剪辑音量
(no clip selected) (未选择剪辑)
Master · {name} 主 · {name}
Add Lumetri Color to clip 向剪辑添加 Lumetri 颜色
Add Color Grading to clip 为剪辑添加色彩分级
Input LUT 输入 LUT
Color 颜色
Temperature 色温
@@ -1672,7 +1672,7 @@
Elliptical 椭圆
Emboss 浮雕
Enable HSL Secondary 启用 HSL 辅助
Enable Mercury Transmit 启用 Mercury 传输
Enable External Video Output 启用外部视频输出
Enable ProRes hardware accelerated encoding, if available 如可用,启用 ProRes 硬件加速编码
Enable clip and XMP metadata linking 启用剪辑与 XMP 元数据链接
Enable developer mode 启用开发者模式
@@ -1740,7 +1740,7 @@
Focus Size 焦点大小
Fold Motion 折叠运动
Foldback 折叠
For color management parameters, go to the Settings tab in the Lumetri Color panel. 有关色彩管理参数,请前往 Lumetri 颜色面板中的“设置”选项卡。
For color management parameters, go to the Settings tab in the Color Grading panel. 有关色彩管理参数,请转到色彩分级面板中的设置选项卡。
Format 格式
Four Scopes (RGB, 8 bit) 四视图示波器(RGB,8 位)
Four Scopes (YUV, float, no clamp) 四视图示波器(YUV,浮点,无钳制)
@@ -2004,7 +2004,7 @@
Luma Key 亮度键
Luma Source 亮度源
Luma and Chroma 亮度与色度
Lumetri Presets Lumetri 预设
Color Grading Presets 色彩分级预设
Luminance 亮度
Luminance Threshold 亮度阈值
Luminosity 光度
@@ -3127,7 +3127,6 @@
Left align text 文本左对齐
Looping GIF, 640×360 at 15 fps 循环 GIF,640×360,15 fps
Lower First 下方优先
Lumetri Lumetri
MXF OP-Atom MXF OP-Atom
MXF OP-Atom DNxHR (Avid) MXF OP-Atom DNxHR(Avid)
MXF OP1a MXF OP1a
@@ -3767,3 +3766,9 @@
H.264 High 10 Intra H.264 High 10 Intra
H.264 High 10 (10-bit 4:2:0) at the sequence's size, constant quality CRF 16, AAC 320 kbps; a 10-bit master H.264 High 10(10 位 4:2:0,采用序列的尺寸),恒定质量 CRF 16,AAC 320 kbps;10 位母版
H.264 High 10 Intra (10-bit 4:2:0, every frame a keyframe), CRF 12, AAC 320 kbps; an edit-friendly intermediate H.264 High 10 Intra(10 位 4:2:0,每一帧都是关键帧),CRF 12,AAC 320 kbps;便于剪辑的中间文件
List Color Grading Presets 列出色彩分级预设
Apply Color Grading Preset 应用色彩分级预设
Color Grading Preset Thumbnails 色彩分级预设缩略图
Toggle Color Grading Section 切换色彩分级分区
Color Grading Section 色彩分级分区
Read Video Scopes 读取视频示波器
Can't render this file because it contains an unexpected character in line 3 and column 95.
+2 -2
View File
@@ -223,9 +223,9 @@ pub fn dragged_template(ui: &egui::Ui) -> Option<String> {
pub fn start_drag_effect(ui: &egui::Ui, id: &str) {
ui.ctx().data_mut(|d| d.insert_temp(payload_id(), Some(DragPayloadBox(DragPayload::Effect(id.to_string())))));
}
/// Prefix of a dragged effect payload that names a Lumetri preset rather than an effect id.
/// Prefix of a dragged effect payload that names a Color Grading preset rather than an effect id.
pub const LUMETRI_PRESET_PREFIX: &str = "lumetri:";
/// A Lumetri preset (Effects ▸ Lumetri Presets) dragged onto a clip: an effect payload
/// A Color Grading preset (Effects ▸ Color Grading Presets) dragged onto a clip: an effect payload
/// `lumetri:<name>` the Timeline applies with `lumetri.applyPreset`.
pub fn start_drag_lumetri_preset(ui: &egui::Ui, name: &str) {
start_drag_effect(ui, &format!("{LUMETRI_PRESET_PREFIX}{name}"));
+5 -5
View File
@@ -1,6 +1,6 @@
//! Effect Controls: the selected clip's effects (fixed Motion/Opacity/Time Remapping first, as in
//! Premiere, then standard effects), generated from parameter schemas, with stopwatches and a
//! keyframe lane on the right. Also hosts the Lumetri Color panel body (same editor, grouped).
//! keyframe lane on the right. Also hosts the Color Grading panel body (same editor, grouped).
use egui::{Align2, Color32, Pos2, Rect, Sense, Stroke, pos2, vec2};
use filmcraft_project::{ClipId, EffectInstance, ParamKind, ParamValue, TrackItem, TrackKind};
@@ -926,7 +926,7 @@ fn param_value_widget(
vui.data_mut(|d| d.remove::<String>(id));
}
}
// Lumetri's Input LUT / Look LUT: the Lumetri Color panel's menu (it showed only the name, #1123)
// Color Grading's Input LUT / Look LUT: the Color Grading panel's menu (it showed only the name, #1123)
(ParamKind::Text, ParamValue::Text(cur)) => {
let input = pd.id == "input_lut";
let auto_id = format!("effectControls.{}.{}", e.effect, pkey);
@@ -1010,7 +1010,7 @@ fn keyframe_menu(
}
}
/// Lumetri Color panel: edits (or adds) the Lumetri effect on the selected clip, grouped by section.
/// Color Grading panel: edits (or adds) the Color Grading effect on the selected clip, grouped by section.
pub fn lumetri_panel(app: &mut FilmcraftApp, ui: &mut egui::Ui, rect: Rect) {
let t = app.tokens;
let Some((clip, it, _)) = selected_clip(app) else {
@@ -1021,7 +1021,7 @@ pub fn lumetri_panel(app: &mut FilmcraftApp, ui: &mut egui::Ui, rect: Rect) {
let mut bui = ui.new_child(egui::UiBuilder::new().max_rect(rect.shrink(6.0)).id_salt("lumetri"));
bui.label(egui::RichText::new(tlf!("Master · {name}", name = it.name)).color(t.text_dim));
let Some(idx) = idx else {
if bui.button(tl!("Add Lumetri Color to clip")).clicked() {
if bui.button(tl!("Add Color Grading to clip")).clicked() {
let _ = app.session.execute("effects.apply", json!({"clips": [clip.0], "effect": "lumetri"}));
}
return;
@@ -1315,7 +1315,7 @@ pub(crate) fn row_fill(r: Rect) -> Rect {
Rect::from_min_max(pos2(r.min.x + 1.0, r.min.y), r.max)
}
/// Run the panel's actions (also the Lumetri Color panel's). Parameter changes made
/// Run the panel's actions (also the Color Grading panel's). Parameter changes made
/// while the mouse button is down (a drag) share one undo step, which the first change of each
/// press begins (#201); typed values and clicks stay separate steps. A drag value only changes once
/// the mouse moves, after the press frame, so the press that already began a step is remembered by
+75 -15
View File
@@ -1,11 +1,11 @@
//! Effects panel: searchable folder tree of presets, audio/video effects and transitions (from the
//! effect definitions). Drag onto a clip or edit point; double-click applies to the selection.
//!
//! Lumetri Presets: each preset row has a thumbnail (our Lumetri on the procedural preview
//! Color Grading Presets: each preset row has a thumbnail (our Color Grading on the procedural preview
//! picture, `filmcraft_render::lumetri_presets`); double-click (or right-click ▸ Apply to Selected
//! Clips, `effects.presetMenu.apply`) applies it (`lumetri.applyPreset`), and dragging it onto a
//! Timeline clip applies it to that clip (rows and grid cells alike).
//! When the panel is wide (maximized), clicking a Lumetri Presets folder shows its presets as a
//! When the panel is wide (maximized), clicking a Color Grading Presets folder shows its presets as a
//! thumbnail grid to the right of the tree. Automation ids: `effects.lumetriPreset.<name>`,
//! `effects.presetGrid` (the grid area), `effects.presetGrid.<name>`.
@@ -24,7 +24,7 @@ pub fn show(app: &mut FilmcraftApp, ui: &mut egui::Ui, rect: Rect) {
crate::widgets::search_field(&mut child, &mut q, tl!("Search effects"), sr.width(), &t);
app.ui.effects_search = q.clone();
let body = Rect::from_min_max(pos2(rect.min.x, sr.max.y + 6.0), rect.max);
// wide panel: the tree on the left, the Lumetri Presets thumbnail grid on the right
// wide panel: the tree on the left, the Color Grading Presets thumbnail grid on the right
let grid_area = (body.width() > 640.0).then(|| Rect::from_min_max(pos2(body.min.x + 300.0, body.min.y), body.max));
let body = match grid_area {
Some(g) => Rect::from_min_max(body.min, pos2(g.min.x - 4.0, body.max.y)),
@@ -67,13 +67,13 @@ pub fn show(app: &mut FilmcraftApp, ui: &mut egui::Ui, rect: Rect) {
}
continue;
}
if top == "Lumetri Presets" {
if top == filmcraft_project::vtransition::COLOR_PRESETS_FOLDER_KEY {
if let Some(name) = lumetri_rows(app, ui, filter) {
lumetri_apply = Some(name);
}
continue;
}
let mut items: Vec<_> = defs.iter().filter(|d| d.category.first() == Some(&top)).filter(|d| crate::i18n::matches_query(d.name, filter)).collect();
let mut items: Vec<_> = defs.iter().filter(|d| d.category.first() == Some(&top)).filter(|d| matches_effect(d, filter)).collect();
// Premiere lists effect folders and effects alphabetically (obsolete ones last)
if top == "Video Effects" || top == "Legacy" {
items.sort_by_key(|d| (d.category.get(1) == Some(&"Obsolete"), d.category.get(1).copied().unwrap_or(""), d.name.to_ascii_lowercase()));
@@ -219,9 +219,23 @@ fn presets_folder_row(app: &mut FilmcraftApp, ui: &mut egui::Ui, key: &str, dept
open
}
/// Whether the Effects panel's search shows `d` for `filter`: its label in the interface language,
/// or a name the effect used to have (`"Lumetri"` still finds Color Grading).
fn matches_effect(d: &filmcraft_project::EffectDef, filter: &str) -> bool {
crate::i18n::matches_query(d.name, filter) || filmcraft_project::search_aliases(d).iter().any(|alias| crate::i18n::matches_query(alias, filter))
}
fn folder_key_matches(saved: &str, key: &str) -> bool {
if saved == key {
return true;
}
let Some(tail) = key.strip_prefix(filmcraft_project::vtransition::COLOR_PRESETS_FOLDER_KEY) else { return false };
(tail.is_empty() || tail.starts_with('/')) && ["Color Grade Presets", "Color Grading Presets"].iter().any(|alias| saved.strip_prefix(alias) == Some(tail))
}
fn folder_row(app: &mut FilmcraftApp, ui: &mut egui::Ui, key: &str, depth: usize, filter: &str) -> bool {
let t = app.tokens;
let open = !filter.is_empty() || app.ui.expanded_fx.iter().any(|k| k == key);
let open = !filter.is_empty() || app.ui.expanded_fx.iter().any(|saved| folder_key_matches(saved, key));
let (r, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 20.0), Sense::click());
if resp.hovered() {
ui.painter().rect_filled(r, 0.0, t.hover);
@@ -236,12 +250,17 @@ fn folder_row(app: &mut FilmcraftApp, ui: &mut egui::Ui, key: &str, depth: usize
icons::paint(ui.painter(), Rect::from_center_size(pos2(x + 18.0, r.center().y), vec2(13.0, 13.0)), Icon::Folder, t.text_dim);
// a sub-folder key is `<top>/<folder>`; folder names may themselves contain a slash
// (Audio Effects ▸ Noise Reduction/Restoration), so split once, after the top folder
let name = if depth == 0 { key } else { key.split_once('/').map_or(key, |(_, folder)| folder) };
let name = if depth == 0 { filmcraft_project::vtransition::effect_folder_label(key) } else { key.split_once('/').map_or(key, |(_, folder)| folder) };
ui.painter().text(pos2(x + 30.0, r.center().y), Align2::LEFT_CENTER, crate::i18n::t(name), Tokens::ui(12.0), t.text);
app.auto.add(&format!("effects.folder.{key}"), r, name);
if let Some(tail) = key.strip_prefix(filmcraft_project::vtransition::COLOR_PRESETS_FOLDER_KEY) {
for alias in ["Color Grade Presets", "Color Grading Presets"] {
app.auto.add(&format!("effects.folder.{alias}{tail}"), r, name);
}
}
if resp.clicked() {
if open {
app.ui.expanded_fx.retain(|k| k != key);
app.ui.expanded_fx.retain(|saved| !folder_key_matches(saved, key));
} else {
app.ui.expanded_fx.push(key.to_string());
}
@@ -264,7 +283,7 @@ fn transition_menu(app: &mut FilmcraftApp, resp: &egui::Response) -> bool {
chosen
}
/// Right-click menu of a Lumetri preset: Apply to Selected Clips (automation id
/// Right-click menu of a Color Grading preset: Apply to Selected Clips (automation id
/// `effects.presetMenu.apply`). True when chosen.
fn apply_menu(app: &mut FilmcraftApp, resp: &egui::Response) -> bool {
let mut chosen = false;
@@ -298,12 +317,12 @@ fn preset_texture(app: &mut FilmcraftApp, ctx: &egui::Context, p: &filmcraft_ren
app.texture_for(ctx, &name, key, &rgba)
}
/// The Lumetri Presets folder of the tree: sub-folders and preset rows with thumbnails. Returns
/// The Color Grading Presets folder of the tree: sub-folders and preset rows with thumbnails. Returns
/// the preset to apply (double-click).
fn lumetri_rows(app: &mut FilmcraftApp, ui: &mut egui::Ui, filter: &str) -> Option<String> {
use filmcraft_render::lumetri_presets as lp;
let t = app.tokens;
let top = "Lumetri Presets";
let top = filmcraft_project::vtransition::COLOR_PRESETS_FOLDER_KEY;
let presets: Vec<lp::LumetriPreset> = lp::presets().into_iter().filter(|p| crate::i18n::matches_query(p.name, filter)).collect();
if !filter.is_empty() && presets.is_empty() {
return None;
@@ -318,11 +337,11 @@ fn lumetri_rows(app: &mut FilmcraftApp, ui: &mut egui::Ui, filter: &str) -> Opti
continue;
}
let key = format!("{top}/{folder}");
let was_open = !filter.is_empty() || app.ui.expanded_fx.contains(&key);
let was_open = !filter.is_empty() || app.ui.expanded_fx.iter().any(|saved| folder_key_matches(saved, &key));
let open = folder_row(app, ui, &key, 1, filter);
// the folder clicked last is the one the wide panel shows as a grid (`folder_row` toggles
// the expanded state on a click and returns the state it drew)
let now = !filter.is_empty() || app.ui.expanded_fx.contains(&key);
let now = !filter.is_empty() || app.ui.expanded_fx.iter().any(|saved| folder_key_matches(saved, &key));
if now != was_open {
app.ui.lumetri_grid_folder = Some(folder.to_string());
}
@@ -335,7 +354,7 @@ fn lumetri_rows(app: &mut FilmcraftApp, ui: &mut egui::Ui, filter: &str) -> Opti
ui.painter().rect_filled(r, 0.0, t.hover);
}
let tex = preset_texture(app, ui.ctx(), p, 64);
// inside a Lumetri Presets sub-folder: one level deeper than it
// inside a Color Grading Presets sub-folder: one level deeper than it
let tr = Rect::from_min_size(pos2(r.min.x + tree_x(2) + 12.0, r.min.y + 3.0), vec2(32.0, 18.0));
ui.painter().image(tex, tr, Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)), Color32::WHITE);
ui.painter().text(pos2(tr.max.x + 8.0, r.center().y), Align2::LEFT_CENTER, crate::i18n::t(p.name), Tokens::ui(12.0), t.text);
@@ -355,7 +374,7 @@ fn lumetri_rows(app: &mut FilmcraftApp, ui: &mut egui::Ui, filter: &str) -> Opti
apply
}
/// The wide Effects panel's thumbnail grid of the selected Lumetri Presets folder. Returns the
/// The wide Effects panel's thumbnail grid of the selected Color Grading Presets folder. Returns the
/// preset to apply (double-click).
fn preset_grid(app: &mut FilmcraftApp, ui: &mut egui::Ui, area: Rect) -> Option<String> {
use filmcraft_render::lumetri_presets as lp;
@@ -416,4 +435,45 @@ mod tests {
}
crate::i18n::set_current(crate::i18n::Language::En);
}
/// #1868: the search still finds Color Grading by the names it used to have, so someone who
/// types "Lumetri" is not left with an empty panel.
#[test]
fn effects_search_finds_grading_by_its_old_names() {
let ctx = egui::Context::default();
let mut app = FilmcraftApp::new(filmcraft_engine::Session::default());
let rect = Rect::from_min_size(pos2(0.0, 0.0), vec2(400.0, 600.0));
let shows = |app: &mut FilmcraftApp, query: &str| {
app.ui.effects_search = query.to_string();
app.auto.begin_frame();
let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
show(app, ui, rect);
});
out.textures_delta.clear();
app.auto.find("effects.item.lumetri").is_some()
};
for query in ["Lumetri", "lumetri color", "LUMETRI", "Color Grade", "Color Grading"] {
assert!(shows(&mut app, query), "query `{query}` must find Color Grading");
}
for query in ["Gaussian", "Ultra", "Scopes"] {
assert!(!shows(&mut app, query), "query `{query}` must not show Color Grading");
}
}
}
#[cfg(test)]
mod naming_tests {
use super::folder_key_matches;
#[test]
fn color_preset_labels_do_not_change_saved_folder_identity() {
let key = filmcraft_project::vtransition::COLOR_PRESETS_FOLDER_KEY;
assert_eq!(key, "Lumetri Presets");
assert_eq!(filmcraft_project::vtransition::effect_folder_label(key), "Color Grading Presets");
for saved in ["Lumetri Presets", "Color Grade Presets", "Color Grading Presets"] {
assert!(folder_key_matches(saved, key));
assert!(folder_key_matches(&format!("{saved}/Cinematic"), &format!("{key}/Cinematic")));
assert!(!folder_key_matches(&format!("{saved}/Other"), &format!("{key}/Cinematic")));
}
}
}
+6 -6
View File
@@ -1,5 +1,5 @@
//! Lumetri Color panel: Basic Correction, Creative, Curves (RGB + hue curves), Color Wheels,
//! HSL Secondary, Vignette — editing the selected clip's Lumetri effect through engine commands.
//! Color Grading panel: Basic Correction, Creative, Curves (RGB + hue curves), Color Wheels,
//! HSL Secondary, Vignette — editing the selected clip's Color Grading effect through engine commands.
//!
//! In an HDR sequence (Rec. 2100 PQ / HLG working space) Basic Correction shows HDR White and
//! HDR Specular and Curves shows HDR Range (cd/m²): the sliders and curves then span 0 … that
@@ -40,7 +40,7 @@ pub fn show(app: &mut FilmcraftApp, ui: &mut egui::Ui, rect: Rect) {
bui.add_space(8.0);
bui.label(egui::RichText::new(tlf!("Master · {name}", name = it.name)).color(t.text_dim));
bui.add_space(8.0);
if bui.button(tl!("Add Lumetri Color to clip")).clicked() {
if bui.button(tl!("Add Color Grading to clip")).clicked() {
let _ = app.session.execute("effects.apply", json!({"clips": [clip.0], "effect": "lumetri"}));
}
return;
@@ -292,10 +292,10 @@ fn open_section(
open
}
/// The Lumetri Color panel's ≡ menu items: Export .cube… saves the grade of the clip the panel
/// The Color Grading panel's ≡ menu items: Export .cube… saves the grade of the clip the panel
/// shows (also an Apply Match result) as a 3D LUT (`lumetri.exportCube`; automation id
/// `panel.menu.LumetriColor.exportCube`). It is enabled only when that clip has an enabled
/// Lumetri Color, and exports that clip even when another selected clip has one.
/// Color Grading, and exports that clip even when another selected clip has one.
/// True when the menu should close.
pub fn panel_menu(app: &mut FilmcraftApp, ui: &mut egui::Ui) -> bool {
let shown = selected(app).filter(|(_, it)| it.effects.iter().any(|e| e.enabled && e.effect == "lumetri")).map(|(c, _)| c);
@@ -342,7 +342,7 @@ pub(crate) enum LutPick {
}
/// The LUT combo box for the LUT reference `cur`: None, the built-in input LUTs (`input`) or looks,
/// the project's LUT library, Browse…. Shared by the Lumetri Color panel and Effect Controls (#1123).
/// the project's LUT library, Browse…. Shared by the Color Grading panel and Effect Controls (#1123).
/// The entries get automation ids `<auto_id>.lut.<reference>` (`.lut.none`) and `<auto_id>.browse`.
pub(crate) fn lut_menu(
ui: &mut egui::Ui,
+3 -3
View File
@@ -232,7 +232,7 @@ pub fn route(app: &mut FilmcraftApp, ctx: &egui::Context, id: &str, params: &Val
app.session.execute(&id, p).map_err(|e| e.to_string())
}));
}
// Lumetri Color panel menu ▸ Export .cube…: ask where to save the grade, then export it
// Color Grading panel menu ▸ Export .cube…: ask where to save the grade, then export it
"lumetri.exportCube" if params.get("path").is_none() => {
if let Err(e) = enabled(app, id) {
return Some(Err(e));
@@ -246,9 +246,9 @@ pub fn route(app: &mut FilmcraftApp, ctx: &egui::Context, id: &str, params: &Val
Some(c) => has_lumetri(&filmcraft_project::ClipId(c)),
None => app.session.state.selection.iter().find_map(has_lumetri),
};
let Some((clip, stem)) = found.map(|(c, n)| (c, Some(n))) else { return Some(Err("select a clip with Lumetri Color".into())) };
let Some((clip, stem)) = found.map(|(c, n)| (c, Some(n))) else { return Some(Err("select a clip with Color Grading".into())) };
let stem: String =
stem.unwrap_or_else(|| "Lumetri".into()).chars().map(|c| if matches!(c, '/' | '\\') || c.is_control() { '-' } else { c }).collect();
stem.unwrap_or_else(|| "Color Grading".into()).chars().map(|c| if matches!(c, '/' | '\\') || c.is_control() { '-' } else { c }).collect();
let mut p = params.as_object().cloned().unwrap_or_default();
p.entry("clip").or_insert(json!(clip));
let id = id.to_string();
+2 -2
View File
@@ -536,7 +536,7 @@ fn controls_row(
}
if which == Which::Program {
ui.separator();
ui.checkbox(&mut app.ui.show_scopes, tl!("Lumetri Scopes"));
ui.checkbox(&mut app.ui.show_scopes, tl!("Video Scopes"));
ui.checkbox(&mut app.playback.looping, tl!("Loop"));
ui.separator();
let mut follows = app.session.state.multicam_audio_follows_video;
@@ -680,7 +680,7 @@ const EYEDROPPER_SCALE: f32 = 0.5;
/// Eyedropper: while a colour parameter's eyedropper is armed (Effect Controls), the Program picture
/// takes a crosshair and a click fills that parameter with the colour under the pointer. The colour is
/// read from a render of the sequence at the playhead with the armed effect switched off (an Ultra Key
/// read from a render of the sequence at the playhead with the armed effect switched off (a Ultra Key
/// has already removed the green it is asked to key); Esc disarms.
fn eyedropper(app: &mut FilmcraftApp, ui: &mut egui::Ui, resp: &egui::Response, pic: Rect, target: Target, rate: filmcraft_time::FrameRate, time: Tick) {
let Some(armed) = app.ui.eyedropper.clone() else { return };
+3 -3
View File
@@ -1,4 +1,4 @@
//! Frontend state of the Lumetri Scopes, Timecode, Events, Progress and Reference Monitor panels
//! Frontend state of the Video Scopes, Timecode, Events, Progress and Reference Monitor panels
//! (`UiState::panels`). Plain serde, so agents read it with `ui.inspect` (`ui.panels`) and change
//! it with `ui.set {"panels": {"scopes": {...}, "timecode": {...}, ...}}` (fields merged).
@@ -28,7 +28,7 @@ pub enum InspectorSource {
Timeline,
}
/// Lumetri Scopes settings (the wrench / right-click menu and the footer).
/// Video Scopes settings (the wrench / right-click menu and the footer).
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
#[serde(default, rename_all = "camelCase")]
pub struct ScopesState {
@@ -190,7 +190,7 @@ impl Default for TimecodeState {
pub enum RefDisplay {
#[default]
Composite,
/// Lumetri Scopes of the reference frame (the panel's scope selection).
/// Video Scopes of the reference frame (the panel's scope selection).
Scopes,
}
+2 -2
View File
@@ -1,6 +1,6 @@
//! Reference Monitor: a second view of the active sequence for comparing shots while grading. It
//! is either ganged to the Program monitor (follows the playhead) or parked on its own frame,
//! and shows the picture (Composite Video) or Lumetri Scopes of that frame.
//! and shows the picture (Composite Video) or Video Scopes of that frame.
//!
//! Automation ids: `reference.picture` (once a picture is shown), `reference.timecode`, `reference.stepBack`,
//! `reference.stepForward`, `reference.matchPlayhead`, `reference.gang`, `reference.display`,
@@ -128,7 +128,7 @@ pub fn show(app: &mut FilmcraftApp, ui: &mut egui::Ui, rect: Rect) {
let dr = Rect::from_min_size(pos2(bar.max.x - 150.0, bar.center().y - 11.0), vec2(142.0, 22.0));
let mut display = st.display;
let mut child = ui.new_child(egui::UiBuilder::new().max_rect(dr));
let label = |d: RefDisplay| if d == RefDisplay::Composite { tl!("Composite Video") } else { tl!("Lumetri Scopes") };
let label = |d: RefDisplay| if d == RefDisplay::Composite { tl!("Composite Video") } else { tl!("Video Scopes") };
let cb = craft_ui::ComboBox::from_id_salt("reference-display").selected_text(label(display)).width(134.0).show_ui(&mut child, |ui| {
for d in [RefDisplay::Composite, RefDisplay::Scopes] {
let r = ui.selectable_value(&mut display, d, label(d));
+2 -2
View File
@@ -1,4 +1,4 @@
//! Lumetri Scopes: Vectorscope YUV / HLS, Histogram, Parade (RGB / YUV / RGB-White) and Waveform
//! Video Scopes: Vectorscope YUV / HLS, Histogram, Parade (RGB / YUV / RGB-White) and Waveform
//! (RGB / Luma / YC / YC no Chroma) of the Program frame, in a grid when several are shown.
//!
//! The maths is in `filmcraft-scopes` (count grids from the decimated frame); this module turns
@@ -83,7 +83,7 @@ pub fn frame_signal(app: &mut FilmcraftApp, ctx: &egui::Context, slot: &str, fra
}
}
/// The Lumetri Scopes panel.
/// The Video Scopes panel.
pub fn show(app: &mut FilmcraftApp, ui: &mut egui::Ui, rect: Rect) {
let t = app.tokens;
let st = app.ui.panels.scopes.clone();
+34 -3
View File
@@ -485,10 +485,17 @@ fn number(app: &mut FilmcraftApp, ui: &mut Ui, key: &str, value: f64, range: (f6
(r.changed() && x != value).then_some(x)
}
/// Whether `f`'s control can be used: a switch that only applies while another preference is on is
/// greyed out when that one is off, and a preference with nothing behind it yet is always greyed out
/// ([`Field::unavailable`]).
fn field_enabled(f: &Field, values: &Value) -> bool {
!f.unavailable && f.enabled_by.is_none_or(|k| get(values, k).as_bool().unwrap_or(true))
}
fn draw_field(app: &mut FilmcraftApp, ui: &mut Ui, d: &mut SettingsDraft, f: &Field) {
let enabled = f.enabled_by.is_none_or(|k| get(&d.values, k).as_bool().unwrap_or(true));
let enabled = field_enabled(f, &d.values);
let cur = get(&d.values, f.key).clone();
ui.add_enabled_ui(enabled, |ui| {
let drawn = ui.add_enabled_ui(enabled, |ui| {
ui.horizontal(|ui| {
if f.indent {
ui.add_space(22.0);
@@ -596,8 +603,11 @@ fn draw_field(app: &mut FilmcraftApp, ui: &mut Ui, d: &mut SettingsDraft, f: &Fi
color_field(app, ui, d, f.key, f.label);
}
}
});
})
});
if f.unavailable {
drawn.response.on_disabled_hover_text(tl!("This preference is not available yet."));
}
}
/// A colour swatch (opens a picker) and its `#rrggbb` text.
@@ -1080,6 +1090,27 @@ mod tests {
assert_eq!(app.tokens.kind, ThemeKind::Dark);
}
/// A preference with nothing behind it yet is greyed out, and so is a switch whose parent
/// switch is off; neither claims to be usable.
#[test]
fn unavailable_settings_are_drawn_greyed_out() {
let mut values = json!({"playback": {"enableTransmit": true}, "mediaCache": {"autoClean": false}});
let transmit = settings::field("playback.enableTransmit").expect("playback.enableTransmit");
assert!(!field_enabled(&transmit, &values), "External Video Output has nothing behind it");
// The stored value is untouched: it round-trips, it just is not offered.
values["playback"]["enableTransmit"] = json!(true);
assert!(!field_enabled(&transmit, &values));
let plain = settings::field("timeline.stillImageDuration").expect("timeline.stillImageDuration");
assert!(field_enabled(&plain, &values), "an ordinary preference stays usable");
// A switch that only applies while another one is on follows that one, and keeps the
// dialog's own hint rather than the "not available yet" one.
let dependent = settings::field("autoSave.intervalMinutes").expect("autoSave.intervalMinutes");
assert_eq!(dependent.enabled_by, Some("autoSave.enabled"));
assert!(!field_enabled(&dependent, &json!({"autoSave": {"enabled": false}})));
assert!(field_enabled(&dependent, &json!({"autoSave": {"enabled": true}})));
assert!(!dependent.unavailable);
}
#[test]
fn diff_lists_changed_leaves() {
let a = json!({"timeline": {"x": 1, "y": "a"}, "labels": {"colors": {"rose": {"name": "Rose"}}}});
+3 -3
View File
@@ -471,7 +471,7 @@ pub struct UiState {
pub expanded_bins: Vec<u64>,
/// Expanded folders in the Effects panel.
pub expanded_fx: Vec<String>,
/// Effects panel: the Lumetri Presets folder shown as a thumbnail grid (wide panel).
/// Effects panel: the Color Grading Presets folder shown as a thumbnail grid (wide panel).
#[serde(default)]
pub lumetri_grid_folder: Option<String>,
/// Collapsed effect sections in Effect Controls ("clip:index").
@@ -488,7 +488,7 @@ pub struct UiState {
#[serde(default = "shown")]
pub show_status_bar: bool,
pub dark: bool,
/// Lumetri scopes visible in the Program monitor area.
/// Color Grading scopes visible in the Program monitor area.
pub show_scopes: bool,
/// Cinema mode: the Program monitor fills the whole window and the cursor is hidden. Only
/// `view.fullScreenProgram` turns it on, so it is not part of the saved state.
@@ -629,7 +629,7 @@ pub struct UiState {
/// `panels::graphics_templates`.
#[serde(default)]
pub gfx_templates: crate::panels::graphics_templates::GfxTemplatesState,
/// Lumetri Scopes, Timecode, Events, Progress and Reference Monitor settings. See
/// Video Scopes, Timecode, Events, Progress and Reference Monitor settings. See
/// `panels::panel_state`.
#[serde(default)]
pub panels: crate::panels::panel_state::PanelsState,
+1 -1
View File
@@ -403,7 +403,7 @@ pub fn revert_drag_on_escape<T: Clone + Send + Sync + 'static>(ctx: &egui::Conte
}
}
/// A twirl-down section header (Effect Controls / Lumetri style). Returns open state.
/// A twirl-down section header (Effect Controls / Color Grading style). Returns open state.
pub fn section_header(ui: &mut Ui, id: egui::Id, title: &str, open: bool, t: &Tokens, bold: bool) -> (Response, bool) {
let w = ui.available_width();
let (rect, resp) = ui.allocate_exact_size(vec2(w, 22.0), Sense::click());
+9 -9
View File
@@ -1,4 +1,4 @@
//! Headless UI tests of colour features: the Lumetri Color panel's LUT menus and section
//! Headless UI tests of colour features: the Color Grading panel's LUT menus and section
//! switches, Interpret Footage ▸ Color Management and the sequence colour settings, driven by
//! automation id through the control channel.
//!
@@ -173,7 +173,7 @@ fn effect_controls_lut_rows_pick_a_lut() {
let clip = select_first_clip(&mut d);
d.exec("effects.apply", json!({"clips": [clip], "effect": "lumetri"}));
d.ok("ui.panel.show", json!({"panel": "EffectControls"}));
// maximized, so the Lumetri rows fit
// maximized, so the Color Grading rows fit
d.ok("ui.set", json!({"focused": "EffectControls"}));
d.ok("ui.menu.invoke", json!({"id": "window.maximizeFrame"}));
d.frames(4);
@@ -394,7 +394,7 @@ fn lumetri_presets_in_the_effects_panel() {
d.click("effects.folder.Lumetri Presets/Monochrome");
let rows = d.ids("effects.lumetriPreset.");
assert!(rows.iter().any(|r| r == "effects.lumetriPreset.Neutral Mono"), "{rows:?}");
// double-click a preset row: Lumetri Color configured as the preset on the selected clip
// double-click a preset row: Color Grading configured as the preset on the selected clip
d.ok("ui.click", json!({"id": "effects.lumetriPreset.Neutral Mono", "button": "right"}));
d.frames(3);
d.click("effects.presetMenu.apply");
@@ -407,7 +407,7 @@ fn lumetri_presets_in_the_effects_panel() {
assert!(!d.ids("effects.presetGrid").is_empty(), "no grid: {:?}", d.ids("effects."));
let cells = d.ids("effects.presetGrid.");
assert!(cells.iter().any(|c| c == "effects.presetGrid.Sepia Tone"), "{cells:?}");
d.click("effects.folder.Lumetri Presets/Cinematic");
d.click("effects.folder.Color Grading Presets/Cinematic");
let cells = d.ids("effects.presetGrid.");
assert!(cells.iter().any(|c| c == "effects.presetGrid.Golden Dusk"), "{cells:?}");
d.snapshot("color-lumetri-presets-grid", None);
@@ -427,8 +427,8 @@ fn lumetri_presets_drag_onto_a_timeline_clip() {
let selected = select_first_clip(&mut d);
let seq = d.exec("sequence.inspect", json!({}));
let target = seq["video"][0]["items"][1]["clip"].as_u64().unwrap_or_else(|| panic!("no second clip: {seq}"));
d.click("effects.folder.Lumetri Presets");
d.click("effects.folder.Lumetri Presets/Monochrome");
d.click("effects.folder.Color Grading Presets");
d.click("effects.folder.Color Grading Presets/Monochrome");
d.frames(2);
assert!(d.element(&format!("timeline.clip.{target}")).is_some(), "target clip not on screen");
d.ok("ui.drag", json!({"from": {"id": "effects.lumetriPreset.Neutral Mono"}, "to": {"id": format!("timeline.clip.{target}")}, "steps": 8}));
@@ -499,7 +499,7 @@ fn interpret_footage_from_the_item_menu_takes_the_whole_selection() {
assert_eq!(over(&mut d, c), json!("slog3-sgamut3cine"));
assert_eq!(over(&mut d, a), before[0]);
}
/// #2682: a curve point dragged in Lumetri Color is one undo step: Cmd+Z puts the curve back, and
/// #2682: a curve point dragged in Color Grading is one undo step: Cmd+Z puts the curve back, and
/// Cmd+Shift+Z brings the edit back.
#[test]
fn a_dragged_lumetri_curve_point_undoes_and_redoes() {
@@ -542,7 +542,7 @@ fn a_dragged_lumetri_curve_point_undoes_and_redoes() {
assert_eq!(curve(&mut d), edited, "one Cmd+Z undoes the second drag only");
}
/// #3431: a plain click on the Lumetri luma curve places a point where it landed; a click away
/// #3431: a plain click on the Color Grading luma curve places a point where it landed; a click away
/// from the curve adds nothing.
#[test]
fn a_click_on_the_lumetri_curve_places_a_point() {
@@ -573,7 +573,7 @@ fn a_click_on_the_lumetri_curve_places_a_point() {
#[test]
fn lumetri_panel_menu_offers_export_cube() {
// #4127: the Lumetri Color panel menu has Export .cube… for the selected clip's grade
// #4127: the Color Grading panel menu has Export .cube… for the selected clip's grade
let mut d = Driver::demo();
d.ok("ui.set", json!({"workspace": "Color"}));
d.frames(3);
+1 -1
View File
@@ -1,4 +1,4 @@
//! Hot numbers (the blue values in Properties, Effect Controls, the Audio Clip Mixer and Lumetri),
//! Hot numbers (the blue values in Properties, Effect Controls, the Audio Clip Mixer and Color Grading),
//! driven headless through the control channel: once a click turns one into a text field, Left and
//! Right move the caret inside it (#3372) instead of moving focus out, which committed the value.
+6 -6
View File
@@ -1,4 +1,4 @@
//! Headless UI tests of the M8.9 / M12.6 panels: Lumetri Scopes (layouts, the settings menu,
//! Headless UI tests of the M8.9 / M12.6 panels: Video Scopes (layouts, the settings menu,
//! footer), Metadata (edit a field by typing, undo), Timecode, Events, Progress and the Reference
//! Monitor, each opened from Window ▸ and driven by automation id through the control channel.
//!
@@ -174,7 +174,7 @@ fn every_panel_opens_from_the_window_menu() {
let menu = d.ok("ui.menu.list", json!({}));
let window: Vec<String> =
menu.as_array().unwrap().iter().filter(|m| m["path"] == json!(["Window"])).filter_map(|m| m["label"].as_str().map(str::to_string)).collect();
for p in ["Events", "Lumetri Scopes", "Metadata", "Progress", "Project Notes", "Reference Monitor", "Timecode"] {
for p in ["Events", "Video Scopes", "Metadata", "Progress", "Project Notes", "Reference Monitor", "Timecode"] {
assert!(window.iter().any(|w| w == p), "{p} not in Window: {window:?}");
}
for (panel, key) in [
@@ -864,7 +864,7 @@ fn middle_closing_an_inactive_project_tab_keeps_the_inspector_target() {
/// #2329: in the Effects panel what a folder holds is indented under it: an effect's label starts
/// right of its sub-folder's, a sub-folder's right of its top folder's, and the same for presets
/// and Lumetri presets.
/// and Color Grading presets.
#[test]
fn effects_are_indented_under_their_folders() {
fn text_x(d: &mut Driver, text: &str) -> f32 {
@@ -881,9 +881,9 @@ fn effects_are_indented_under_their_folders() {
let mut d = Driver::demo();
d.ok("ui.panel.show", json!({"panel": "Effects"}));
d.frames(3);
// Presets is opened last: its Import/Scan rows push the Lumetri sub-folders below the
// Presets is opened last: its Import/Scan rows push the Color Grading sub-folders below the
// panel's visible area, where they can no longer be clicked.
for folder in ["Video Effects", "Video Effects/Blur & Sharpen", "Lumetri Presets", "Lumetri Presets/Monochrome", "Presets"] {
for folder in ["Video Effects", "Video Effects/Blur & Sharpen", "Color Grading Presets", "Color Grading Presets/Monochrome", "Presets"] {
d.click(&format!("effects.folder.{folder}"));
}
d.frames(2);
@@ -893,7 +893,7 @@ fn effects_are_indented_under_their_folders() {
("Video Effects", "Blur & Sharpen"),
("Blur & Sharpen", "Gaussian Blur"),
("Presets", preset.as_str()),
("Lumetri Presets", "Monochrome"),
("Color Grading Presets", "Monochrome"),
("Monochrome", lumetri),
] {
let (a, b) = (text_x(&mut d, outer), text_x(&mut d, inner));
+2 -2
View File
@@ -198,7 +198,7 @@ fn a_newer_revision_keeps_the_frame_being_rendered() {
let d = Driver::demo();
let app = d.harness.state();
let idle = || wait_for("the frame queue to empty", Duration::from_micros(50), || app.frames.queue_len() == 0);
// the clip with Lumetri Color at full resolution: tens of milliseconds on the CPU
// the clip with Color Grading at full resolution: tens of milliseconds on the CPU
let seq = app.session.state.active_sequence.unwrap();
let rate = app.session.active_sequence().unwrap().settings.frame_rate;
let frame = rate.frame_at(filmcraft_time::Tick::from_seconds_f64(15.0));
@@ -339,7 +339,7 @@ fn playback_at_a_newer_revision_keeps_the_frame_being_rendered() {
}
panic!("the frame queue never emptied");
};
// the clip with Lumetri Color at full resolution: tens of milliseconds on the CPU
// the clip with Color Grading at full resolution: tens of milliseconds on the CPU
let seq = app.session.state.active_sequence.unwrap();
let rate = app.session.active_sequence().unwrap().settings.frame_rate;
let frame = rate.frame_at(filmcraft_time::Tick::from_seconds_f64(15.0));
+4 -4
View File
@@ -586,8 +586,8 @@ frame (Y'CbCr/RGB + metadata) ─► source colour space: Interpret Footage over
scopes); otherwise the top-level render is converted for an SDR monitor. The other colour
effects work on display-encoded values clamped to 0..1 (they clip HDR highlights above
reference white).
- **HDR grading (Lumetri).** `FxCtx::working` carries the sequence's working space. In a PQ or HLG
sequence Lumetri grades the working space's own signal normalised to **HDR White** (cd/m²,
- **HDR grading (Color Grading).** `FxCtx::working` carries the sequence's working space. In a PQ or HLG
sequence Color Grading grades the working space's own signal normalised to **HDR White** (cd/m²,
Basic Correction; the curves, wheels, looks and HSL Secondary use the Curves section's **HDR
Range**): `filmcraft_color::GradeSpace` (PQ: `PQ⁻¹(nits/10000) / PQ⁻¹(white/10000)`; HLG: the
BT.2100 inverse OOTF of a display with that peak, then the OETF). So the sliders and curves span
@@ -612,7 +612,7 @@ frame (Y'CbCr/RGB + metadata) ─► source colour space: Interpret Footage over
wired up: there is no `platform` crate yet and eframe/wgpu do not expose an EDR surface, so HDR
values above SDR white are never sent to the display. The scopes of an HDR sequence show the
working-space values (waveform in cd/m² on a PQ scale, BT.2020 vectorscope).
- **LUTs.** Lumetri Input LUT and Creative Look reference `lib:<id>` (the project's LUT library,
- **LUTs.** Color Grading Input LUT and Creative Look reference `lib:<id>` (the project's LUT library,
`Project::luts`, embedded `.cube`/`.3dl` text) or `builtin:<id>` (code-generated camera
conversions and looks). `filmcraft-gpu::GpuLut` is the WGSL tetrahedral counterpart, tested for
parity.
@@ -757,7 +757,7 @@ All of these dispatch the same command ids.
settings) is in `crates/ui-egui/src/state.rs` as serde structs, so `ui.inspect` and `ui.set` can
read and write it.
- **Panels with engine data** (M8.9 / M12.6): Lumetri Scopes (`scopes.read` returns the same
- **Panels with engine data** (M8.9 / M12.6): Video Scopes (`scopes.read` returns the same
scopes as numbers), Metadata (`metadata.get` / `metadata.set`, one undo step per edit, stored in
`ProjectItem::metadata`), Events (`events.list` / `events.clear`), Progress (`jobs.list` /
`jobs.cancel`), Project Notes (`project.notes` / `project.setNotes`, plain text in
+4 -4
View File
@@ -51,7 +51,7 @@ Methods (handlers in `crates/ui-egui/src/control.rs`):
| `ui.inspect` | – | UI state (tool, workspace, dock, timeline view, playback, fps…) |
| `ui.docking` | – | the panel layout (craft-ui `Layout`), the focused and maximized panel, and `hitRects`: each docking gesture source drawn last frame (`{hit, rect}`) |
| `ui.elements` | `{prefix?}` | every on-screen interactive element: id, label, rect (`status.text` carries the status bar's whole message or hint, even when the bar shows it shortened); `window` (the `n` of `panel.float.<n>`) marks an element drawn in a floating panel's own OS window, whose rect is in that window's coordinates |
| `ui.set` | `{tool, workspace, mode, theme, focused, playbackRes, timeline:{pps,scroll,fit}, program:{…}, source:{…}, clipDialog:{param: value}, menuDialog:{param: value}, panels:{scopes, timecode, reference, events, progress}, export:{…}, keyframeSelection:[…]}` | `keyframeSelection` replaces the Effect Controls keyframe selection (`[{clip, effect, param, mask?, time}]`, `time` in media ticks; read back as `ui.inspect` → `ui.keyframe_selection`; a click on a lane keyframe selects just that one); `program` / `source` merge fields into the monitor view state (`res`, `paused_res`, `high_quality`, `display`, `zoom`, `pan`, `show_rulers`, `show_guides`, `lock_guides`, `snap`, `guides`, `compare_ref`, …; see [monitors.md](monitors.md)); `clipDialog` sets fields of the open Edit / Clip / File dialog (Paste Attributes, Make Subclip, Frame Hold Options, …); `menuDialog` those of the M3.11 dialogs (Find, Create Search Bin, Project Settings, Scene Edit Detection, Simplify Sequence, Automate to Sequence…; see `panels::menu_dialogs`); `panels` merges into the panel settings (`ui.inspect` → `ui.panels`; see `panels::panel_state`): Lumetri Scopes `{shown: ["vectorscopeYuv"|"vectorscopeHls"|"histogram"|"parade"|"waveform"], waveformType, paradeType, colorSpace, brightness, scale, clamp, targets}`, Timecode `{rows: [{source, mode, display}], showName}`, Reference Monitor `{ganged, time, display: "composite"|"scopes", scopes}`, Events `{level, selected}`, Progress `{showFinished}` `export` deep-merges into Export mode state (`preset` — applied first —, `settings` (ExportSettings JSON), `fileName`, `location`, `range`, `customStart`, `customEnd`, `openSections`, `manager` (Preset Manager: `query`, `favoritesOnly`, `selected`, `saveName`), `quickOpen`, `quickPath`, `quickPreset`); `program` / `source` merge fields into the monitor view state (`res`, `paused_res`, `high_quality`, `display`, `zoom`, `pan`, `show_rulers`, `show_guides`, `lock_guides`, `snap`, `guides`, `compare_ref`, …; see [monitors.md](monitors.md)); `clipDialog` sets fields of the open Edit / Clip / File dialog (Paste Attributes, Make Subclip, Frame Hold Options, …); `menuDialog` those of the M3.11 dialogs (Find, Create Search Bin, Project Settings, Scene Edit Detection, Simplify Sequence, Automate to Sequence…; see `panels::menu_dialogs`); `projectPanel` merges into the Project panel's view state (`bin` shown in place, `tabs` (bins in a tab or window: `{bin, floating, view, iconSize, nav}`), `activeTab`, `selectedBin`, `rename: {item|bin, text}`, `dialog` (`{"metadataDisplay": {columns, filter}}`, `{"savePresetAs": {name}}`, `{"managePresets": {selected, name}}`, `{"freeformOptions": {options}}`, `{"saveArrangement": {name, bin}}`)); `mediaBrowser` into the Media Browser's (`expanded`, `pathEdit`, `editColumns`, `treeWidth`). View settings, columns and presets are engine commands (`project.view.set`, `project.columns.set`, `project.viewPreset.*`, `mediaBrowser.settings`) |
| `ui.set` | `{tool, workspace, mode, theme, focused, playbackRes, timeline:{pps,scroll,fit}, program:{…}, source:{…}, clipDialog:{param: value}, menuDialog:{param: value}, panels:{scopes, timecode, reference, events, progress}, export:{…}, keyframeSelection:[…]}` | `keyframeSelection` replaces the Effect Controls keyframe selection (`[{clip, effect, param, mask?, time}]`, `time` in media ticks; read back as `ui.inspect` → `ui.keyframe_selection`; a click on a lane keyframe selects just that one); `program` / `source` merge fields into the monitor view state (`res`, `paused_res`, `high_quality`, `display`, `zoom`, `pan`, `show_rulers`, `show_guides`, `lock_guides`, `snap`, `guides`, `compare_ref`, …; see [monitors.md](monitors.md)); `clipDialog` sets fields of the open Edit / Clip / File dialog (Paste Attributes, Make Subclip, Frame Hold Options, …); `menuDialog` those of the M3.11 dialogs (Find, Create Search Bin, Project Settings, Scene Edit Detection, Simplify Sequence, Automate to Sequence…; see `panels::menu_dialogs`); `panels` merges into the panel settings (`ui.inspect` → `ui.panels`; see `panels::panel_state`): Video Scopes `{shown: ["vectorscopeYuv"|"vectorscopeHls"|"histogram"|"parade"|"waveform"], waveformType, paradeType, colorSpace, brightness, scale, clamp, targets}`, Timecode `{rows: [{source, mode, display}], showName}`, Reference Monitor `{ganged, time, display: "composite"|"scopes", scopes}`, Events `{level, selected}`, Progress `{showFinished}` `export` deep-merges into Export mode state (`preset` — applied first —, `settings` (ExportSettings JSON), `fileName`, `location`, `range`, `customStart`, `customEnd`, `openSections`, `manager` (Preset Manager: `query`, `favoritesOnly`, `selected`, `saveName`), `quickOpen`, `quickPath`, `quickPreset`); `program` / `source` merge fields into the monitor view state (`res`, `paused_res`, `high_quality`, `display`, `zoom`, `pan`, `show_rulers`, `show_guides`, `lock_guides`, `snap`, `guides`, `compare_ref`, …; see [monitors.md](monitors.md)); `clipDialog` sets fields of the open Edit / Clip / File dialog (Paste Attributes, Make Subclip, Frame Hold Options, …); `menuDialog` those of the M3.11 dialogs (Find, Create Search Bin, Project Settings, Scene Edit Detection, Simplify Sequence, Automate to Sequence…; see `panels::menu_dialogs`); `projectPanel` merges into the Project panel's view state (`bin` shown in place, `tabs` (bins in a tab or window: `{bin, floating, view, iconSize, nav}`), `activeTab`, `selectedBin`, `rename: {item|bin, text}`, `dialog` (`{"metadataDisplay": {columns, filter}}`, `{"savePresetAs": {name}}`, `{"managePresets": {selected, name}}`, `{"freeformOptions": {options}}`, `{"saveArrangement": {name, bin}}`)); `mediaBrowser` into the Media Browser's (`expanded`, `pathEdit`, `editColumns`, `treeWidth`). View settings, columns and presets are engine commands (`project.view.set`, `project.columns.set`, `project.viewPreset.*`, `mediaBrowser.settings`) |
| `ui.panel.show` / `ui.panel.close` | `{panel}` | |
| `ui.click` / `ui.move` | `{id}` or `{x,y}`, `button`, `count`, `modifiers` | synthetic pointer input; click `count` is an integer 0–10 (default 1); `ui.move` ignores it |
| `ui.drag` | `{from, to, steps, modifiers}` | press–move–release; `steps` is an integer 0–1024 (default 12; 0 or 1 uses 2 steps) |
@@ -181,13 +181,13 @@ rec2100-hlg, wideGamut, autoToneMap}`, `clip.interpretFootage {items?, colorSpac
`lut.remove {id}`, `lut.export {lut, path, format?}`, `lumetri.setInputLut` / `lumetri.setLook
{clip?, lut: lib:<id>|builtin:<id>|"", path?}`, `lumetri.setSection {clip?, section, on?}`,
`lumetri.applyMatch {clip?, referenceTime|referenceFrame|referenceTimecode, faceDetection?}`,
`lumetri.exportCube {clip?, path, size?=33}` (the clip's Lumetri grade, an Apply Match result too,
`lumetri.exportCube {clip?, path, size?=33}` (the clip's Color Grading grade, an Apply Match result too,
sampled on a 2..65 lattice in the sequence's output encoding and written as a 3D `.cube`; the
result's `leftOut` names what a LUT cannot hold: vignette, sharpen, HSL Secondary denoise and blur,
and the clip's other effects; Rec. 709 sequences without wide gamut only; the Lumetri panel menu
and the clip's other effects; Rec. 709 sequences without wide gamut only; the Color Grading panel menu
entry `panel.menu.LumetriColor.exportCube` asks for the path). Without
params the menu entries open dialogs (ids `colorDialog.space.<id>`, `colorDialog.working.<id>`,
`colorDialog.wideGamut`, `colorDialog.autoToneMap`, `colorDialog.ok|cancel`). Lumetri panel ids:
`colorDialog.wideGamut`, `colorDialog.autoToneMap`, `colorDialog.ok|cancel`). Color Grading panel ids:
`lumetri.input_lut`, `lumetri.look_lut`, `lumetri.switch.<section>`, `lumetri.section.<section>`,
`lumetri.match.*`; HDR scopes: `scopes.hdrWaveform`. `file.exportMedia {sdr: true}` exports an HDR
sequence as tone-mapped SDR.
+52
View File
@@ -0,0 +1,52 @@
# Feature naming migration
Status: draft, 2026-11-08. This is an engineering naming policy and rollout plan, not trademark clearance.
## Scheme and selected names
Use the existing ArtCraft app identity with short, descriptive feature names. Share names across apps when they describe the same function. Use stable identifiers for dispatch and persistence; translate display labels without changing those identifiers. Preserve interoperability labels and required notices.
| Previous display label | Selected display label | Stable key |
| --- | --- | --- |
| Lumetri Color | Color Grading | `lumetri`, `PanelKind::LumetriColor` |
| Lumetri Scopes | Video Scopes | `PanelKind::LumetriScopes` |
| Lumetri Presets | Color Grading Presets | `Lumetri Presets` folder key; existing preset ids |
| Enable Mercury Transmit | Enable External Video Output | `playback.enableTransmit` |
The external video output setting currently only stores a preference; this rename does not implement hardware output.
### Deferred to RFC-0029
Three Adobe names stay until that RFC decides the replacement, so their labels, catalog rows and
docs are unchanged here:
| Display label (unchanged) | Stable key |
| --- | --- |
| Ultra Key | `ultra_key` |
| Warp Stabilizer | `warp_stabilizer` |
| Morph Cut | `morph_cut` |
They are not retired marks: the display guard in `crates/ui-egui/src/i18n/tests.rs` does not ban
them, and their old/new-name aliases are gone because the label is the name again.
## Integration and attribution
[PR #1880](https://github.com/storytold/filmcraft/pull/1880), for [issue #1868](https://github.com/storytold/filmcraft/issues/1868), is the single integration PR. Its original author's commits are preserved unchanged in history. The complementary work from [draft #4545](https://github.com/storytold/filmcraft/pull/4545) is integrated here rather than maintained as a competing PR. The interim Color Grade wording is replaced by the selected suite-wide Color Grading name.
## Compatibility and localization
- Effect, renderer, command, preference, preset and panel enum ids are unchanged. Old human-readable effect/panel names remain lookup aliases, and the Effects panel search still matches them (`Lumetri`, `Color Grade`).
- Interchange files are unchanged: FCP7 XML, FCPXML and EDL write `filmcraft_project::interchange_name`, which is the name an export has always written (`Lumetri Color`), so an export made before and after the rename is byte-identical. Display labels come from `EffectDef::name`.
- Scoped shortcut imports accept both old and current panel names. The Effects panel keeps its original serialized folder key and old automation paths, with descriptive-name aliases for callers of the original draft.
- Folder dispatch and persistence use the stable key, not its translated label. Old folder expansion state still opens the same folder.
- All 16 shipped locale catalogs include the selected effect names, grading/scopes/preset labels, add-to-clip button and color-management settings note. The locale regression checks parsing, unique keys and absence of retired display marks in translated entries. Additional guards scan the actual built-in interface names and translated output, while retaining English fallback and excluding compatibility identifiers and user text. A feature label must also read differently from every other label in its catalog (German and Russian had both read "Color Grading" and "Color Correction" the same way).
- Existing license, source and author records are preserved. Internal filenames and golden scene ids are not renamed.
## Remaining validation gates
1. Run `cargo xtask ci` on the integrated head, including project lookup/serialization, panel aliases, shortcut import, folder-state and i18n regressions. Focused harnesses do not replace the aggregate gate.
2. Review translations and the displayed controls in all locales, particularly long labels and CJK layouts.
3. Recapture affected screenshots from the updated app. Existing images, including `docs/images/filmcraft-color-panel.png`, still contain old UI text. Captions and descriptions now use the selected terminology, but the pixels have not been refreshed. Update screenshot pixels and attribution records together before release.
4. Review current help/marketing copy and retain factual format/comparison references and required notices where appropriate.
The app name, package names, file formats, iconography and existing first-party trademark license are unchanged.
+8 -6
View File
@@ -1,6 +1,8 @@
# Where FilmCraft falls short of Premiere Pro
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-30 · **Change:** minor (G14 catalog counts refreshed; G13 GIF binary transparency retained) · **Target:** Adobe Premiere Pro 2026 (26.5.2)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-11-08 · **Change:** minor (G14 catalog counts refreshed; G13 GIF binary transparency retained) · **Target:** Adobe Premiere Pro 2026 (26.5.2)
> **Naming update (2026-11-08):** First-party feature labels now follow the selected ArtCraft naming scheme in [PR #1880](https://github.com/storytold/filmcraft/pull/1880). Capabilities, estimates and parity scores were not re-measured.
Every known shortfall, one entry each, ranked by what most stops an editor using FilmCraft for real
work. This is the work list: agents should prefer it over adding checklist items. Numbers are in
@@ -37,7 +39,7 @@ platforms** G4, G9, G17; **performance** G16; **ecosystem** G11; **measurement**
## G1. Nothing compares our output with Premiere's
- **Missing:** a fidelity harness. Every effect, transition, Lumetri control, blend mode, keyframe
- **Missing:** a fidelity harness. Every effect, transition, Color Grading control, blend mode, keyframe
interpolation and audio effect counts once it exists; nothing renders the same project in
Premiere and FilmCraft and compares frames or samples. Effects described as approximations
count the same as exact ones.
@@ -60,7 +62,7 @@ platforms** G4, G9, G17; **performance** G16; **ecosystem** G11; **measurement**
- **Approach:** `.prproj` is gzip-compressed XML. Clean-room from projects we author ourselves in
Premiere (the owner has `plan/premiere/fixtures/filmcraft_ref.prproj`): sequences, tracks, clips,
in/out, speed, transitions, markers, bins, labels, then the common effect parameters (Motion,
Opacity, Lumetri basic, Volume). Report what was not imported. Export later. **60–120 h.**
Opacity, Color Grading basic, Volume). Report what was not imported. Export later. **60–120 h.**
Doc: [file-format-parity.md](file-format-parity.md).
## G3. 10-bit and 4:2:2 camera media needs hardware
@@ -105,13 +107,13 @@ platforms** G4, G9, G17; **performance** G16; **ecosystem** G11; **measurement**
- **Have:** hardware decode on macOS (VideoToolbox H.264 / HEVC), Windows (Media Foundation /
D3D11: H.264, HEVC, VP9, AV1) and Linux (VA-API and NVDEC: H.264, HEVC); hardware encode
VideoToolbox H.264 / HEVC 8-bit, NVENC H.264 (Windows, Linux) and HEVC incl. Main 10 HDR
(Windows); GPU compositing, blend modes, 34 effect ids incl. Lumetri basic / creative / vignette,
(Windows); GPU compositing, blend modes, 34 effect ids incl. Color Grading basic / creative / vignette,
GPU export rendering (#421).
- **Missing:** zero-copy decoded frames into wgpu (every frame is read back to the CPU and
re-uploaded); VideoToolbox Main 10 / HDR HEVC encode and B-frames; ProRes hardware decode /
encode on Apple silicon; Intel Quick Sync and AMD AMF encoders (and their 4:2:2 decode);
VA-API VP9 / AV1 and VA-API encode; HEVC encode on Linux; AV1 hardware encode; ~48 of Premiere's
~82 accelerated effects (keys, masks, Lumetri curves / wheels / HSL, distortions, transitions);
~82 accelerated effects (keys, masks, Color Grading curves / wheels / HSL, distortions, transitions);
external video I/O (DeckLink / AJA, Mercury Transmit), control surfaces (EUCON / Mackie);
a CPU fallback adapter renders everything on the CPU (#632).
- **Estimate:** 120–200 h (hardware we don't own needs a human). Doc:
@@ -322,7 +324,7 @@ platforms** G4, G9, G17; **performance** G16; **ecosystem** G11; **measurement**
## G18. Effects depth: approximations and missing behaviour
- **Missing:** Warp Stabilizer is 2-D (Premiere's is 3-D subspace), Morph Cut has no face tracking
(and occlusion edges are soft), Lumetri HDR-aware maths,
(and occlusion edges are soft), Color Grading HDR-aware maths,
redesigned 26.0 mask tools (a stored, re-editable
corner radius: rounding bakes fillets into the path, so a rounded corner cannot be re-rounded later).
- **Have:** multicam sources with more than 16 angles are paged 4 × 4 in the Multi-Camera view;
+7 -5
View File
@@ -1,6 +1,8 @@
# Hardware parity
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-23 · **Change:** minor (adjustment layers on the GPU compositor) · **Target:** Adobe Premiere Pro 2026 (26.5.2)
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-08 · **Change:** minor (adjustment layers on the GPU compositor) · **Target:** Adobe Premiere Pro 2026 (26.5.2)
> **Naming update (2026-11-08):** First-party feature labels now follow the selected ArtCraft naming scheme in [PR #1880](https://github.com/storytold/filmcraft/pull/1880). Capabilities, estimates and parity scores were not re-measured.
Each hardware feature Premiere uses, per platform, against ours. Implementation detail lives in
[`crates/platform/README.md`](../crates/platform/README.md) (decode / encode backends, the one
@@ -50,8 +52,8 @@ against 793 s with our software encoder (SSIM 0.990). NVENC HEVC round trip 48.9
| Feature | Premiere (Mercury Playback Engine: Metal, CUDA, OpenCL) | Ours (wgpu: Metal, D3D12, Vulkan) | % |
|---|---|---|---|
| Compositing, blend modes, transforms | GPU | **GPU** (#32), CPU compositor is the oracle | 90% |
| Accelerated video effects | ~82 of ~92 effects marked Accelerated (reference list `plan/premiere/10-effects-list.md`) | **35 effect ids** (`render::gpufx::GPU_EFFECTS`): colour, levels, blurs (Bokeh Blur included), sharpen, crop, transform, flips, vignette, video limiter, ASC CDL, channel mix, Lumetri basic / creative / vignette | ~40% |
| Lumetri curves, wheels, HSL secondary | GPU | CPU | 0% |
| Accelerated video effects | ~82 of ~92 effects marked Accelerated (reference list `plan/premiere/10-effects-list.md`) | **35 effect ids** (`render::gpufx::GPU_EFFECTS`): colour, levels, blurs (Bokeh Blur included), sharpen, crop, transform, flips, vignette, video limiter, ASC CDL, channel mix, Color Grading basic / creative / vignette | ~40% |
| Color Grading curves, wheels, HSL secondary | GPU | CPU | 0% |
| Keys (Ultra Key), masks, distortions, transitions | GPU | CPU (masks have WGSL parity tests, not in the live path) | 10% |
| Adjustment layers | GPU when every effect on them is accelerated | **GPU** for a full-frame one at 100 % opacity, Normal, unmasked, with only GPU effects (`PlanStep::Adjust`): 4.0–5.0× faster GPU exports under one; any other one renders the whole frame on the CPU | 60% |
| Export rendering on the GPU | yes | **yes** (#421; Export ▸ GPU Rendering, Auto): 2.4× (1080p) to 3.2× (4K) faster on effects-heavy timelines | 80% |
@@ -76,7 +78,7 @@ against 793 s with our software encoder (SSIM 0.990). NVENC HEVC round trip 48.9
**Hardware dimension: ~45%, 120–200 h.** Ahead of Premiere: hardware decode on Linux (VA-API,
NVDEC) and FreeBSD builds. Behind, by user impact: zero-copy upload; GPU effects beyond 35
(Lumetri curves / wheels / HSL, keys, masks, transitions); Quick Sync and AMD encoders on Windows;
(Color Grading curves / wheels / HSL, keys, masks, transitions); Quick Sync and AMD encoders on Windows;
VideoToolbox Main 10 HDR encode; 10-bit / 4:2:2 decode off macOS; HDR display; external video
I/O and control surfaces (need hardware we don't own). Calibration: one decode backend ~3–5 h,
one encoder ~4–8 h ([target-app-parity.md](target-app-parity.md#calibration)).
@@ -86,4 +88,4 @@ one encoder ~4–8 h ([target-app-parity.md](target-app-parity.md#calibration)).
| Date | Change | Summary |
|---|---|---|
| 2026-10-23 | minor | Adjustment layers row: full-frame, opaque, Normal ones with GPU effects run on the GPU compositor |
| 2026-10-10 | major | Created from ROADMAP.md's performance-and-hardware row and `crates/platform/README.md`; added Linux NVDEC (#549), GPU export and Lumetri on the GPU (#421), Premiere's per-platform hardware list, devices and I/O |
| 2026-10-10 | major | Created from ROADMAP.md's performance-and-hardware row and `crates/platform/README.md`; added Linux NVDEC (#549), GPU export and Color Grading on the GPU (#421), Premiere's per-platform hardware list, devices and I/O |
+1 -1
View File
@@ -5,7 +5,7 @@ source: original work (screenshot of FilmCraft captured with its ui.screen
license: MIT OR Apache-2.0 (screenshot); embedded film frames are public domain, music CC0-1.0
license-file:
added: 2026-09-30 by Claude (agent) for Brandon Thomas
notes: Color workspace; Lumetri Color grade (basic correction, RGB curve) on Charade (1963); Lumetri Scopes. Downscaled to 2400 px. All UI icons are drawn in code; fonts are Inter and JetBrains Mono (OFL-1.1). Contains no Adobe artwork.
notes: Color workspace; Color Grading grade (basic correction, RGB curve) on Charade (1963); Video Scopes. Downscaled to 2400 px. All UI icons are drawn in code; fonts are Inter and JetBrains Mono (OFL-1.1). Contains no Adobe artwork.
Media visible in the screenshot (none of it is committed to the repository):
- Night of the Living Dead (1968), dir. George A. Romero, Image Ten. US public domain (released without a copyright notice). Source: https://archive.org/details/night-of-the-living-dead-1968-english (Public Domain Mark).
- Carnival of Souls (1962), dir. Herk Harvey, Harcourt Productions. US public domain. Source: https://archive.org/details/CarnivalOfSoulsVideoQualityUpgrade (Public Domain Mark).
@@ -5,7 +5,7 @@ source: original work (screenshot of FilmCraft captured with its ui.screen
license: MIT OR Apache-2.0 (screenshot); embedded film frames are public domain, music CC0-1.0
license-file:
added: 2026-09-30 by Claude (agent) for Brandon Thomas
notes: Crop of the Effects workspace: Effect Controls, Program monitor showing NASA Earth Views with a Lumetri Golden Hour look, Effects browser. All UI icons are drawn in code; fonts are Inter and JetBrains Mono (OFL-1.1). Contains no Adobe artwork.
notes: Crop of the Effects workspace: Effect Controls, Program monitor showing NASA Earth Views with a Color Grading Golden Hour look, Effects browser. All UI icons are drawn in code; fonts are Inter and JetBrains Mono (OFL-1.1). Contains no Adobe artwork.
Media visible in the screenshot (none of it is committed to the repository):
- Night of the Living Dead (1968), dir. George A. Romero, Image Ten. US public domain (released without a copyright notice). Source: https://archive.org/details/night-of-the-living-dead-1968-english (Public Domain Mark).
- Carnival of Souls (1962), dir. Herk Harvey, Harcourt Productions. US public domain. Source: https://archive.org/details/CarnivalOfSoulsVideoQualityUpgrade (Public Domain Mark).
+3 -3
View File
@@ -7,10 +7,10 @@ license-file:
added: 2026-10-01 by Claude (agent) for Brandon Thomas
notes: A 3:10 documentary cut of the Apollo 11 mission, built entirely through FilmCraft's control channel, captured
mid-playback in the Color workspace at 2400x1285 logical px (2x) and downscaled to 2400 px wide.
Shown: Effect Controls of the selected liftoff shot (Motion Scale push-in and Lumetri Exposure keyframes,
Shown: Effect Controls of the selected liftoff shot (Motion Scale push-in and Color Grading Exposure keyframes,
a Basic Correction grade with the Warm Film look); the Program monitor on the Saturn V clearing the
tail-service mast at Launch Complex 39A, with a lower-third title (Inter Bold/Regular) and a subtitle from the
NASA air-to-ground transcript; the Lumetri Color panel; Project bins of NASA selects, mission audio, music and
NASA air-to-ground transcript; the Color Grading panel; Project bins of NASA selects, mission audio, music and
the sequence; a timeline with 49 picture cuts and dissolves on V1, B-roll cutaways on V2, titles on V3, a
caption track, nat sound, mission audio and a ducked music bed, named markers, In/Out around the launch and
a rendered (green) section; live loudness meters. All UI icons are drawn in code; fonts are Inter and
@@ -44,7 +44,7 @@ Reproduction: download the four NASA files (the "~medium" MP4 renditions; the Fi
EVA montage = whole file. Run `filmcraft --control <port>` and drive it with the scripts kept (not committed) in
target/demo-media/apollo11/scripts/: build.py (bins, imports, 1920x1080 30p sequence, 49 V1 cuts), build2.py (V2 cutaways,
A2 mission audio, A3 music, track names, dissolves and audio fades), build3.py (titles with graphics.newText/graphics.set,
caption track from the transcript, markers), build_fixups.py A, build4.py (Lumetri grades, motion/exposure keyframes,
caption track from the transcript, markers), build_fixups.py A, build4.py (Color Grading grades, motion/exposure keyframes,
Essential Sound types, essentialSound.generateDucking on the music), build_fixups.py B, build5.py (liftoff shot as hero),
build_fixups.py C (In/Out 00:00:46:15-00:01:34:00, Render In to Out). The resulting project is
target/demo-media/Apollo 11 - Tranquility.fcproj. Capture: setup_ui.py 77.5 (Color workspace, Effect Controls tab, bins
+2 -2
View File
@@ -1,11 +1,11 @@
asset: filmcraft-scopes.png
title: README: Lumetri Scopes
title: README: Video Scopes
author: FilmCraft contributors (screenshot); film/footage/music credits below
source: original work (screenshot of FilmCraft captured with its ui.screenshot control command)
license: MIT OR Apache-2.0 (screenshot); embedded film frames are public domain, music CC0-1.0
license-file:
added: 2026-09-30 by Claude (agent) for Brandon Thomas
notes: Crop of the Lumetri Scopes panel (waveform, vectorscope) computed from a Charade (1963) frame. All UI icons are drawn in code; fonts are Inter and JetBrains Mono (OFL-1.1). Contains no Adobe artwork.
notes: Crop of the Video Scopes panel (waveform, vectorscope) computed from a Charade (1963) frame. All UI icons are drawn in code; fonts are Inter and JetBrains Mono (OFL-1.1). Contains no Adobe artwork.
Media visible in the screenshot (none of it is committed to the repository):
- Night of the Living Dead (1968), dir. George A. Romero, Image Ten. US public domain (released without a copyright notice). Source: https://archive.org/details/night-of-the-living-dead-1968-english (Public Domain Mark).
- Carnival of Souls (1962), dir. Herk Harvey, Harcourt Productions. US public domain. Source: https://archive.org/details/CarnivalOfSoulsVideoQualityUpgrade (Public Domain Mark).
+2 -2
View File
@@ -267,8 +267,8 @@ alternating rounds, `filmcraft-cli … run` of `file.exportMedia` (H.264, `gpuRe
| scene | main | **after** |
|---|---|---|
| the CityNight demo footage under an adjustment layer (Lumetri: contrast, exposure, vignette; Gaussian Blur 4) | 35.5, 35.8 | **9.4, 8.6** |
| a real edit: 1080p H.264 camera clips with dips to black, an adjustment layer with Lumetri over 89 % of it, about 150 titles and shapes above | 26.1, 24.4 | **5.2, 5.0** |
| the CityNight demo footage under an adjustment layer (Color Grading: contrast, exposure, vignette; Gaussian Blur 4) | 35.5, 35.8 | **9.4, 8.6** |
| a real edit: 1080p H.264 camera clips with dips to black, an adjustment layer with Color Grading over 89 % of it, about 150 titles and shapes above | 26.1, 24.4 | **5.2, 5.0** |
4.0× and 5.0× faster (means of the two rounds). GPU 3D utilisation (`nvidia-smi dmon`) went from
1–4 % to 18–31 %. The two builds' files decode to the same picture within encoder noise (ffmpeg `psnr`
+8 -6
View File
@@ -1,6 +1,8 @@
# Roadmap detail
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-10-30 · **Change:** minor (M8: Fujifilm F-Log / F-Log2 / F-Log2 C colour spaces; E-AC-3 #788, AVI #650, Russian #610, French #804, Indonesian #878, pt-BR #866 and German #630 no longer listed as open) · **Target:** Adobe Premiere Pro 2026 (26.5.2)
> **Last reviewed:** 2026-10-12 · **Last updated:** 2026-11-08 · **Change:** minor (M8: Fujifilm F-Log / F-Log2 / F-Log2 C colour spaces; E-AC-3 #788, AVI #650, Russian #610, French #804, Indonesian #878, pt-BR #866 and German #630 no longer listed as open) · **Target:** Adobe Premiere Pro 2026 (26.5.2)
> **Naming update (2026-11-08):** First-party feature labels now follow the selected ArtCraft naming scheme in [PR #1880](https://github.com/storytold/filmcraft/pull/1880). Capabilities, estimates and parity scores were not re-measured.
Forward-looking plan: milestones with status, the current focus and what's next, with estimates in
Opus 5.5 agent-hours (calibration in [target-app-parity.md](target-app-parity.md#calibration)).
@@ -16,7 +18,7 @@ In order. Each item links to its gap entry, which says what "done" means.
3. **10-bit / 4:2:2 camera media in software** ([G3](gaps.md#g3-10-bit-and-422-camera-media-needs-hardware)). 30–50 h.
4. **Fidelity harness against Premiere** ([G1](gaps.md#g1-nothing-compares-our-output-with-premieres)) and **`cargo xtask parity`** ([G7](gaps.md#g7-no-measured-parity-tool-in-ci)): turns estimates into measurements. 50–90 h.
5. **Real-world media corpus and workflow tests** ([G6](gaps.md#g6-no-real-world-media-corpus-or-workflow-acceptance-tests)). 40–70 h.
6. **Hardware acceleration, continued** (#30, [G5](gaps.md#g5-hardware-acceleration-is-partial)): zero-copy upload, Lumetri curves / wheels / HSL and keys on the GPU, VideoToolbox Main 10, Quick Sync / AMF encoders. 120–200 h.
6. **Hardware acceleration, continued** (#30, [G5](gaps.md#g5-hardware-acceleration-is-partial)): zero-copy upload, Color Grading curves / wheels / HSL and keys on the GPU, VideoToolbox Main 10, Quick Sync / AMF encoders. 120–200 h.
7. **UI fidelity issues** ([G8](gaps.md#g8-ui-fidelity-monitor-handles-effect-controls-docking)): Program monitor transform handles, Effect Controls, docking. 120–200 h.
## Alpha gate
@@ -30,7 +32,7 @@ workflow would make FilmCraft pre-alpha.
|---|---|---|---|
| Ingest and organize media (import camera / phone / screen files, bins, metadata, proxies) | partial, not blocking | H.264 / HEVC / ProRes / DNx / MXF / AVCHD / MKV import with bit-exact decoders, Media Browser, bins, proxies, Link Media. Gaps: H.264 10-bit / 4:2:2 (Sony XAVC S-I, Canon XF-AVC) opens nowhere and HEVC 4:2:2 only through VideoToolbox (#626, [G3](gaps.md#g3-10-bit-and-422-camera-media-needs-hardware)); camera RAW; E-AC-3 plays its 5.1 core (#647) and AVI imports (#598) | 0 (G3 is a beta item, 30–50 h) |
| Assemble and trim a sequence (insert / overwrite, ripple / roll / slip / slide, razor, J/K/L, multicam) | yes | Edit algebra with undo tests, Trim Monitor, Premiere keyboard preset, multicam with audio sync; UX issues (#683, #648, #668) slow it down but don't stop it | 0 |
| Colour correct and grade (Lumetri, LUTs, scopes, colour management) | yes | Lumetri complete with CPU / WGSL parity tests, all Lumetri Scopes, LUT import, HDR export signalling checked with ffprobe | 0 |
| Colour correct and grade (Color Grading, LUTs, scopes, colour management) | yes | Color Grading complete with CPU / WGSL parity tests, all Video Scopes, LUT import, HDR export signalling checked with ffprobe | 0 |
| Mix audio (levels, automation, Essential Sound, loudness) | yes on macOS | Mixer graph, automation, 53 effects, BS.1770 loudness matching ffmpeg; device reports are Windows / Linux (#605, #617) | 0 |
| Titles and captions | yes | Text engine, graphic clips, templates, SRT / VTT / SCC / MCC / STL / TTML import-export, burn-in; Arabic titles broken (#395) | 0 |
| Deliver (export H.264 / HEVC / ProRes / DNxHR / MXF with presets, queue) | yes | Own H.264 + AAC encoder, ProRes, DNxHR, MXF, hardware HEVC on macOS, ffprobe-checked exports; bitrate target miss (#371) | 0 |
@@ -65,15 +67,15 @@ Status: ✅ done · 🟡 in progress · ⬜ not started. Estimates are remaining
| M2 | H.264 decoder | ✅ | Own decoder, bit-exact on 37+ streams, 500–600 fps 1080p | — | — |
| M3 | Editing core | 🟡 | Edit algebra (insert/overwrite/razor/lift/extract/ripple/roll/slip/slide/rate-stretch/nest/paste), tools, markers, trim mode + Trim Monitor + dynamic J/K/L trimming, Keyboard Shortcuts editor with FilmCraft/Premiere/FCP/Avid presets; Edit/Clip/File menu commands (Label colours and Select Label Group, Paste/Remove Attributes, Select All Matching, Remove Unused, Consolidate Duplicates, Sequence From Clip, Bin From Selection, Offline File, Close Project, Make/Edit Subclip, Modify Audio Channels/Timecode, Frame Hold Options/Add Frame Hold/Insert Frame Hold Segment, Time Interpolation with frame blending, Fit/Fill frame, Breakout to Mono, Extract Audio, Replace With Clip; M3.11: Scene Edit Detection (pure-Rust cut detection, background job), Normalize Mix Track, Simplify Sequence, Transcribe Sequence, Find/Find Next and search bins, Automate to Sequence, Edit Original, Edit Offline, Source Settings, Update Metadata (XMP), Generate Audio Waveform, Project Settings General/Scratch Disks, Get Media File Properties, Save as Template, Selection as FilmCraft Project, Avid Log Exchange export, Flash Cue markers, Dynamic Audio Waveforms, Reveal Log Files, System Compatibility Report); M3.12 keyboard parity: Premiere's default keyboard (~115 keyboard-only commands: edit-point navigation on targeted/any track, select clip at playhead/next/previous, extend edit to playhead, nudge/slip/slide selection, target and source-patch toggles, clip volume ±1 dB/many, frame maximize/full screen/panel cycling, monitor zoom, track heights, Project and Text panel keyboard navigation, text size/leading/alignment, Export Frame, poster frames; see docs/keyboard.md); multicam (Create Multi-Camera Source Sequence, Multi-Camera view with live switching on 1–9, angle switching, Enable/Flatten, Edit Cameras) and sync (Synchronize, Merge Clips; In/Out/timecode/marker/audio — GCC-PHAT, sample-accurate) | Multicam paging >16 angles and grid thumbnails, optical flow (renders as frame blending), 34 Premiere default shortcuts skipped with reasons in docs/keyboard.md (Productions, AI/cloud tools, Production/Search panels) | 6–10 |
| M4 | Playback | 🟡 | Audio-clock master, prefetch with cancellation, J/K/L, correct dropped-frame stats, playback resolution, render bar + content-hashed render previews, App Nap opt-out; 1080p H.264 and 3 stacked 1080p streams play with 0 dropped frames | 4K under load, 8K, frame-threaded AV1 decode, reduced-resolution decode for multicam grids | 6–10 |
| M5 | Effects, keyframes, GPU | 🟡 | All 93 Premiere 26 video effects and 84 transitions (CPU), blend modes and 33 common effects on the GPU (#32, GPU2, GPU4, GPU5), keyframes + value/velocity graphs, wgpu compositor, effect + opacity masks (ellipse/polygon/pen, feather, expansion, modes; CPU/WGSL parity), mask tracking (Lucas–Kanade + RANSAC), adjustment layers, effect presets (built-in + user, JSON import/export) | More effects on the GPU (34 ids done incl. Lumetri basic / creative / vignette; GPU export landed #421), GPU masks in the live path, exact Warp Stabilizer (3-D) and Morph Cut | 40–70 |
| M5 | Effects, keyframes, GPU | 🟡 | All 93 Premiere 26 video effects and 84 transitions (CPU), blend modes and 33 common effects on the GPU (#32, GPU2, GPU4, GPU5), keyframes + value/velocity graphs, wgpu compositor, effect + opacity masks (ellipse/polygon/pen, feather, expansion, modes; CPU/WGSL parity), mask tracking (Lucas–Kanade + RANSAC), adjustment layers, effect presets (built-in + user, JSON import/export) | More effects on the GPU (34 ids done incl. Color Grading basic / creative / vignette; GPU export landed #421), GPU masks in the live path, exact Warp Stabilizer (3-D) and Morph Cut | 40–70 |
| M6 | Export | ✅ | Own H.264 encoder (High/Main/Baseline, B-frames, VBR/CBR/2-pass) → MP4 or QuickTime + own AAC; ProRes, DNxHR, MJPEG, PNG/TIFF/BMP sequences (Premiere-style numbering), GIF, WAV, AIFF; background jobs; M6.5: Export mode parity (frame size / rate / scaling / pixel aspect, profile / level, CBR / VBR 1- and 2-pass, keyframe distance, audio codec / rate / channels / bitrate / sample size, multiplexer, burn-in or sidecar captions, image / name / timecode overlays, video limiter, loudness normalization with true-peak limiter, metadata, ranges, estimated size, summary), 24 built-in presets + user presets with favourites and import/export (Preset Manager), export queue (reorder, cancel, retry, several sequences / ranges), Quick Export; `export.*` commands and `filmcraft-cli export --preset` | Interlaced encoding, 5.1 audio, smart render, publishing destinations | 6–8 |
| M7 | Audio | 🟡 | Mixer graph (tracks → submixes → Mix, pre/post-fader inserts and sends, latency-compensated, sample-accurate, ~6× realtime for 24 tracks × 3 effects on one core), Audio Track Mixer + Audio Clip Mixer panels, track automation (Off/Read/Latch/Touch/Write, recorded live while playing, thinned to keyframes, timeline lanes with pen editing), solo/solo-safe, channel mapping basics, peak + BS.1770 loudness meters (match ffmpeg), DSP crate with 16 clip/track effects, Audio Gain (set/adjust/normalize), Constant Power / Constant Gain / Exponential Fade, Essential Sound (types, Loudness auto-match, Repair incl. DeEss/DeReverb, Clarity, Creative, Ducking keyframes, presets; full Dialogue chain 22× realtime) | Music duration remix, ML speech enhancement, 5.1 panner and multichannel buses, voice-over record, effect editor windows (EQ curve), remaining effects (multiband, convolution reverb), clip-mixer automation recording | 6–9 |
| M8 | Colour | 🟡 | Lumetri: basic, creative + looks, RGB & hue curves, wheels, HSL secondary, vignette, section bypass; Input LUT / Look LUT (.cube 1D/3D/shaper, .3dl; tetrahedral CPU + WGSL; project LUT library; built-in camera conversions); Colour Match (Oklab tonal-range statistics, skin protection, solved in Lumetri wheels); colour management: Rec. 709 / Rec. 2100 PQ / HLG working spaces + wide gamut, Interpret Footage colour space (S-Log3, V-Log, Canon Log 2/3, LogC3/4, Apple Log, D-Log, Fujifilm F-Log / F-Log2 / F-Log2 C from published specs), metadata auto-detect, BT.2390 tone mapping, gamut mapping, HDR export signalling (VUI/colr/mdcv/clli/SEI, ffprobe-verified); Lumetri Scopes: Vectorscope YUV (75/100 % targets, skin-tone line) and HLS, Histogram, Parade (RGB/YUV/RGB-White), Waveform (RGB/Luma/YC/YC no Chroma), presets, Rec. 601/709/2100, 8-bit/float/HDR (cd/m²) scales, multi-scope grid, `scopes.read` | HDR-aware Lumetri maths, macOS EDR monitors, mastering metadata → tone-map peak, D-Log M (no published formula), HSL Secondary refine | 3–5 |
| M8 | Colour | 🟡 | Color Grading: basic, creative + looks, RGB & hue curves, wheels, HSL secondary, vignette, section bypass; Input LUT / Look LUT (.cube 1D/3D/shaper, .3dl; tetrahedral CPU + WGSL; project LUT library; built-in camera conversions); Colour Match (Oklab tonal-range statistics, skin protection, solved in Color Grading wheels); colour management: Rec. 709 / Rec. 2100 PQ / HLG working spaces + wide gamut, Interpret Footage colour space (S-Log3, V-Log, Canon Log 2/3, LogC3/4, Apple Log, D-Log, Fujifilm F-Log / F-Log2 / F-Log2 C from published specs), metadata auto-detect, BT.2390 tone mapping, gamut mapping, HDR export signalling (VUI/colr/mdcv/clli/SEI, ffprobe-verified); Video Scopes: Vectorscope YUV (75/100 % targets, skin-tone line) and HLS, Histogram, Parade (RGB/YUV/RGB-White), Waveform (RGB/Luma/YC/YC no Chroma), presets, Rec. 601/709/2100, 8-bit/float/HDR (cd/m²) scales, multi-scope grid, `scopes.read` | HDR-aware Color Grading maths, macOS EDR monitors, mastering metadata → tone-map peak, D-Log M (no published formula), HSL Secondary refine | 3–5 |
| M9 | More codecs | 🟡 | ProRes decode+encode, AAC decode+encode, HEVC Main/Main 10 decoder (bit-exact on 41 fixtures, ~225 fps 1080p), VP9 decoder (profiles 0–3, 8/10/12-bit, bit-exact on 50+ fixtures; WebM/MKV `V_VP9` and MP4 `vp09` import with key-frame-checked seeking), Matroska/WebM import (H.264/HEVC/VP9/ProRes/MJPEG + AAC/Opus/FLAC/MP3/Vorbis/PCM), Opus decoder (SILK/CELT/hybrid, 5.1/7.1 multistream; all RFC 8251 vectors range-exact; WebM/MKV/MP4), DNxHD/DNxHR decoder (all SMPTE ST 2019-1 CIDs, 8/10/12-bit, 4:2:2/4:4:4, interlaced, alpha; within IDCT precision of ffmpeg on 22 fixtures) + DNxHR LB/SQ/HQ/HQX/444 encoder and MOV `AVdh` export, AV1 decoder (Main profile, 8/10-bit, all intra/inter tools, loop filters, superres, film grain, intra BC, spatial layers; bit-exact vs libdav1d on 19 SVT fixtures + 22 libaom vectors; MP4 `av01` / WebM `V_AV1` import), MXF import (OP1a/OP-Atom; AVC with POC-ordered B pictures bit-exact, DNxHD/DNxHR, ProRes, PCM/AES3; MPEG-2 reported unsupported; index-table seeking, material package timecode), Ogg Opus/Vorbis (granule seeking, pre-skip, end trimming), image sequences, Broadcast WAV timecode, AC-3 and E-AC-3 decoder (`crates/ac3`; E-AC-3 independent substream 0, #788), AVI / OpenDML import (`crates/avi`; Motion JPEG, H.264, HEVC, uncompressed video; PCM, MP3, MP2, AC-3 audio; #650) | VP9 frame threading, AV1 threading/SIMD (~4 fps 1080p today), AV1 High/Professional profiles, H.264 High 10 / 4:2:2 and HEVC 4:2:2 in software (G3), E-AC-3 adaptive hybrid transform, enhanced coupling and the 7.1 dependent substreams (played as the 5.1 core) (MPEG-2 decoder and hardware decode have landed) | 30–50 |
| M10 | Graphics & captions | 🟡 | Caption tracks (Subtitle/CEA-608/708/Teletext formats, track style), SRT/WebVTT/SCC import+export (frame-exact, property-tested), caption editing (add/split/merge/trim/move, sync-locked insert/extract), Text panel Captions tab, burn-in in Program monitor and export; text engine (`crates/text`: bundled + system fonts, harfrust shaping, bidi, line breaking, paragraph layout, glyph cache; 3-line 1080p title ≈ 0.15 ms warm); graphic clips with text + shape layers (fill, 2 strokes, background, shadow, keyframable transform), Type tool with on-monitor editing, shape/pen tools, Properties/Essential Graphics editor, align/distribute; graphics templates (own `.fcgt` format, 8 original built-ins, Browse tab with engine-rendered thumbnails, export / install / apply / editable properties; never reads .mogrt), rolls/crawls with ease and pre/postroll, responsive pins and intro/outro, per-character styles, Upgrade Caption to Graphic, source graphics, Replace Fonts; MCC (608+708), EBU STL, TTML/IMSC1, DFXP (frame-exact, property-tested) | 608/708 embedding in video streams, speech-to-text | 12–18 |
| M11 | Interchange & project management | ✅ | `.fcproj` schema versions + migrations, atomic saves, Save a Copy/Revert, auto-save ring + crash-recovery journal (Preferences ▸ Auto Save, recovery prompt), FCP7 XML, FCPXML, EDL, OTIO; offline media (own slate) + Link Media (fingerprint-checked relink, folder remap, search, Align Timecode, Make Offline); proxies (ProRes Proxy/LT, H.264 ¼/½ background jobs, attach/detach/reconnect, monitor toggle, export full-res) + ingest (copy/transcode/proxies); Project Manager (collect, consolidate + transcode with handles, size estimate) | Rename media to clip names, image-sequence conversion, Media Browser-driven relink, smart (cross-drive) path tracking | 1–2 |
| M12–M16 | Multicam, web (WASM), platform, long tail | 🟡 | Multicam: audio sync (GCC-PHAT, sub-sample), Merge Clips, multi-camera source sequences, Multi-Camera view with live switching (1–9); L0–L4 crates compile to wasm32 | Web app shell (file access, WebCodecs, audio), scene detection, auto reframe, ~800 remaining commands and dialogs, performance hardening | 35–55 |
| HW | Hardware acceleration (#30) | 🟡 | Blend modes and 34 effect ids on the GPU incl. Lumetri basic / creative / vignette (#32, GPU2–GPU7); GPU export rendering (#421); decode: VideoToolbox (#33, #41), Media Foundation / D3D11 H.264 / HEVC / VP9 / AV1 (HW2, HW3), VA-API H.264 / HEVC (#358), NVDEC H.264 / HEVC (#549); encode: VideoToolbox H.264 / HEVC, NVENC H.264 (Windows, Linux) and HEVC incl. Main 10 HDR (#328, #360) | Zero-copy, remaining GPU effects, VideoToolbox Main 10, Quick Sync / AMF, VA-API VP9 / AV1 and encode | 120–200 |
| HW | Hardware acceleration (#30) | 🟡 | Blend modes and 34 effect ids on the GPU incl. Color Grading basic / creative / vignette (#32, GPU2–GPU7); GPU export rendering (#421); decode: VideoToolbox (#33, #41), Media Foundation / D3D11 H.264 / HEVC / VP9 / AV1 (HW2, HW3), VA-API H.264 / HEVC (#358), NVDEC H.264 / HEVC (#549); encode: VideoToolbox H.264 / HEVC, NVENC H.264 (Windows, Linux) and HEVC incl. Main 10 HDR (#328, #360) | Zero-copy, remaining GPU effects, VideoToolbox Main 10, Quick Sync / AMF, VA-API VP9 / AV1 and encode | 120–200 |
| L10N | Localization | 🟡 | Whole interface: Spanish, Japanese, Simplified Chinese, French, Portuguese (Brazil), Indonesian, Italian, Korean, German, Russian, Czech, Polish, Swedish, Turkish, Bosnian; Ukrainian the core menus | Hindi, Arabic (RTL), Vietnamese; native review of every language | 150–230 |
## After beta
+6 -4
View File
@@ -1,6 +1,8 @@
# Parity with Adobe Premiere Pro
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-30 · **Change:** minor (AVI import #650, E-AC-3 decode #647 and Russian menus #610 no longer counted as missing; percentages and hours not re-measured) · **Target:** Adobe Premiere Pro 2026 (26.5.2, macOS)
> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-08 · **Change:** minor (AVI import #650, E-AC-3 decode #647 and Russian menus #610 no longer counted as missing; percentages and hours not re-measured) · **Target:** Adobe Premiere Pro 2026 (26.5.2, macOS)
> **Naming update (2026-11-08):** First-party feature labels now follow the selected ArtCraft naming scheme in [PR #1880](https://github.com/storytold/filmcraft/pull/1880). Capabilities, estimates and parity scores were not re-measured.
The authoritative assessment of how close FilmCraft is to Premiere Pro, and how much work is left.
[ROADMAP.md](../ROADMAP.md) summarizes it; [gaps.md](gaps.md) lists every shortfall one at a time.
@@ -112,7 +114,7 @@ agent-hours to close the area to Premiere, sequential.
| Media import and codecs | 12% | ~75% | ~60% | 150–250 | Own bit-exact decoders for H.264, HEVC, VP9, AV1, ProRes, DNx, APV, MPEG-2, AAC, AC-3, Opus. But H.264 only 8-bit 4:2:0 and HEVC no 4:2:2 in software (most 10-bit cameras, #626); no camera RAW (R3D, ARRIRAW, BRAW, Sony RAW, Canon RAW, ProRes RAW, #345, #383); E-AC-3 plays its 5.1 core only (#647), no WMV, DV, XAVC / P2 metadata; Sony start timecode (#460) | [codec-parity.md](codec-parity.md), [file-format-parity.md](file-format-parity.md) |
| Audio | 10% | ~88% | ~65% | 50–90 | Mixer graph, automation, all 53 effects, Essential Sound, 5.1, voice-over, Remix, multi-stream container audio (#361). Device and playback reports: crackle / cut-outs (#336, #410, #602, #605, #617); Enhance Speech is DSP, not a model; ALSA fallback fixed (#254) | |
| Panels and UI fidelity | 10% | ~88% | ~60% | 120–200 | All main panels. Missing: on-screen transform handles in the Program monitor (#639), Effect Controls keyframe zoom / divider / row lines (#640–#645), docking rearrangement (#493), multi-monitor windows (#466), filmstrip thumbnails (#614), marquee in Project panel (#578) | [ui-parity.md](ui-parity.md) |
| Colour | 8% | ~90% | ~70% | 40–70 | Lumetri complete incl. scopes, LUTs, colour management, HDR export. Lumetri on the GPU covers basic, creative and vignette only; HDR-aware Lumetri maths, macOS EDR display, D-Log M; a Lumetri report (#628) | |
| Colour | 8% | ~90% | ~70% | 40–70 | Color Grading complete incl. scopes, LUTs, colour management, HDR export. Color Grading on the GPU covers basic, creative and vignette only; HDR-aware Color Grading maths, macOS EDR display, D-Log M; a Color Grading report (#628) | |
| Graphics, titles, captions | 8% | ~85% | ~65% | 50–90 | Text engine with shaping and bidi, shapes, gradients (#514), our `.fcgt` templates (`.mogrt` refused by design), rolls / crawls, all caption formats. Arabic titles reported broken (#395); no 608/708 embedding in the video stream; speech-to-text off in release builds | |
| Export and delivery | 8% | ~80% | ~65% | 60–110 | H.264 (own encoder), HEVC through hardware only, ProRes, DNxHR, APV, MXF OP1a / OP-Atom, image sequences, GIF, WAV / AIFF, presets, queue, GPU export rendering (#421). Missing: AV1, MPEG-2 / DVD / Blu-ray, DCP, JPEG 2000 / XS MXF, AS-10 / AS-11, XDCAM HD, EXR / DPX / Targa sequences, MP3, AAC-only audio, ProRes 4444 in the UI (#342), interlaced, smart render; bitrate target missed (#371) | [file-format-parity.md](file-format-parity.md) |
| Project files and interchange | 8% | ~70% | ~45% | 90–160 | `.fcproj` with migrations, auto-save, recovery; FCP7 XML, FCPXML, AAF, OMF, EDL, OTIO, ALE. **Premiere's own `.prproj` cannot be opened** (the main beta blocker); AAF / OMF never validated in Media Composer / Pro Tools; XML import of a Premiere sequence took 97 s (#461) | [file-format-parity.md](file-format-parity.md) |
@@ -212,8 +214,8 @@ full-area depth (e.g. the ~20 common effects rather than all 93 and their approx
|---|---|---|---|
| Editing and trimming | 28% | 80% | Insert / overwrite, ripple / roll / slip / slide, razor, J/K/L, markers, multicam all work; gap deletion (#648, #668) and deselect (#683) are friction |
| Importing everyday footage | 14% | 65% | Phone and 8-bit camera H.264 / HEVC, ProRes, DNx, MXF open; 10-bit / 4:2:2 H.264 (Sony XAVC S-I, Canon) does not (#626); WMV and DV missing |
| Common effects and transitions | 9% | 75% | Lumetri, Transform, Crop, blurs, Cross Dissolve, keys exist; Warp Stabilizer is 2-D, Object Mask missing |
| Colour (Lumetri, scopes, LUTs) | 9% | 80% | Complete, parity-tested CPU / GPU; curves / wheels on CPU |
| Common effects and transitions | 9% | 75% | Color Grading, Transform, Crop, blurs, Cross Dissolve, keys exist; Warp Stabilizer is 2-D, Object Mask missing |
| Colour (Color Grading, scopes, LUTs) | 9% | 80% | Complete, parity-tested CPU / GPU; curves / wheels on CPU |
| Audio (levels, Essential Sound, loudness, ducking) | 11% | 75% | Complete; audio-device reports off macOS |
| Titles and captions | 7% | 75% | Text, shapes, templates, SRT / SCC / VTT; `.mogrt` not read by design |
| Export with presets | 9% | 75% | H.264, HEVC (hardware), ProRes, DNxHR, presets, queue; bitrate miss (#371) |
+3 -3
View File
@@ -180,7 +180,7 @@ Each codec README has the full fixture matrix and the measured results.
- **Golden images** (`crates/golden`, a test-only crate): `tests/golden.rs` builds small procedural
projects (demo-generator footage, bars, no media files) at 320×180 and renders one frame of each
through the CPU compositor: Motion transform + opacity, four blend modes (Multiply, Screen,
Overlay, Difference), Gaussian Blur, Lumetri basic correction, Crop, Cross Dissolve at 50 %, Dip
Overlay, Difference), Gaussian Blur, Color Grading basic correction, Crop, Cross Dissolve at 50 %, Dip
to Black at 25 %, Wipe at 50 %, Timecode / Clip Name burn-in text, graphic clips (also a built-in
graphics template with overridden properties and per-character styles with a pinned box), and colour
management: S-Log3/S-Gamut3.Cine footage interpreted into Rec. 709 (`log_to_rec709`) and
@@ -266,7 +266,7 @@ delete), the queue panel (Send to Queue, Up/Down, Cancel, Start, Retry, Clear) w
the Export button and the header's Quick Export popup (`export-*.png` snapshots).
`crates/ui-egui/tests/it/color_ui.rs` drives colour features the same way (`color-*.png` snapshots):
Lumetri Input/Look LUT menus and section switches, the Interpret Footage ▸ Color Management and
Color Grading Input/Look LUT menus and section switches, the Interpret Footage ▸ Color Management and
Sequence Color Management dialogs, and the HDR scopes of a PQ sequence.
Colour science tests: `filmcraft-color` (curve round trips and published reference values per
@@ -353,7 +353,7 @@ cargo xtask bench-playback --json target/bench-playback.json # machine-readable
| `stack3-blend` | `stack3` with V2 in Screen and V3 in Overlay (blend modes on the GPU) |
| `h264-2160` | one 2160p23.976 H.264 clip |
| `demo` | the built-in demo project (procedural footage, transitions, effects) |
| `after-preview` | 1080p H.264 + Lumetri/Sharpen/Levels/Tint: a live play, Render In to Out, then two plays of the green segment |
| `after-preview` | 1080p H.264 + Color Grading/Sharpen/Levels/Tint: a live play, Render In to Out, then two plays of the green segment |
| `seek-storm` | 40 jumps to random frames 150 ms apart (scrubbing), time until the exact frame shows |
Options: `--res full,half,quarter`, `--cpu` (CPU compositor + texture conversion instead of the
@@ -36,7 +36,7 @@
</keywords>
<screenshots>
<screenshot type="default">
<caption>Color workspace: a documentary cut with Lumetri Color, scopes, captions and loudness meters</caption>
<caption>Color workspace: a documentary cut with Color Grading, scopes, captions and loudness meters</caption>
<image>https://raw.githubusercontent.com/storytold/filmcraft/main/docs/images/filmcraft-hero.png</image>
</screenshot>
</screenshots>
+9 -2
View File
@@ -13,7 +13,7 @@
//! Effects panel lists, from the engine's effect definitions
//! (`crates/project/examples/effect_catalog.rs`); paths are Effects-panel folders
//! (`Video Effects > Blur & Sharpen > Gaussian Blur`). A reference entry may also be a bare name,
//! which has no folder and so is matched by name alone. Presets and Lumetri Presets are out of
//! which has no folder and so is matched by name alone. Presets and Color Grading Presets are out of
//! scope, and so are the other area's items (a folder named `… Transitions`), so one reference
//! of the whole Effects panel serves both areas.
//!
@@ -397,7 +397,7 @@ fn out_of_scope(area: Area, path: &[String]) -> Option<&'static str> {
Area::Menus => menu_out_of_scope(path),
Area::Effects | Area::Transitions => {
let top = norm(path.first()?);
if path.len() >= 2 && (top == "presets" || top == "lumetri presets") {
if path.len() >= 2 && (top == "presets" || top == "lumetri presets" || top == "color grade presets" || top == "color grading presets") {
return Some("presets");
}
let folders = path.get(..path.len().saturating_sub(1)).unwrap_or_default();
@@ -751,4 +751,11 @@ mod tests {
assert_eq!(tr.out_of_scope.get("effects (--area effects)"), Some(&3));
assert!(tr.markdown("effects.json", 3).contains("- [ ] Video Transitions ▸ Dissolve ▸ Film Dissolve"));
}
#[test]
fn renamed_color_preset_folders_remain_out_of_effect_parity() {
for name in ["Lumetri Presets", "Color Grade Presets", "Color Grading Presets"] {
assert_eq!(out_of_scope(Area::Effects, &[name.into(), "Cinematic".into()]), Some("presets"));
}
}
}