Skip to content

The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.

Name the kinds the way users know them

Jareer53e078535b55
diff --git a/engine/crates/concat-effects/packages/concat.bass/effect.toml b/engine/crates/concat-effects/packages/concat.bass/effect.toml
index 743c7f79..708e33c6 100644
--- a/engine/crates/concat-effects/packages/concat.bass/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.bass/effect.toml
@@ -1,7 +1,7 @@
[effect]
id = "concat.bass"
name = "Bass"
-kind = "filter"
+kind = "audio"
category = "Tone"
order = 20
intensity = "gain"
diff --git a/engine/crates/concat-effects/packages/concat.chipmunk/effect.toml b/engine/crates/concat-effects/packages/concat.chipmunk/effect.toml
index 2b1283b5..fe50cefa 100644
--- a/engine/crates/concat-effects/packages/concat.chipmunk/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.chipmunk/effect.toml
@@ -1,7 +1,7 @@
[effect]
id = "concat.chipmunk"
name = "Chipmunk"
-kind = "filter"
+kind = "audio"
category = "Voice"
order = 12
intensity = "pitch"
diff --git a/engine/crates/concat-effects/packages/concat.contrast-pop/effect.toml b/engine/crates/concat-effects/packages/concat.contrast-pop/effect.toml
index 68128dd1..e14a02e1 100644
--- a/engine/crates/concat-effects/packages/concat.contrast-pop/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.contrast-pop/effect.toml
@@ -1,7 +1,7 @@
[effect]
id = "concat.contrast-pop"
name = "Contrast Pop"
-kind = "effect"
+kind = "filter"
category = "Color"
order = 33
intensity = "contrast"
diff --git a/engine/crates/concat-effects/packages/concat.cool/effect.toml b/engine/crates/concat-effects/packages/concat.cool/effect.toml
index 9f1c059f..7e23b7e4 100644
--- a/engine/crates/concat-effects/packages/concat.cool/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.cool/effect.toml
@@ -1,7 +1,7 @@
[effect]
id = "concat.cool"
name = "Cool"
-kind = "effect"
+kind = "filter"
category = "Color"
order = 31
intensity = "temperature"
diff --git a/engine/crates/concat-effects/packages/concat.deep/effect.toml b/engine/crates/concat-effects/packages/concat.deep/effect.toml
index 1756a730..f29be5ff 100644
--- a/engine/crates/concat-effects/packages/concat.deep/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.deep/effect.toml
@@ -1,7 +1,7 @@
[effect]
id = "concat.deep"
name = "Deep"
-kind = "filter"
+kind = "audio"
category = "Voice"
order = 11
intensity = "pitch"
diff --git a/engine/crates/concat-effects/packages/concat.echo/effect.toml b/engine/crates/concat-effects/packages/concat.echo/effect.toml
index a0e077a9..c46f4074 100644
--- a/engine/crates/concat-effects/packages/concat.echo/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.echo/effect.toml
@@ -1,7 +1,7 @@
[effect]
id = "concat.echo"
name = "Echo"
-kind = "filter"
+kind = "audio"
category = "Space"
order = 30
intensity = "decay"
diff --git a/engine/crates/concat-effects/packages/concat.robot/effect.toml b/engine/crates/concat-effects/packages/concat.robot/effect.toml
index 22355198..9a15d456 100644
--- a/engine/crates/concat-effects/packages/concat.robot/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.robot/effect.toml
@@ -1,7 +1,7 @@
[effect]
id = "concat.robot"
name = "Robot"
-kind = "filter"
+kind = "audio"
category = "Voice"
order = 13
intensity = "depth"
diff --git a/engine/crates/concat-effects/packages/concat.room/effect.toml b/engine/crates/concat-effects/packages/concat.room/effect.toml
index adc3140e..466028c6 100644
--- a/engine/crates/concat-effects/packages/concat.room/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.room/effect.toml
@@ -1,7 +1,7 @@
[effect]
id = "concat.room"
name = "Room"
-kind = "filter"
+kind = "audio"
category = "Space"
order = 31
intensity = "size"
diff --git a/engine/crates/concat-effects/packages/concat.sweet/effect.toml b/engine/crates/concat-effects/packages/concat.sweet/effect.toml
index fc23cf67..2819dace 100644
--- a/engine/crates/concat-effects/packages/concat.sweet/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.sweet/effect.toml
@@ -1,7 +1,7 @@
[effect]
id = "concat.sweet"
name = "Sweet"
-kind = "filter"
+kind = "audio"
category = "Voice"
order = 10
intensity = "amount"
diff --git a/engine/crates/concat-effects/packages/concat.telephone/effect.toml b/engine/crates/concat-effects/packages/concat.telephone/effect.toml
index 804259ec..69cfaefa 100644
--- a/engine/crates/concat-effects/packages/concat.telephone/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.telephone/effect.toml
@@ -1,7 +1,7 @@
[effect]
id = "concat.telephone"
name = "Telephone"
-kind = "filter"
+kind = "audio"
category = "Tone"
order = 22
intensity = "drive"
diff --git a/engine/crates/concat-effects/packages/concat.treble/effect.toml b/engine/crates/concat-effects/packages/concat.treble/effect.toml
index 5b94a7f7..8614ebea 100644
--- a/engine/crates/concat-effects/packages/concat.treble/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.treble/effect.toml
@@ -1,7 +1,7 @@
[effect]
id = "concat.treble"
name = "Treble"
-kind = "filter"
+kind = "audio"
category = "Tone"
order = 21
intensity = "gain"
diff --git a/engine/crates/concat-effects/packages/concat.vibrance/effect.toml b/engine/crates/concat-effects/packages/concat.vibrance/effect.toml
index b9c11aa3..13c626f5 100644
--- a/engine/crates/concat-effects/packages/concat.vibrance/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.vibrance/effect.toml
@@ -1,7 +1,7 @@
[effect]
id = "concat.vibrance"
name = "Vibrance"
-kind = "effect"
+kind = "filter"
category = "Color"
order = 32
intensity = "intensity"
diff --git a/engine/crates/concat-effects/packages/concat.warm/effect.toml b/engine/crates/concat-effects/packages/concat.warm/effect.toml
index 35e0808f..9d269189 100644
--- a/engine/crates/concat-effects/packages/concat.warm/effect.toml
+++ b/engine/crates/concat-effects/packages/concat.warm/effect.toml
@@ -1,7 +1,7 @@
[effect]
id = "concat.warm"
name = "Warm"
-kind = "effect"
+kind = "filter"
category = "Color"
order = 30
intensity = "temperature"
diff --git a/engine/crates/concat-effects/src/catalogue.rs b/engine/crates/concat-effects/src/catalogue.rs
index 62aa82c8..d781bddd 100644
--- a/engine/crates/concat-effects/src/catalogue.rs
+++ b/engine/crates/concat-effects/src/catalogue.rs
@@ -412,28 +412,28 @@ impl Catalogue {
/// empty string if it has none. Effects apply in the order they were
/// added.
pub fn video_chain(&self, effects: &[AppliedFilter]) -> String {
- self.compose(Kind::Effect, effects)
+ self.compose(&[Kind::Effect, Kind::Filter], effects)
}
/// The complete FFmpeg audio filter string for a clip's filters, or the
/// empty string if it has none. Filters apply in the order they were
/// added: EQ before a limiter is a different sound from the reverse.
pub fn audio_chain(&self, filters: &[AppliedFilter]) -> String {
- self.compose(Kind::Filter, filters)
+ self.compose(&[Kind::Audio], filters)
}
- /// Enabled entries of `kind` in applied order, comma-joined. Bypassed
+ /// Enabled entries of these `kinds` in applied order, comma-joined. Bypassed
/// entries, unknown ids, packages of another kind and packages without
/// an FFmpeg backend contribute nothing. The index each fragment is
/// rendered at is its *emitted* position, so labels stay stable when a
/// bypassed entry sits earlier in the list.
- fn compose(&self, kind: Kind, applied: &[AppliedFilter]) -> String {
+ fn compose(&self, kinds: &[Kind], applied: &[AppliedFilter]) -> String {
let mut fragments: Vec<String> = Vec::new();
for applied in applied.iter().filter(|applied| applied.enabled) {
let Some(package) = self.get(&applied.id) else {
continue;
};
- if package.kind() != kind {
+ if !kinds.contains(&package.kind()) {
continue;
}
match package.ffmpeg_fragment(&applied.params, fragments.len()) {
diff --git a/engine/crates/concat-effects/src/manifest.rs b/engine/crates/concat-effects/src/manifest.rs
index 5050814a..69093729 100644
--- a/engine/crates/concat-effects/src/manifest.rs
+++ b/engine/crates/concat-effects/src/manifest.rs
@@ -66,20 +66,35 @@ fn one() -> u32 {
1
}
-/// Which catalogue a package belongs to.
+/// Which catalogue a package belongs to. The vocabulary is the one video
+/// editors' users already know: an effect is something that *happens* to
+/// the picture, a filter is a colour look with an intensity, and audio is
+/// its own world.
#[derive(Deserialize, Clone, Copy, PartialEq, Eq, Hash, Debug)]
#[serde(rename_all = "lowercase")]
pub enum Kind {
- /// A video effect: image in, image out.
+ /// A video effect: image in, image out. Light, blur, distortion,
+ /// texture, motion.
Effect,
- /// An audio filter: sound in, sound out.
+ /// A colour look: image in, image out, one intensity. Warm, mono,
+ /// film, cinematic.
Filter,
+ /// An audio effect: sound in, sound out. Voices, tone, space.
+ Audio,
/// A transition: two images and a progress, one image out.
Transition,
/// A generator: no input, an image out.
Generator,
}
+impl Kind {
+ /// Whether the package works on the picture: effects, filters,
+ /// transitions and generators do; audio does not.
+ pub fn is_visual(self) -> bool {
+ self != Kind::Audio
+ }
+}
+
/// One `[[param]]`.
#[derive(Deserialize, Clone, PartialEq, Debug)]
#[serde(deny_unknown_fields)]
@@ -289,10 +304,10 @@ impl Manifest {
_ => {}
}
if self.ffmpeg.is_some() && matches!(self.effect.kind, Kind::Transition | Kind::Generator) {
- return Err(self.invalid("an [ffmpeg] package must be an effect or a filter"));
+ return Err(self.invalid("an [ffmpeg] package must be an effect, a filter or audio"));
}
- if self.wgsl.is_some() && self.effect.kind == Kind::Filter {
- return Err(self.invalid("a [wgsl] package cannot be an audio filter"));
+ if self.wgsl.is_some() && self.effect.kind == Kind::Audio {
+ return Err(self.invalid("a [wgsl] package cannot be audio"));
}
Ok(())
}
@@ -369,7 +384,7 @@ mod tests {
);
rejects(
&GOOD.replace("kind = \"effect\"", "kind = \"transition\""),
- "effect or a filter",
+ "effect, a filter or audio",
);
}