Skip to content

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

feat(colour): a media's colour range named over its tag, and full-range export

Jareer013555d96881
diff --git a/docs/api/edits.md b/docs/api/edits.md
index 73ffcfc0..b04a527a 100644
--- a/docs/api/edits.md
+++ b/docs/api/edits.md
@@ -19,6 +19,7 @@ edit; `createdId` names what the command made, if anything.
| [`addMedia`](#addmedia) | file into the bin | `m…` |
| [`removeMedia`](#removemedia) | bin item and every clip of it, out | |
| [`updateMediaPath`](#updatemediapath) | relink a file | |
+| [`setMediaColorRange`](#setmediacolorrange) | say whether a file is really limited or full range | |
| [`replaceClipMedia`](#replaceclipmedia) | point a clip at another file | `m…` if new |
| **Placing clips** | | |
| [`addClip`](#addclip) | media on a named track | `c…` |
@@ -120,6 +121,31 @@ Relinks a bin item to a new path on disk.
| `mediaId` | string | The bin item. Unknown id: no-op |
| `newPath` | string | The new absolute path |
+### `setMediaColorRange`
+
+Says what levels a media file's picture really spans, over whatever the
+file claims. The fix for a washed-out or crushed picture.
+
+| Field | Type | Meaning |
+|---|---|---|
+| `mediaId` | string | The bin item. Unknown id: no-op |
+| `range` | `"limited"`, `"full"` or `null` | `limited` is 16-235, `full` is 0-255. `null` goes back to reading the file's own tag |
+
+```json
+{"op":"setMediaColorRange","mediaId":"m1","range":"full"}
+```
+
+When to use which:
+
+- A screen recording that plays **grey where it should be black** is a
+ full-range file tagged nothing. Set `full`.
+- A file whose **shadows are crushed** and highlights clipped is a
+ video-range file tagged full. Set `limited`.
+- `media.probe` reports what the file claims as `video.colorRange`.
+
+Reaches every clip of the media, on every timeline, in the monitor and
+the export alike. Stored in the document; absent means "as tagged".
+
### `replaceClipMedia`
Points a clip at another file, adding it to the bin first if it is not
diff --git a/docs/api/methods.md b/docs/api/methods.md
index 956a13a1..f6ccb563 100644
--- a/docs/api/methods.md
+++ b/docs/api/methods.md
@@ -436,6 +436,7 @@ frame loop and the mix.
| `rateDen` | integer | *optional*. Frame rate denominator. **Default:** the timeline's |
| `codec` | string | *optional*. `h264`, `hevc` or `av1`. **Default:** `h264`. Anything else is `invalid` |
| `tenBit` | bool | *optional*. Ten bits a channel. **Default:** `false` |
+| `colorRange` | string | *optional*. `limited` (16-235, what every player and YouTube expect) or `full` (0-255, for screen content bound for a PC player). The file is tagged and converted to match. **Default:** `limited`. Anything else is `invalid` |
```json
{"method":"export.run","path":"/edits/Reel","output":"/edits/reel.mp4","crf":18,"codec":"hevc"}
diff --git a/docs/api/types.md b/docs/api/types.md
index 650d9b25..e6d30960 100644
--- a/docs/api/types.md
+++ b/docs/api/types.md
@@ -197,6 +197,7 @@ meaningfully even when the file is missing.
| `hasAudio` | bool | The file carries sound |
| `audioTracks` | *AudioTrack*[] | *optional*. Every audio stream, in file order |
| `placeholder` | bool | *optional*. True for a template slot |
+| `colorRange` | string | *optional*. `limited` or `full`: the levels the picture is read as, over the file's own tag. Absent means "as tagged". Set with `setMediaColorRange` |
### AudioTrack
@@ -330,7 +331,9 @@ Reply to `media.probe`.
| `audioTracks` | *AudioStreamInfo*[] | Every audio stream, in file order |
**VideoStreamInfo:** `index`, `codec`, `width`, `height`, `frameRate`
-(decimal), `frameRateFraction` (exact, e.g. `"30/1"`).
+(decimal), `frameRateFraction` (exact, e.g. `"30/1"`), and `colorRange`
+(`limited` or `full`, present only when the file says; a file that says
+nothing is played as limited).
**AudioStreamInfo:** `index`, `codec`, `sampleRate`, `channels`, `title`,
`language`.
diff --git a/src/crates/concat-api/src/lib.rs b/src/crates/concat-api/src/lib.rs
index 7aabb686..0ae510eb 100644
--- a/src/crates/concat-api/src/lib.rs
+++ b/src/crates/concat-api/src/lib.rs
@@ -366,6 +366,12 @@ impl Api {
ApiError::invalid(format!("unknown codec {name:?}: h264, hevc or av1"))
})?,
};
+ let color_range = match spec.color_range.as_deref() {
+ None => export::ColorRange::Limited,
+ Some(name) => export::ColorRange::parse(name).ok_or_else(|| {
+ ApiError::invalid(format!("unknown colour range {name:?}: limited or full"))
+ })?,
+ };
let host_spec = export::ExportSpec {
output: spec.output.clone(),
crf: spec.crf.unwrap_or(DEFAULT_CRF),
@@ -377,6 +383,7 @@ impl Api {
ten_bit: spec.ten_bit.unwrap_or(false),
rate_mode: export::RateMode::Vbr,
bitrate_kbps: 0,
+ color_range,
};
let project_path = session.path().to_owned();
diff --git a/src/crates/concat-api/src/message.rs b/src/crates/concat-api/src/message.rs
index 2b8b91da..30eee713 100644
--- a/src/crates/concat-api/src/message.rs
+++ b/src/crates/concat-api/src/message.rs
@@ -277,6 +277,12 @@ pub struct ExportSpec {
/// Ten bits a channel. Eight when absent.
#[serde(default)]
pub ten_bit: Option<bool>,
+ /// "limited" (16-235, what every player and YouTube expect) or "full"
+ /// (0-255, for screen content bound for a PC player that reads the
+ /// tag). Limited when absent.
+ /// https://github.com/jub0t/Concat/issues/103
+ #[serde(default)]
+ pub color_range: Option<String>,
}
/// What a request hands back. Serialised as the payload alone: the variant
diff --git a/src/crates/concat-cli/src/main.rs b/src/crates/concat-cli/src/main.rs
index 4fbf8f5a..a7895298 100644
--- a/src/crates/concat-cli/src/main.rs
+++ b/src/crates/concat-cli/src/main.rs
@@ -379,6 +379,7 @@ fn render(input: &PathBuf, output: &PathBuf, frames: u64, fade: u64) -> Result<(
false,
None,
None,
+ None,
)?;
layer.source = Some(frame);
layer.opacity *= fade_in(index, fade);
diff --git a/src/crates/concat-export/src/flatten.rs b/src/crates/concat-export/src/flatten.rs
index cd5eae65..b8d86aa2 100644
--- a/src/crates/concat-export/src/flatten.rs
+++ b/src/crates/concat-export/src/flatten.rs
@@ -83,6 +83,7 @@ pub fn flatten_timeline_in(
Some(ExportClip {
path: media.path.clone(),
audio_stream: clip.audio_stream,
+ color_range: media.color_range,
source_start: clip.source_start,
hidden: !track.visible,
muted: track.muted || clip.muted == Some(true),
diff --git a/src/crates/concat-export/src/lib.rs b/src/crates/concat-export/src/lib.rs
index bb6edcac..aedd159d 100644
--- a/src/crates/concat-export/src/lib.rs
+++ b/src/crates/concat-export/src/lib.rs
@@ -84,6 +84,10 @@ pub struct ExportClip {
/// `Clip::audio_stream`.
#[serde(default)]
pub audio_stream: Option<u32>,
+ /// The levels the file is read as, over its own tag; absent reads the
+ /// tag. See the document's `MediaItem::color_range`.
+ #[serde(default)]
+ pub color_range: Option<concat_project::model::ColorRange>,
/// Whether the clip is footage, sound or a still.
pub kind: ClipKind,
/// Seconds into the timeline where the clip begins.
@@ -229,6 +233,7 @@ impl ExportClip {
ExportClip {
path: String::new(),
audio_stream: None,
+ color_range: None,
kind,
start,
duration,
@@ -350,10 +355,38 @@ pub struct ExportRequest {
/// "not set" and the encoder falls back to VBR.
#[serde(default)]
pub bitrate_kbps: u32,
+ /// The levels the file is written in and tagged with, by name:
+ /// "limited" (16-235, what every player expects) or "full" (0-255).
+ /// Limited when a request does not say.
+ /// https://github.com/jub0t/Concat/issues/103
+ #[serde(default, deserialize_with = "range_by_name")]
+ pub color_range: concat_media::ColorRange,
/// The flattened clip list to render.
pub clips: Vec<ExportClip>,
}
+/// The engine's word for a document's colour range: the two enums are one
+/// idea kept in two crates, since the document knows nothing of FFmpeg
+/// and the engine nothing of documents.
+pub fn engine_range(range: concat_project::model::ColorRange) -> concat_media::ColorRange {
+ match range {
+ concat_project::model::ColorRange::Limited => concat_media::ColorRange::Limited,
+ concat_project::model::ColorRange::Full => concat_media::ColorRange::Full,
+ }
+}
+
+/// A colour range named the way [`concat_media::ColorRange::name`] names
+/// it, refusing a name the engine does not know rather than quietly
+/// writing video range.
+fn range_by_name<'de, D: serde::Deserializer<'de>>(
+ deserializer: D,
+) -> Result<concat_media::ColorRange, D::Error> {
+ let name = String::deserialize(deserializer)?;
+ concat_media::ColorRange::parse(&name).ok_or_else(|| {
+ serde::de::Error::custom(format!("unknown colour range {name:?}: limited or full"))
+ })
+}
+
/// A codec named the way [`VideoCodec::name`] names it, refusing a name
/// the engine has no encoder for rather than quietly falling back.
fn codec_by_name<'de, D: serde::Deserializer<'de>>(
@@ -1019,6 +1052,7 @@ fn render_picture(
treatments,
transitions,
pre_chains,
+ ranges,
chains,
reveal_maps,
cutouts,
@@ -1037,6 +1071,7 @@ fn render_picture(
rate_mode: request.rate_mode,
bitrate_kbps: request.bitrate_kbps,
ten_bit: request.ten_bit,
+ color_range: request.color_range,
hardware: true,
threads: 0,
},
@@ -1077,6 +1112,7 @@ fn render_picture(
stills.contains(&layer.clip),
chain,
pre,
+ ranges.get(&layer.clip).copied(),
) {
let frame = cutouts
.get(&layer.clip)
@@ -1116,7 +1152,8 @@ fn render_picture(
let mut options = DecodeOptions::default()
.starting_at(layer.source_time)
.scaled_to(decode_width, decode_height)
- .at_rate(decode_rate);
+ .at_rate(decode_rate)
+ .in_range(ranges.get(&layer.clip).copied());
// Effects and transition fades, as one FFmpeg chain. The
// decoder guards the frame size after it, so an effect
@@ -1504,6 +1541,7 @@ fn frame_request(
.prefiltered(pre)
.filtered(chain)
.from_proxy(proxy)
+ .in_range(plan.built.ranges.get(&layer.clip).copied())
}
/// [`preview_sources`] for one instant of a plan already built. With
@@ -1524,6 +1562,7 @@ pub fn preview_sources_of(
treatments,
transitions,
pre_chains,
+ ranges: _,
chains,
reveal_maps,
cutouts,
@@ -1666,6 +1705,7 @@ pub fn preview_plan(
ten_bit: false,
rate_mode: RateMode::Vbr,
bitrate_kbps: 0,
+ color_range: concat_media::ColorRange::Limited,
clips: Vec::new(),
};
PreviewPlan {
@@ -1840,12 +1880,7 @@ mod tests {
strength: 0.5,
..negate.clone()
};
- let out = composite_treated(
- &mut compositor,
- stack(Rational::from_int(1)),
- &[half],
- &[],
- );
+ let out = composite_treated(&mut compositor, stack(Rational::from_int(1)), &[half], &[]);
let pixel = &out.pixels()[(7 * 8 + 7) * 4..(7 * 8 + 7) * 4 + 3];
assert!(pixel[0] > 120 && pixel[0] < 136, "{pixel:?}");
assert!(pixel[1] > 120 && pixel[1] < 136, "{pixel:?}");
@@ -2010,7 +2045,10 @@ mod tests {
let spans = resolve_transitions(&mut clips, FrameRate::THIRTY, true);
let b = &clips[1];
- assert_eq!(b.start, 3.0, "extends backwards over the cut, like a dissolve");
+ assert_eq!(
+ b.start, 3.0,
+ "extends backwards over the cut, like a dissolve"
+ );
assert_eq!(b.duration, 5.0);
assert_eq!(b.video_fade_in, 1.0, "the GPU-less fallback dissolve");
assert_eq!(b.track, 1);
diff --git a/src/crates/concat-export/src/resolve.rs b/src/crates/concat-export/src/resolve.rs
index 3a98ca87..4aae46b2 100644
--- a/src/crates/concat-export/src/resolve.rs
+++ b/src/crates/concat-export/src/resolve.rs
@@ -92,6 +92,8 @@ pub(crate) struct BuiltTimeline {
pub(crate) tracks: HashMap<ClipId, usize>,
/// The clip's pre-fit chain - its crop - where it has one.
pub(crate) pre_chains: HashMap<ClipId, String>,
+ /// The levels the clip's file is read as, where the person has said.
+ pub(crate) ranges: HashMap<ClipId, concat_media::ColorRange>,
/// The clip's applied effects, on a GPU renderer: the passes are
/// resolved from them at each frame, because a knob with keys is worth
/// something different each frame and the resolution is cheap.
@@ -139,7 +141,6 @@ impl TransitionSpan {
}
}
-
/// A layer clip, as the compositor needs it: when, over which tracks, what
/// chain, and how hard.
#[derive(Clone, Debug)]
@@ -205,6 +206,7 @@ pub(crate) fn build_timeline(
let mut tracks_of: HashMap<ClipId, usize> = HashMap::new();
let mut treatments: Vec<Treatment> = Vec::new();
let mut pre_chains: HashMap<ClipId, String> = HashMap::new();
+ let mut ranges: HashMap<ClipId, concat_media::ColorRange> = HashMap::new();
let mut chains: HashMap<ClipId, Vec<AppliedFilter>> = HashMap::new();
let mut reveal_maps: HashMap<ClipId, Arc<RevealMap>> = HashMap::new();
let mut cutouts: HashMap<ClipId, CutoutJob> = HashMap::new();
@@ -290,6 +292,9 @@ pub(crate) fn build_timeline(
if !pre.is_empty() {
pre_chains.insert(id, pre);
}
+ if let Some(range) = clip.color_range {
+ ranges.insert(id, crate::engine_range(range));
+ }
if gpu {
let effects = shaded(&clip.effects);
if !effects.is_empty() {
@@ -317,6 +322,7 @@ pub(crate) fn build_timeline(
treatments,
transitions,
pre_chains,
+ ranges,
chains,
reveal_maps,
cutouts,
diff --git a/src/crates/concat-host/src/enhance.rs b/src/crates/concat-host/src/enhance.rs
index abe3996c..b2b51b0a 100644
--- a/src/crates/concat-host/src/enhance.rs
+++ b/src/crates/concat-host/src/enhance.rs
@@ -236,6 +236,7 @@ fn footage(
rate_mode: RateMode::Vbr,
bitrate_kbps: 0,
ten_bit: false,
+ color_range: concat_media::ColorRange::Limited,
hardware: false,
threads: 2,
},
diff --git a/src/crates/concat-host/src/export.rs b/src/crates/concat-host/src/export.rs
index 19fdf851..79102cd6 100644
--- a/src/crates/concat-host/src/export.rs
+++ b/src/crates/concat-host/src/export.rs
@@ -12,7 +12,7 @@ use std::sync::Arc;
use std::sync::atomic::AtomicBool;
use concat_export::{ExportClip, ExportRequest, Reporter, render};
-pub use concat_media::{RateMode, VideoCodec};
+pub use concat_media::{ColorRange, RateMode, VideoCodec};
use crate::jobs::{Job, SingleFlight};
use crate::session::Session;
@@ -37,6 +37,10 @@ pub struct ExportSpec {
pub rate_mode: concat_media::RateMode,
/// Target bitrate in kbps, used when `rate_mode` is CBR.
pub bitrate_kbps: u32,
+ /// The levels the file is written in and tagged with. Video range,
+ /// 16-235, unless the sheet's Advanced section says full.
+ /// https://github.com/jub0t/Concat/issues/103
+ pub color_range: ColorRange,
}
/// One progress report: which frame of how many, in which stage.
@@ -67,6 +71,7 @@ pub fn request(session: &Session, spec: &ExportSpec, titles: Vec<ExportClip>) ->
ten_bit: spec.ten_bit,
rate_mode: spec.rate_mode,
bitrate_kbps: spec.bitrate_kbps,
+ color_range: spec.color_range,
clips,
}
}
diff --git a/src/crates/concat-host/src/media.rs b/src/crates/concat-host/src/media.rs
index cebfbd1a..75809e1f 100644
--- a/src/crates/concat-host/src/media.rs
+++ b/src/crates/concat-host/src/media.rs
@@ -30,6 +30,11 @@ pub struct VideoStreamInfo {
pub frame_rate: f64,
/// The exact fraction the engine actually works in, e.g. "30000/1001".
pub frame_rate_fraction: String,
+ /// The levels the stream says its numbers span, "limited" or "full",
+ /// or absent when the file says nothing - which a player then takes
+ /// for limited.
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub color_range: Option<String>,
}
/// An audio stream, as the UI sees it.
@@ -187,6 +192,7 @@ impl From<concat_media::MediaInfo> for MediaSummary {
video.frame_rate.fps().numerator(),
video.frame_rate.fps().denominator()
),
+ color_range: video.color_range.map(|range| range.name().to_owned()),
}),
audio: info.audio.map(AudioStreamInfo::from_stream),
audio_tracks: info
@@ -835,6 +841,7 @@ mod tests {
width: 1440,
height: 1080,
frame_rate: concat_core::time::FrameRate::from_int(25),
+ color_range: None,
}),
audio: None,
audio_streams: Vec::new(),
diff --git a/src/crates/concat-host/src/proxy.rs b/src/crates/concat-host/src/proxy.rs
index a1db3063..29b74a96 100644
--- a/src/crates/concat-host/src/proxy.rs
+++ b/src/crates/concat-host/src/proxy.rs
@@ -21,7 +21,7 @@ use std::path::{Path, PathBuf};
use std::sync::{Mutex, OnceLock};
use concat_media::decode::{DecodeOptions, Decoder, FrameSource};
-use concat_media::{EncodeOptions, Encoder, FrameSink, Priority, RateMode, VideoCodec};
+use concat_media::{ColorRange, EncodeOptions, Encoder, FrameSink, Priority, RateMode, VideoCodec};
/// A file with more pixels than this gets a proxy: anything larger than
/// full HD.
@@ -49,13 +49,18 @@ pub fn size_for(width: u32, height: u32) -> (u32, u32) {
}
/// Where the proxy of `media` lives under `project`: named by the file's
-/// path, size and modification time. None for a file that cannot be
-/// stat'ed, which cannot be read either.
-pub fn path_for(project: &Path, media: &str) -> Option<PathBuf> {
+/// path, size and modification time, and by the range it is read as,
+/// since the copy is written from the corrected picture and a correction
+/// changed is a different copy. None for a file that cannot be stat'ed,
+/// which cannot be read either.
+pub fn path_for(project: &Path, media: &str, range: Option<ColorRange>) -> Option<PathBuf> {
let meta = std::fs::metadata(media).ok()?;
let mut hasher = std::collections::hash_map::DefaultHasher::new();
media.hash(&mut hasher);
meta.len().hash(&mut hasher);
+ if let Some(range) = range {
+ range.name().hash(&mut hasher);
+ }
if let Ok(modified) = meta.modified()
&& let Ok(since) = modified.duration_since(std::time::UNIX_EPOCH)
{
@@ -69,21 +74,28 @@ pub fn path_for(project: &Path, media: &str) -> Option<PathBuf> {
)
}
-/// The proxy of `media` under `project`, when it has been written.
-pub fn existing(project: &Path, media: &str) -> Option<PathBuf> {
- path_for(project, media).filter(|path| path.is_file())
+/// The proxy of `media` under `project`, read as `range`, when it has
+/// been written.
+pub fn existing(project: &Path, media: &str, range: Option<ColorRange>) -> Option<PathBuf> {
+ path_for(project, media, range).filter(|path| path.is_file())
}
-/// Sees to it that `media` - `width` by `height` - has a proxy when it
-/// is worth one: an existing copy is adopted into the reader pool at
-/// once; otherwise one is queued to be written on the proxy lane and
-/// adopted when done. Asking again while it is being written is free.
-/// Returns whether the file has, or will have, a proxy.
-pub fn ensure(project: &Path, media: &str, width: u32, height: u32) -> bool {
+/// Sees to it that `media` - `width` by `height`, read as `range` - has
+/// a proxy when it is worth one: an existing copy is adopted into the
+/// reader pool at once; otherwise one is queued to be written on the
+/// proxy lane and adopted when done. Asking again while it is being
+/// written is free. Returns whether the file has, or will have, a proxy.
+pub fn ensure(
+ project: &Path,
+ media: &str,
+ width: u32,
+ height: u32,
+ range: Option<ColorRange>,
+) -> bool {
if !wanted(width, height) {
return false;
}
- let Some(target) = path_for(project, media) else {
+ let Some(target) = path_for(project, media, range) else {
return false;
};
let pool = crate::scheduler().pool();
@@ -106,7 +118,7 @@ pub fn ensure(project: &Path, media: &str, width: u32, height: u32) -> bool {
let source = media.to_owned();
let size = size_for(width, height);
crate::scheduler().submit(Priority::Proxy, move || {
- match write(&source, &target, size) {
+ match write(&source, &target, size, range) {
Ok(()) => {
crate::scheduler()
.pool()
@@ -123,11 +135,17 @@ pub fn ensure(project: &Path, media: &str, width: u32, height: u32) -> bool {
true
}
-/// Writes the proxy of `source` at `size` to `target`: H.264, a fast
-/// preset, two threads, in software, into a temporary name that is moved
-/// into place only when whole, so a copy that is there is a copy that is
-/// complete.
-pub fn write(source: &str, target: &Path, (width, height): (u32, u32)) -> Result<(), String> {
+/// Writes the proxy of `source`, read as `range`, at `size` to `target`:
+/// H.264, a fast preset, two threads, in software, into a temporary name
+/// that is moved into place only when whole, so a copy that is there is a
+/// copy that is complete. The copy is tagged video range and converted to
+/// match, so it is read as it is and needs no correction of its own.
+pub fn write(
+ source: &str,
+ target: &Path,
+ (width, height): (u32, u32),
+ range: Option<ColorRange>,
+) -> Result<(), String> {
let info = concat_media::probe(source).map_err(|error| error.to_string())?;
let rate = info
.video
@@ -144,7 +162,8 @@ pub fn write(source: &str, target: &Path, (width, height): (u32, u32)) -> Result
let options = DecodeOptions::default()
.scaled_to(width, height)
.in_software()
- .threaded(2);
+ .threaded(2)
+ .in_range(range);
let mut decoder = Decoder::open(source, &options).map_err(|error| error.to_string())?;
let mut encoder = Encoder::create(
&partial,
@@ -160,6 +179,7 @@ pub fn write(source: &str, target: &Path, (width, height): (u32, u32)) -> Result
rate_mode: RateMode::Vbr,
bitrate_kbps: 0,
ten_bit: false,
+ color_range: ColorRange::Limited,
hardware: false,
threads: 2,
},
@@ -243,9 +263,9 @@ mod tests {
}
let project = dir.join("project");
let source = media.to_string_lossy().into_owned();
- assert!(ensure(&project, &source, 2560, 1440), "worth a proxy");
+ assert!(ensure(&project, &source, 2560, 1440, None), "worth a proxy");
crate::scheduler().drain();
- let proxy = existing(&project, &source).expect("the proxy was written");
+ let proxy = existing(&project, &source, None).expect("the proxy was written");
let info = concat_media::probe(&proxy).expect("probes");
let video = info.video.expect("has pictures");
assert_eq!((video.width, video.height), (960, 540));
@@ -255,7 +275,7 @@ mod tests {
Some(proxy.as_path())
);
// Second time round: nothing to write, still adopted.
- assert!(ensure(&project, &source, 2560, 1440));
+ assert!(ensure(&project, &source, 2560, 1440, None));
let time = FrameRate::THIRTY.time_of_frame(2);
let moving = pool
.frame(&concat_media::FrameRequest::new(&source, time, 480, 270).from_proxy(true))
@@ -266,7 +286,7 @@ mod tests {
.expect("reads the original");
assert_eq!((paused.width(), paused.height()), (480, 270));
// A file not worth a proxy is left alone.
- assert!(!ensure(&project, &source, 1280, 720));
+ assert!(!ensure(&project, &source, 1280, 720, None));
let _ = std::fs::remove_dir_all(&dir);
}
@@ -277,13 +297,18 @@ mod tests {
let media = dir.join("clip.mp4");
std::fs::write(&media, b"one").expect("writes");
let project = dir.join("project");
- let first = path_for(&project, &media.to_string_lossy()).expect("a path");
+ let first = path_for(&project, &media.to_string_lossy(), None).expect("a path");
assert!(first.starts_with(project.join("cache").join("proxy")));
- assert!(existing(&project, &media.to_string_lossy()).is_none());
+ assert!(existing(&project, &media.to_string_lossy(), None).is_none());
+ // Read as another range, the file is another proxy too: the copy
+ // holds the corrected picture.
+ let full =
+ path_for(&project, &media.to_string_lossy(), Some(ColorRange::Full)).expect("a path");
+ assert_ne!(first, full, "a file read as full range is another proxy");
std::fs::write(&media, b"one more byte").expect("writes");
- let second = path_for(&project, &media.to_string_lossy()).expect("a path");
+ let second = path_for(&project, &media.to_string_lossy(), None).expect("a path");
assert_ne!(first, second, "a changed file is another proxy");
- assert!(path_for(&project, &dir.join("missing.mp4").to_string_lossy()).is_none());
+ assert!(path_for(&project, &dir.join("missing.mp4").to_string_lossy(), None).is_none());
let _ = std::fs::remove_dir_all(&dir);
}
}
diff --git a/src/crates/concat-host/tests/export.rs b/src/crates/concat-host/tests/export.rs
index 48809c93..a13a6a92 100644
--- a/src/crates/concat-host/tests/export.rs
+++ b/src/crates/concat-host/tests/export.rs
@@ -46,8 +46,8 @@ use concat_media::{
use concat_project::animation;
use concat_project::commands::{ClipMove, ClipPatch, Command, TrackFlag, TrimEdge};
use concat_project::model::{
- AnimationSlot, AppliedFilter, ClipAnimation, Crop, KeyEase, KeyProperty, SpeedPoint, TextStyle,
- Transition, VideoSettings,
+ AnimationSlot, AppliedFilter, ClipAnimation, ColorRange, Crop, KeyEase, KeyProperty,
+ SpeedPoint, TextStyle, Transition, VideoSettings,
};
/// The sample rate every source and every export carries.
@@ -92,6 +92,7 @@ fn picture(path: &Path, rate: FrameRate, seconds: u32) {
rate_mode: RateMode::Vbr,
bitrate_kbps: 0,
ten_bit: false,
+ color_range: concat_media::ColorRange::Limited,
hardware: false,
threads: 0,
};
@@ -389,6 +390,9 @@ struct Studio {
titles: Titles,
exports: PathBuf,
count: usize,
+ /// The range the next export is written in; video range, as the
+ /// sheet's default is, unless a test says otherwise.
+ range: concat_media::ColorRange,
}
impl Studio {
@@ -410,6 +414,7 @@ impl Studio {
titles: Titles::new(&AppDirs::under(&root.join("app"))),
exports,
count: 0,
+ range: concat_media::ColorRange::Limited,
}
}
@@ -501,6 +506,7 @@ impl Studio {
ten_bit: false,
rate_mode: RateMode::Vbr,
bitrate_kbps: 0,
+ color_range: self.range,
};
let titles = self
.titles
@@ -612,6 +618,73 @@ fn one_clip_exports_whole_at_every_rate() {
}
}
+/// Issue #103: the levels a file is read as reach the export. A source
+/// written video range reads as it is by default; told it is full range,
+/// its levels expand and the colour of a second is no longer the colour
+/// of that second; named limited, or cleared, it reads true again. And an
+/// export written full range is tagged so and plays its seconds back
+/// true, because the tag the encoder wrote is the tag the decoder reads.
+/// https://github.com/jub0t/Concat/issues/103
+#[test]
+fn a_colour_range_named_on_the_media_reaches_the_export() {
+ let scratch = Scratch::new("range");
+ let sources = Sources::make(scratch.path());
+ let mut studio = Studio::new(scratch.path(), "Range", video(WIDTH, HEIGHT, 30, 1));
+ let peek = studio.import(&sources.peek);
+ studio.apply(Command::AddClipAtFirstFree {
+ media_id: peek.clone(),
+ start: 0.0,
+ });
+
+ let as_tagged = studio.export("as tagged");
+ as_tagged.expect_second(0.5, 0);
+ as_tagged.expect_second(3.5, 3);
+ let tagged_colour = as_tagged.colour_at(3.5);
+
+ // Told the file is full range when it is not: every level moves away
+ // from the middle, so the colour of the second is no longer the colour
+ // of the second. The file is unchanged; only its reading is.
+ studio.apply(Command::SetMediaColorRange {
+ media_id: peek.clone(),
+ range: Some(ColorRange::Full),
+ });
+ let stretched = studio.export("read as full range");
+ stretched.expect_length(6.0);
+ let stretched_colour = stretched.colour_at(3.5);
+ assert!(
+ stretched_colour
+ .iter()
+ .zip(tagged_colour.iter())
+ .any(|(now, was)| now.abs_diff(*was) > 8),
+ "reading a video-range file as full range moves its levels: \
+ {tagged_colour:?} read as tagged, {stretched_colour:?} read as full"
+ );
+
+ // Named what it really is, the picture is what the tag gave.
+ studio.apply(Command::SetMediaColorRange {
+ media_id: peek.clone(),
+ range: Some(ColorRange::Limited),
+ });
+ studio.export("read as limited").expect_second(3.5, 3);
+
+ // Cleared, the tag is read again.
+ studio.apply(Command::SetMediaColorRange {
+ media_id: peek,
+ range: None,
+ });
+ studio.export("as tagged again").expect_second(3.5, 3);
+
+ // Written full range: still the seconds it was, read back through the
+ // tag it carries.
+ studio.range = concat_media::ColorRange::Full;
+ let full = studio.export("written full range");
+ full.expect_length(6.0);
+ full.expect_sound(6.0);
+ full.expect_second(0.5, 0);
+ full.expect_second(3.5, 3);
+ full.expect_second(5.9, 5);
+}
+
/// Issue #108: two clips on one track, one of them a 60 fps screen
/// recording with sound, export - and so does everything a person does to
/// them afterwards.
diff --git a/src/crates/concat-media/src/decode.rs b/src/crates/concat-media/src/decode.rs
index 36bbf28a..b55b3342 100644
--- a/src/crates/concat-media/src/decode.rs
+++ b/src/crates/concat-media/src/decode.rs
@@ -125,6 +125,13 @@ pub struct DecodeOptions {
/// A device that fails is never an error: the reader carries on in
/// software. See [`crate::hardware`].
pub hardware: HwPolicy,
+ /// What the picture's levels are taken to be, over whatever the file
+ /// says: for a file tagged wrong, or tagged nothing and holding the
+ /// other range, which is how a screen recording ends up grey where
+ /// it should be black. `None` reads the file's tag and, where there
+ /// is none, takes video range the way a player does. See
+ /// [`ColorRange`].
+ pub color_range: Option<ColorRange>,
}
impl DecodeOptions {
@@ -196,6 +203,86 @@ impl DecodeOptions {
self.hardware = HwPolicy::Software;
self
}
+
+ /// Reads the picture as `range`, whatever the file says; `None` goes
+ /// back to the file's tag. See [`DecodeOptions::color_range`].
+ pub fn in_range(mut self, range: Option<ColorRange>) -> Self {
+ self.color_range = range;
+ self
+ }
+}
+
+/// The levels a picture's numbers span: video range, black at 16 and
+/// white at 235 of 255, which is what broadcast, cameras and every
+/// player expect; or full range, 0 to 255, which screen recorders and
+/// some phones write. A file tagged the wrong one, or tagged nothing and
+/// holding the other, shows grey where it should show black or clips
+/// its shadows and highlights: the washed-out or crushed picture.
+/// https://github.com/jub0t/Concat/issues/103
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Default)]
+pub enum ColorRange {
+ /// 16-235: "tv", "MPEG", "video" or "limited" range. The default
+ /// everywhere, and what an export writes unless told otherwise.
+ #[default]
+ Limited,
+ /// 0-255: "pc", "JPEG" or "full" range.
+ Full,
+}
+
+impl ColorRange {
+ /// Every range, in the order a menu lists them.
+ pub const ALL: [ColorRange; 2] = [ColorRange::Limited, ColorRange::Full];
+
+ /// The name a document or a request stores.
+ pub fn name(self) -> &'static str {
+ match self {
+ ColorRange::Limited => "limited",
+ ColorRange::Full => "full",
+ }
+ }
+
+ /// The range a stored name means, or `None` for one nobody stores.
+ pub fn parse(name: &str) -> Option<Self> {
+ match name.trim().to_ascii_lowercase().as_str() {
+ "limited" | "tv" | "video" | "mpeg" => Some(ColorRange::Limited),
+ "full" | "pc" | "jpeg" => Some(ColorRange::Full),
+ _ => None,
+ }
+ }
+
+ /// What the standard is called on a label.
+ pub fn label(self) -> &'static str {
+ match self {
+ ColorRange::Limited => "Limited",
+ ColorRange::Full => "Full",
+ }
+ }
+
+ /// libavcodec's spelling.
+ pub fn as_ffmpeg(self) -> ffmpeg::color::Range {
+ match self {
+ ColorRange::Limited => ffmpeg::color::Range::MPEG,
+ ColorRange::Full => ffmpeg::color::Range::JPEG,
+ }
+ }
+
+ /// libavcodec's spelling read back: `None` for a stream that says
+ /// nothing, or something neither of these.
+ pub fn from_ffmpeg(range: ffmpeg::color::Range) -> Option<Self> {
+ match range {
+ ffmpeg::color::Range::MPEG => Some(ColorRange::Limited),
+ ffmpeg::color::Range::JPEG => Some(ColorRange::Full),
+ _ => None,
+ }
+ }
+
+ /// The `scale` filter's word for it.
+ fn scale_name(self) -> &'static str {
+ match self {
+ ColorRange::Limited => "tv",
+ ColorRange::Full => "pc",
+ }
+ }
}
/// How a stream says its colour is encoded: the tags in its container,
@@ -292,10 +379,18 @@ fn video_filter(
if let Some(pre) = &options.pre_chain {
parts.push(pre.clone());
}
- let convert = color
- .filter(|signal| signal.is_wide())
- .map(|signal| signal.bt709_args())
- .unwrap_or_default();
+ // A wide or HDR picture is converted whole, its range among the terms.
+ // A BT.709 one is left to swscale's reading of the frames' own tag,
+ // unless the caller has said what the levels really are: then the
+ // range is named and the tag ignored, which is the whole of the fix
+ // for a file that lies about it.
+ let convert = match color {
+ Some(signal) if signal.is_wide() => signal.bt709_args(),
+ _ => options
+ .color_range
+ .map(|range| format!(":in_range={}", range.scale_name()))
+ .unwrap_or_default(),
+ };
parts.push(format!("scale={width}:{height}:flags=bilinear{convert}"));
if let Some(chain) = &options.filter_chain {
parts.push(chain.clone());
@@ -395,7 +490,11 @@ impl Decoder {
primaries: decoder.color_primaries(),
transfer: decoder.color_transfer_characteristic(),
matrix: decoder.color_space(),
- range: decoder.color_range(),
+ // The caller's word over the file's, where the caller has one:
+ // the file's tag is what the override exists to correct.
+ range: options
+ .color_range
+ .map_or_else(|| decoder.color_range(), ColorRange::as_ffmpeg),
};
let (width, height) = match options.size {
@@ -931,6 +1030,64 @@ mod tests {
);
}
+ /// A range the caller names is the range the picture is read as: on
+ /// an SDR file it is the one term added to the fit, on a wide one it
+ /// replaces the file's tag among the conversion's terms, and with no
+ /// override nothing is said and the frames' own tag decides.
+ /// https://github.com/jub0t/Concat/issues/103
+ #[test]
+ fn a_named_range_overrides_the_files_tag() {
+ use ffmpeg::color::{Primaries, Range, Space, TransferCharacteristic as Transfer};
+ let sdr = ColorSignal {
+ primaries: Primaries::BT709,
+ transfer: Transfer::BT709,
+ matrix: Space::BT709,
+ range: Range::MPEG,
+ };
+ let full = DecodeOptions::default()
+ .scaled_to(640, 360)
+ .in_range(Some(ColorRange::Full));
+ assert_eq!(
+ video_filter(0, &full, 640, 360, Some(&sdr)),
+ "scale=640:360:flags=bilinear:in_range=pc,format=rgba"
+ );
+ let limited = DecodeOptions::default()
+ .scaled_to(640, 360)
+ .in_range(Some(ColorRange::Limited));
+ assert_eq!(
+ video_filter(0, &limited, 640, 360, Some(&sdr)),
+ "scale=640:360:flags=bilinear:in_range=tv,format=rgba"
+ );
+ let untold = DecodeOptions::default().scaled_to(640, 360);
+ assert_eq!(
+ video_filter(0, &untold, 640, 360, Some(&sdr)),
+ "scale=640:360:flags=bilinear,format=rgba",
+ "with no override the filter says nothing about range"
+ );
+ // On a wide picture the override has already replaced the signal's
+ // range by the time the filter is built; the filter reads the
+ // signal it is given.
+ let hdr_full = ColorSignal {
+ primaries: Primaries::BT2020,
+ transfer: Transfer::SMPTE2084,
+ matrix: Space::BT2020NCL,
+ range: ColorRange::Full.as_ffmpeg(),
+ };
+ assert!(
+ video_filter(0, &full, 640, 360, Some(&hdr_full)).contains(":in_range=pc:"),
+ "a wide picture carries the range among its conversion terms"
+ );
+ assert_eq!(ColorRange::parse("PC"), Some(ColorRange::Full));
+ assert_eq!(ColorRange::parse("video"), Some(ColorRange::Limited));
+ assert_eq!(ColorRange::parse("wide"), None);
+ assert_eq!(ColorRange::from_ffmpeg(Range::JPEG), Some(ColorRange::Full));
+ assert_eq!(ColorRange::from_ffmpeg(Range::Unspecified), None);
+ for range in ColorRange::ALL {
+ assert_eq!(ColorRange::parse(range.name()), Some(range));
+ assert_eq!(ColorRange::from_ffmpeg(range.as_ffmpeg()), Some(range));
+ }
+ }
+
/// A PQ-tagged ten-bit HEVC file, made with the encoder's own machinery,
/// decodes through the tone-map to frames that are neither the black
/// nor the blown-out white a curve mismatch gives.
@@ -950,6 +1107,7 @@ mod tests {
rate_mode: RateMode::Vbr,
bitrate_kbps: 0,
ten_bit: true,
+ color_range: ColorRange::Limited,
hardware: false,
threads: 0,
};
diff --git a/src/crates/concat-media/src/encode.rs b/src/crates/concat-media/src/encode.rs
index e7256f49..b4b01d30 100644
--- a/src/crates/concat-media/src/encode.rs
+++ b/src/crates/concat-media/src/encode.rs
@@ -13,6 +13,7 @@ use ffmpeg_the_third::format::{self, Pixel};
use ffmpeg_the_third::software::scaling;
use ffmpeg_the_third::util::frame::video::Video;
+use crate::decode::ColorRange;
use crate::error::{Error, Result};
use crate::ffi;
@@ -168,6 +169,13 @@ pub struct EncodeOptions {
/// gradient, at a few percent more file. H.264 at ten bits plays on
/// less than HEVC or AV1 at ten bits do.
pub ten_bit: bool,
+ /// The levels the file is written in and tagged with: video range,
+ /// 16-235, which every player and YouTube expect, or full range,
+ /// 0-255, for screen content bound for a PC player that reads the
+ /// tag. The RGB to YUV conversion follows the choice, so the tag is
+ /// true either way. Video range unless told otherwise.
+ /// https://github.com/jub0t/Concat/issues/103
+ pub color_range: ColorRange,
/// Let the platform's hardware encoder lead where there is one; see
/// [`VideoCodec::encoders`].
pub hardware: bool,
@@ -186,6 +194,7 @@ impl Default for EncodeOptions {
rate_mode: RateMode::Vbr,
bitrate_kbps: 0,
ten_bit: false,
+ color_range: ColorRange::Limited,
hardware: true,
threads: 0,
}
@@ -244,6 +253,9 @@ pub struct Encoder {
finished: bool,
/// Which FFmpeg encoder took the job.
encoder_name: &'static str,
+ /// The range every converted frame is stamped with, matching the
+ /// stream's tag and the scaler's conversion.
+ color_range: ffmpeg::color::Range,
}
impl Encoder {
@@ -336,7 +348,10 @@ impl Encoder {
video.set_frame_rate(Some(rate));
let (primaries, transfer, matrix) = tags;
video.set_colorspace(matrix);
- video.set_color_range(ffmpeg::color::Range::MPEG);
+ // The range the frames will be converted to below, so the tag is
+ // true; VideoToolbox reads it to pick its full- or video-range
+ // pixel format, the software encoders write it into the stream.
+ video.set_color_range(options.color_range.as_ffmpeg());
// SAFETY: `video` owns a live AVCodecContext; primaries and
// transfer have no setter in the bindings, and all three are plain
// fields the encoder reads at open.
@@ -445,9 +460,10 @@ impl Encoder {
scaling::Flags::BILINEAR,
)
.map_err(|error| ffi::fail("scaler", path, error))?;
- // BT.709 coefficients from full-range RGB to video-range YUV,
- // rather than swscale's BT.601 default: the file says 709, so the
- // numbers in it are 709.
+ // BT.709 coefficients from full-range RGB to YUV in the range the
+ // file is tagged with, rather than swscale's BT.601 default: the
+ // file says 709, so the numbers in it are 709, and it says which
+ // range, so the numbers span that range.
// SAFETY: `scaler` owns a live SwsContext; the coefficient tables
// are static and the call only sets fields on the context.
unsafe {
@@ -457,7 +473,7 @@ impl Encoder {
coefficients,
1,
coefficients,
- 0,
+ i32::from(options.color_range == ColorRange::Full),
0,
1 << 16,
1 << 16,
@@ -476,6 +492,7 @@ impl Encoder {
written: 0,
finished: false,
encoder_name,
+ color_range: options.color_range.as_ffmpeg(),
})
}
@@ -549,6 +566,13 @@ impl FrameSink for Encoder {
.run(&rgba, &mut converted)
.map_err(|error| ffi::fail("convert", &self.path, error))?;
converted.set_pts(Some(self.written as i64));
+ // The frame says what its numbers span, the same as the stream
+ // does: a hardware encoder reads it off the frame.
+ // SAFETY: `converted` is a live frame the scaler just filled; the
+ // range is a plain field the encoder reads with the picture.
+ unsafe {
+ (*converted.as_mut_ptr()).color_range = self.color_range.into();
+ }
self.encoder
.send_frame(&converted)
@@ -654,7 +678,8 @@ mod tests {
/// reader, not just this crate's own decoder, counts by).
#[test]
fn every_written_frame_decodes_back_even_at_a_rate_with_no_last_neighbour() {
- let dir = std::env::temp_dir().join(format!("concat-media-encode-test-{}", std::process::id()));
+ let dir =
+ std::env::temp_dir().join(format!("concat-media-encode-test-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&dir);
std::fs::create_dir_all(&dir).expect("scratch dir");
let path = dir.join("150-at-25fps.mp4");
@@ -666,6 +691,7 @@ mod tests {
rate_mode: RateMode::Vbr,
bitrate_kbps: 0,
ten_bit: false,
+ color_range: ColorRange::Limited,
hardware: false,
threads: 0,
};
@@ -733,6 +759,7 @@ mod tests {
ffmpeg::color::TransferCharacteristic,
ffmpeg::color::Space,
Pixel,
+ ffmpeg::color::Range,
) {
let input = ffmpeg::format::input(path).expect("opens");
let stream = input
@@ -752,6 +779,7 @@ mod tests {
decoder.color_transfer_characteristic(),
decoder.color_space(),
decoder.format(),
+ decoder.color_range(),
)
}
@@ -778,6 +806,7 @@ mod tests {
rate_mode: RateMode::Vbr,
bitrate_kbps: 0,
ten_bit,
+ color_range: ColorRange::Limited,
hardware: true,
threads: 0,
};
@@ -790,12 +819,13 @@ mod tests {
}
encoder.finish().expect("finishes");
- let (name, tag, primaries, transfer, space, format) = tags_of(&path);
+ let (name, tag, primaries, transfer, space, format, range) = tags_of(&path);
let _ = std::fs::remove_file(&path);
assert_eq!(name, codec.name(), "the stream's codec");
assert_eq!(primaries, ffmpeg::color::Primaries::BT709);
assert_eq!(transfer, ffmpeg::color::TransferCharacteristic::BT709);
assert_eq!(space, ffmpeg::color::Space::BT709);
+ assert_eq!(range, ffmpeg::color::Range::MPEG, "video range by default");
let deep = matches!(format, Pixel::YUV420P10LE | Pixel::P010LE);
assert_eq!(deep, ten_bit, "{} bit depth ({format:?})", codec.label());
if codec == VideoCodec::Hevc {
@@ -805,6 +835,72 @@ mod tests {
}
}
+ /// A file written full range says so, and its levels come back as
+ /// they went in - as do a video-range file's. The decoder reads the
+ /// tag the encoder wrote, so a black that comes back black in both
+ /// is a conversion that matched its tag in both.
+ /// https://github.com/jub0t/Concat/issues/103
+ #[test]
+ fn each_range_is_tagged_and_keeps_its_levels() {
+ use crate::decode::{DecodeOptions, Decoder, FrameSource};
+ const GREYS: [u8; 4] = [0, 64, 128, 255];
+ for range in ColorRange::ALL {
+ let path =
+ std::env::temp_dir().join(format!("concat-encode-range-{}.mp4", range.name()));
+ let options = EncodeOptions {
+ preset: "ultrafast".to_owned(),
+ // Near-lossless, so a level is a level and not a quantiser's
+ // guess at one; software, so the numbers are swscale's own.
+ crf: 1,
+ color_range: range,
+ hardware: false,
+ ..EncodeOptions::default()
+ };
+ let mut encoder = Encoder::create(&path, 64, 64, FrameRate::THIRTY, &options)
+ .expect("the linked FFmpeg encodes h264");
+ for grey in GREYS {
+ let mut frame = Frame::black(64, 64);
+ frame.fill([grey, grey, grey, 255]);
+ for _ in 0..3 {
+ encoder.write_frame(&frame).expect("writes");
+ }
+ }
+ encoder.finish().expect("finishes");
+
+ let (.., tagged) = tags_of(&path);
+ assert_eq!(
+ tagged,
+ range.as_ffmpeg(),
+ "{}: the file says its range",
+ range.name()
+ );
+
+ let mut decoder =
+ Decoder::open(&path, &DecodeOptions::default().in_software()).expect("opens");
+ let mut frames = Vec::new();
+ while let Some(frame) = decoder.next_frame().expect("decodes") {
+ frames.push(frame);
+ }
+ let _ = std::fs::remove_file(&path);
+ assert_eq!(
+ frames.len(),
+ GREYS.len() * 3,
+ "{}: every frame",
+ range.name()
+ );
+ for (index, grey) in GREYS.iter().enumerate() {
+ let [r, g, b, _] = frames[index * 3 + 1].pixel(32, 32).expect("inside");
+ for channel in [r, g, b] {
+ assert!(
+ channel.abs_diff(*grey) <= 4,
+ "{}: grey {grey} came back as {channel}",
+ range.name()
+ );
+ }
+ }
+ }
+ }
+
#[test]
fn a_wrong_sized_frame_is_rejected() {
let path = std::env::temp_dir().join("concat-encode-size-test.mp4");
diff --git a/src/crates/concat-media/src/lib.rs b/src/crates/concat-media/src/lib.rs
index c81160b9..74dc488d 100644
--- a/src/crates/concat-media/src/lib.rs
+++ b/src/crates/concat-media/src/lib.rs
@@ -26,7 +26,7 @@ pub mod probe;
pub mod samples;
pub mod treat;
-pub use decode::{ColorSignal, DecodeOptions, Decoder, FrameSource, SeekableSource};
+pub use decode::{ColorRange, ColorSignal, DecodeOptions, Decoder, FrameSource, SeekableSource};
pub use encode::{EncodeOptions, Encoder, FrameSink, RateMode, VideoCodec, jpeg};
pub use error::{Error, Result};
pub use ffi::{init, linked_version};
diff --git a/src/crates/concat-media/src/pool.rs b/src/crates/concat-media/src/pool.rs
index 3f0e9dc7..216f5172 100644
--- a/src/crates/concat-media/src/pool.rs
+++ b/src/crates/concat-media/src/pool.rs
@@ -45,7 +45,7 @@ use std::sync::{Arc, Mutex};
use concat_core::frame::Frame;
use concat_core::time::{FrameRate, Rational};
-use crate::decode::{DecodeOptions, Decoder, FrameSource, SeekableSource};
+use crate::decode::{ColorRange, DecodeOptions, Decoder, FrameSource, SeekableSource};
use crate::error::Result;
use crate::probe;
@@ -78,6 +78,10 @@ pub struct FrameRequest {
/// Read the file's proxy where it has one; see
/// [`ReaderPool::adopt_proxy`].
pub proxy: bool,
+ /// The levels the file is read as, over its own tag; `None` reads the
+ /// tag. See [`DecodeOptions::color_range`]. Never applied to a proxy:
+ /// a proxy was written from the corrected picture and tagged true.
+ pub range: Option<ColorRange>,
}
impl FrameRequest {
@@ -93,9 +97,17 @@ impl FrameRequest {
pre: None,
chain: None,
proxy: false,
+ range: None,
}
}
+ /// Reads the file as `range`, whatever it says. See
+ /// [`FrameRequest::range`].
+ pub fn in_range(mut self, range: Option<ColorRange>) -> Self {
+ self.range = range;
+ self
+ }
+
/// Marks the file an image. See [`FrameRequest::still`].
pub fn as_still(mut self, still: bool) -> Self {
self.still = still;
@@ -141,6 +153,9 @@ struct SourceKey {
width: u32,
height: u32,
index: i64,
+ /// The range the file was read as: the same frame read as full and
+ /// as video range is two different pictures.
+ range: Option<ColorRange>,
}
/// A treated frame's identity: the source frame and what was done to it.
@@ -308,6 +323,7 @@ impl Reader {
height: u32,
chain: Option<&str>,
pre: Option<&str>,
+ range: Option<ColorRange>,
rate: FrameRate,
still: bool,
index: i64,
@@ -317,7 +333,8 @@ impl Reader {
// or before the target and the pull rolls forward from there.
let mut options = DecodeOptions::default()
.starting_at(rate.time_of_frame(index))
- .scaled_to(width, height);
+ .scaled_to(width, height)
+ .in_range(range);
if still {
// One frame, served for every time, and never sought: a seek
// on a single-image JPEG leaves FFmpeg's image demuxer with
@@ -393,7 +410,14 @@ impl MediaFacts {
}
/// One reader's identity: the file, the decode size, the baked chains.
-type ReaderKey = (PathBuf, u32, u32, Option<String>, Option<String>);
+type ReaderKey = (
+ PathBuf,
+ u32,
+ u32,
+ Option<String>,
+ Option<String>,
+ Option<ColorRange>,
+);
/// The warm readers and their recency, behind one short lock. A reader is
/// found here and then used outside this lock, under its own, so a decode
@@ -654,6 +678,9 @@ impl ReaderPool {
Some(size) if !facts.still => level_for(size, request.cover),
_ => even(request.cover.0, request.cover.1),
};
+ // A proxy is read as it is tagged: it was written from the
+ // corrected picture, so the correction applied twice would undo it.
+ let range = (path == request.path).then_some(request.range).flatten();
Ok((
facts,
SourceKey {
@@ -661,6 +688,7 @@ impl ReaderPool {
width,
height,
index,
+ range,
},
))
}
@@ -733,6 +761,7 @@ impl ReaderPool {
still: bool,
chain: Option<&str>,
pre: Option<&str>,
+ range: Option<ColorRange>,
) -> Result<Arc<Frame>> {
let chain = chain.filter(|chain| !chain.trim().is_empty());
let pre = pre.filter(|pre| !pre.trim().is_empty());
@@ -743,6 +772,7 @@ impl ReaderPool {
width,
height,
index,
+ range,
};
if chain.is_none() && pre.is_none() {
return self.source_frame(&facts, &source_key);
@@ -772,7 +802,7 @@ impl ReaderPool {
self.remember_treated(key, Arc::clone(&frame));
return Ok(frame);
}
- let shared = self.reader(path, width, height, chain, pre, &facts, index)?;
+ let shared = self.reader(path, width, height, chain, pre, range, &facts, index)?;
let mut reader = shared.lock().map_err(|_| crate::error::Error::NoFrame {
path: path.to_path_buf(),
})?;
@@ -807,7 +837,9 @@ impl ReaderPool {
self.remember_source(key.clone(), Arc::clone(&frame));
return Ok(frame);
}
- let shared = self.reader(path, key.width, key.height, None, None, facts, key.index)?;
+ let shared = self.reader(
+ path, key.width, key.height, None, None, key.range, facts, key.index,
+ )?;
let mut reader = shared.lock().map_err(|_| crate::error::Error::NoFrame {
path: path.to_path_buf(),
})?;
@@ -968,6 +1000,7 @@ impl ReaderPool {
height: u32,
chain: Option<&str>,
pre: Option<&str>,
+ range: Option<ColorRange>,
facts: &MediaFacts,
target: i64,
) -> Result<Arc<Mutex<Reader>>> {
@@ -977,6 +1010,7 @@ impl ReaderPool {
height,
chain.map(str::to_owned),
pre.map(str::to_owned),
+ range,
);
{
let mut readers = self
@@ -1001,6 +1035,7 @@ impl ReaderPool {
height,
chain,
pre,
+ range,
facts.rate,
facts.still,
target,
@@ -1107,6 +1142,7 @@ pub(crate) mod tests {
width: 2,
height: 2,
index,
+ range: None,
};
cache.insert(key(0), Arc::new(Frame::black(2, 2)));
cache.insert(key(1), Arc::new(Frame::black(2, 2)));
@@ -1134,7 +1170,7 @@ pub(crate) mod tests {
first.fill([255, 0, 0, 255]);
pool.hold_still(path, Arc::new(first));
let same = pool
- .frame_at(path, Rational::ZERO, 64, 32, true, None, None)
+ .frame_at(path, Rational::ZERO, 64, 32, true, None, None, None)
.expect("its own size");
assert_eq!((same.width(), same.height()), (64, 32));
assert_eq!(&same.pixels()[..4], &[255, 0, 0, 255]);
@@ -1165,6 +1201,7 @@ pub(crate) mod tests {
width: 2,
height: 2,
index: 0,
+ range: None,
},
Arc::new(Frame::black(2, 2)),
);
@@ -1205,7 +1242,16 @@ pub(crate) mod tests {
let rate = FrameRate::THIRTY;
let red_at = |pool: &ReaderPool, index: i64| -> i64 {
let frame = pool
- .frame_at(&path, rate.time_of_frame(index), 64, 64, false, None, None)
+ .frame_at(
+ &path,
+ rate.time_of_frame(index),
+ 64,
+ 64,
+ false,
+ None,
+ None,
+ None,
+ )
.expect("frame decodes");
i64::from(frame.pixel(32, 32).expect("in bounds")[0])
};
diff --git a/src/crates/concat-media/src/probe.rs b/src/crates/concat-media/src/probe.rs
index ba4744db..54a38492 100644
--- a/src/crates/concat-media/src/probe.rs
+++ b/src/crates/concat-media/src/probe.rs
@@ -8,6 +8,7 @@ use std::path::{Path, PathBuf};
use concat_core::time::{FrameRate, Rational};
use ffmpeg_the_third as ffmpeg;
+use crate::decode::ColorRange;
use crate::error::{Error, Result};
use crate::ffi;
@@ -25,6 +26,10 @@ pub struct VideoStream {
pub height: u32,
/// Average frame rate, exact.
pub frame_rate: FrameRate,
+ /// The levels the stream says its numbers span, or `None` where it
+ /// says nothing - which a player then takes for video range. What a
+ /// person compares the picture against when it looks washed out.
+ pub color_range: Option<ColorRange>,
}
/// What an audio stream looks like.
@@ -168,12 +173,16 @@ fn video_stream(stream: &ffmpeg::format::stream::Stream<'_>, path: &Path) -> Res
detail: "video stream has no usable frame rate".to_owned(),
})?;
+ // SAFETY: the parameters are live for as long as `stream` is, and the
+ // range is a plain field libavformat filled from the container.
+ let range = unsafe { (*parameters.as_ptr()).color_range };
Ok(VideoStream {
index: stream.index() as u32,
codec: parameters.id().name().to_owned(),
width,
height,
frame_rate: FrameRate::new(frame_rate),
+ color_range: ColorRange::from_ffmpeg(ffmpeg::color::Range::from(range)),
})
}
diff --git a/src/crates/concat-perf/src/main.rs b/src/crates/concat-perf/src/main.rs
index 8c255170..8d02454c 100644
--- a/src/crates/concat-perf/src/main.rs
+++ b/src/crates/concat-perf/src/main.rs
@@ -620,8 +620,11 @@ fn compose_plan() -> FramePlan {
offset_x: 0.1,
..Transform::default()
};
- placed.effects = concat_effects::Catalogue::builtin()
- .shader_passes_at(&[AppliedFilter::new("concat.sepia")], 0.0, None);
+ placed.effects = concat_effects::Catalogue::builtin().shader_passes_at(
+ &[AppliedFilter::new("concat.sepia")],
+ 0.0,
+ None,
+ );
plan.layers.push(placed);
let mut small = PlannedLayer::picture(
concat_render::detached_clip(),
@@ -712,6 +715,7 @@ fn export(media: &Media) -> Measure {
ten_bit: false,
rate_mode: concat_media::RateMode::Vbr,
bitrate_kbps: 0,
+ color_range: concat_media::ColorRange::Limited,
};
let request = concat_host::export::request(&session, &spec, Vec::new());
let cancel = AtomicBool::new(false);
diff --git a/src/crates/concat-project/src/commands/clips.rs b/src/crates/concat-project/src/commands/clips.rs
index 1fba3831..5051cd60 100644
--- a/src/crates/concat-project/src/commands/clips.rs
+++ b/src/crates/concat-project/src/commands/clips.rs
@@ -344,6 +344,7 @@ pub(super) fn apply(
has_audio: item.has_audio,
audio_tracks: item.audio_tracks,
placeholder: false,
+ color_range: None,
extra: Default::default(),
});
id
@@ -423,6 +424,7 @@ pub(super) fn apply(
has_audio: false,
audio_tracks: Vec::new(),
placeholder: false,
+ color_range: None,
extra: Default::default(),
});
id
diff --git a/src/crates/concat-project/src/commands/media.rs b/src/crates/concat-project/src/commands/media.rs
index 3216a524..bc153387 100644
--- a/src/crates/concat-project/src/commands/media.rs
+++ b/src/crates/concat-project/src/commands/media.rs
@@ -39,6 +39,7 @@ pub(super) fn apply(
has_audio: item.has_audio,
audio_tracks: item.audio_tracks,
placeholder: false,
+ color_range: None,
extra: Default::default(),
});
Ok(Outcome {
@@ -171,6 +172,18 @@ pub(super) fn apply(
})
}
+ Command::SetMediaColorRange { media_id, range } => {
+ let applied = project
+ .media
+ .iter_mut()
+ .find(|item| item.id == media_id)
+ .is_some_and(|item| assign(&mut item.color_range, range));
+ Ok(Outcome {
+ created_id: None,
+ applied,
+ })
+ }
+
_ => unreachable!("commands::apply routes only this module's commands here"),
}
}
diff --git a/src/crates/concat-project/src/commands/mod.rs b/src/crates/concat-project/src/commands/mod.rs
index 33e4e42f..adf3a642 100644
--- a/src/crates/concat-project/src/commands/mod.rs
+++ b/src/crates/concat-project/src/commands/mod.rs
@@ -13,9 +13,9 @@ use std::sync::Arc;
use serde::{Deserialize, Serialize};
use crate::model::{
- AnimationSlot, AppliedFilter, AudioTrack, Clip, ClipAnimation, ClipKind, Crop, CustomFont,
- Cutout, CutoutMode, KeyEase, KeyProperty, MediaItem, MediaKind, Project, SpeedPoint, Stroke,
- TextStyle, Timeline, Track, Transition, VideoSettings,
+ AnimationSlot, AppliedFilter, AudioTrack, Clip, ClipAnimation, ClipKind, ColorRange, Crop,
+ CustomFont, Cutout, CutoutMode, KeyEase, KeyProperty, MediaItem, MediaKind, Project,
+ SpeedPoint, Stroke, TextStyle, Timeline, Track, Transition, VideoSettings,
};
mod audio;
@@ -666,6 +666,20 @@ pub enum Command {
/// The new absolute path on disk.
new_path: String,
},
+ /// Says what levels a media file's picture really spans, over whatever
+ /// the file claims: the fix for a screen recording written full range
+ /// and tagged nothing, which plays grey where it should be black, or a
+ /// video-range file tagged full, which crushes its shadows. Reaches
+ /// every clip of the media, on every timeline, in the monitor and the
+ /// export alike. An unknown id is a no-op.
+ /// https://github.com/jub0t/Concat/issues/103
+ SetMediaColorRange {
+ /// The bin item.
+ media_id: String,
+ /// `limited` or `full`, or None to go back to reading the file's
+ /// own tag.
+ range: Option<ColorRange>,
+ },
}
/// What a command produced, beyond the new state: the ids it minted, so the
@@ -996,7 +1010,8 @@ pub fn apply(
| Command::RemoveMedia { .. }
| Command::AddFont { .. }
| Command::RemoveFont { .. }
- | Command::UpdateMediaPath { .. }) => media::apply(project, mint, command),
+ | Command::UpdateMediaPath { .. }
+ | Command::SetMediaColorRange { .. }) => media::apply(project, mint, command),
command @ (Command::AddClip { .. }
| Command::AddClipAtFirstFree { .. }
| Command::AddTextClip { .. }
diff --git a/src/crates/concat-project/src/lib.rs b/src/crates/concat-project/src/lib.rs
index fed73fe3..0351db5c 100644
--- a/src/crates/concat-project/src/lib.rs
+++ b/src/crates/concat-project/src/lib.rs
@@ -2186,6 +2186,34 @@ mod tests {
}
));
+ // A colour range is one of two words, or null to read the tag.
+ let full: Command = serde_json::from_value(json!({
+ "op": "setMediaColorRange", "mediaId": "m1", "range": "full"
+ }))
+ .expect("parses");
+ assert!(matches!(
+ full,
+ Command::SetMediaColorRange {
+ range: Some(crate::model::ColorRange::Full),
+ ..
+ }
+ ));
+ let tagged: Command = serde_json::from_value(json!({
+ "op": "setMediaColorRange", "mediaId": "m1", "range": null
+ }))
+ .expect("parses");
+ assert!(matches!(
+ tagged,
+ Command::SetMediaColorRange { range: None, .. }
+ ));
+ assert!(
+ serde_json::from_value::<Command>(json!({
+ "op": "setMediaColorRange", "mediaId": "m1", "range": "wide"
+ }))
+ .is_err(),
+ "a range is limited or full"
+ );
+
let batch: Command = serde_json::from_value(json!({
"op": "batch",
"commands": [{ "op": "fillSlot", "mediaId": "m1", "item": {
@@ -2209,6 +2237,79 @@ mod tests {
assert_eq!(untouched.transition_in, None);
}
+ /// A media item's colour range is set, saved, cleared, and undone
+ /// like any edit; an unknown item is a no-op that records nothing.
+ /// https://github.com/jub0t/Concat/issues/103
+ #[test]
+ fn a_medias_colour_range_is_an_undoable_edit_that_round_trips() {
+ use crate::model::ColorRange;
+ let (mut editor, media_id, _clip_id) = fixture();
+ assert_eq!(editor.project().media[0].color_range, None);
+ let before = editor.project().clone();
+
+ let view = editor
+ .apply(Command::SetMediaColorRange {
+ media_id: media_id.clone(),
+ range: Some(ColorRange::Full),
+ })
+ .expect("sets");
+ assert!(view.applied);
+ assert_eq!(
+ editor.project().media[0].color_range,
+ Some(ColorRange::Full)
+ );
+
+ // Saved as the word, read back as the range; absent stays absent,
+ // so a project that never said stays byte-identical.
+ let saved = editor.to_document(&settings());
+ assert_eq!(saved["media"][0]["colorRange"], "full");
+ let reopened = Editor::from_document(&saved).expect("loads");
+ assert_eq!(
+ reopened.project().media[0].color_range,
+ Some(ColorRange::Full)
+ );
+ let untold = crate::doc::to_document(&settings(), &before);
+ assert!(untold["media"][0].get("colorRange").is_none());
+ // A word this build does not know reads as the tag, not as a
+ // media item lost.
+ let mut odd = saved.clone();
+ odd["media"][0]["colorRange"] = json!("wide");
+ let tolerant = Editor::from_document(&odd).expect("loads");
+ assert_eq!(tolerant.project().media.len(), 1);
+ assert_eq!(tolerant.project().media[0].color_range, None);
+
+ // Cleared is back to the tag; set to what it is already, nothing.
+ editor
+ .apply(Command::SetMediaColorRange {
+ media_id: media_id.clone(),
+ range: None,
+ })
+ .expect("clears");
+ assert_eq!(editor.project().media[0].color_range, None);
+ let same = editor
+ .apply(Command::SetMediaColorRange {
+ media_id: media_id.clone(),
+ range: None,
+ })
+ .expect("no-op");
+ assert!(!same.applied, "a value already held changes nothing");
+ let gone = editor
+ .apply(Command::SetMediaColorRange {
+ media_id: "m999".to_owned(),
+ range: Some(ColorRange::Limited),
+ })
+ .expect("an unknown item is a no-op");
+ assert!(!gone.applied);
+ assert_eq!(gone.created_id, None);
+
+ editor.undo();
+ assert_eq!(
+ editor.project().media[0].color_range,
+ Some(ColorRange::Full),
+ "undo of the clear brings the range back"
+ );
+ }
+
#[test]
fn a_slot_fills_in_place_keeping_the_template_timing() {
let (mut editor, media_id, clip_id) = fixture();
@@ -3482,6 +3583,7 @@ mod tests {
has_audio: false,
audio_tracks: vec![],
placeholder: false,
+ color_range: None,
extra: Default::default(),
});
@@ -3518,6 +3620,7 @@ mod tests {
has_audio: false,
audio_tracks: vec![],
placeholder: false,
+ color_range: None,
extra: Default::default(),
});
diff --git a/src/crates/concat-project/src/model.rs b/src/crates/concat-project/src/model.rs
index 10a758ab..200edb1d 100644
--- a/src/crates/concat-project/src/model.rs
+++ b/src/crates/concat-project/src/model.rs
@@ -84,6 +84,22 @@ pub struct AudioTrack {
pub language: String,
}
+/// The levels a media file's picture spans, when the person says so over
+/// whatever the file claims: video range, 16-235, or full range, 0-255.
+/// A screen recording written full and tagged nothing plays grey where it
+/// should be black until it is read as `full`; a video-range file tagged
+/// full crushes its shadows until it is read as `limited`. Set with
+/// `Command::SetMediaColorRange`; absent means the file's own tag is read.
+/// https://github.com/jub0t/Concat/issues/103
+#[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum ColorRange {
+ /// 16-235: what broadcast, cameras and every player expect.
+ Limited,
+ /// 0-255: what screen recorders and some phones write.
+ Full,
+}
+
/// One entry in the media bin: a file the user imported, plus what the host's
/// probe learned about it. The probe metadata is stored, not re-derived, so a
/// document opens meaningfully even when the file itself is missing.
@@ -134,6 +150,11 @@ pub struct MediaItem {
/// false, so documents without templates stay byte-identical.
#[serde(default, skip_serializing_if = "is_false")]
pub placeholder: bool,
+ /// The levels the picture is read as, over the file's own tag; see
+ /// [`ColorRange`]. Absent, and left out of the document, for the tag.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ #[serde(deserialize_with = "wire::maybe")]
+ pub color_range: Option<ColorRange>,
/// Fields this build does not know, kept so a document written by a
/// newer or a different build round-trips through this one intact.
#[serde(flatten, default, skip_serializing_if = "Map::is_empty")]
diff --git a/src/crates/concat/locales/de.json b/src/crates/concat/locales/de.json
index f6461319..73cd1fce 100644
--- a/src/crates/concat/locales/de.json
+++ b/src/crates/concat/locales/de.json
@@ -254,7 +254,6 @@
"Imported {0} files": "{0} Dateien importiert",
"Importing…": "Wird importiert…",
"In": "Ein",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "Ein und Aus laufen über die ersten und letzten Sekunden des Clips; Kombi über seine ganze Länge. Jede bewegt den Clip von dort, wo du ihn platziert hast — also erst positionieren.",
"In use": "In Verwendung",
"Inspector": "Inspektor",
"Intensity": "Intensität",
@@ -309,7 +308,6 @@
"Montage": "Montage",
"More low end.": "Mehr Tiefen.",
"More sparkle.": "Mehr Glanz.",
- "Motion": "Bewegung",
"Motion Blur": "Bewegungsunschärfe",
"Move {0} down": "{0} nach unten",
"Move {0} up": "{0} nach oben",
diff --git a/src/crates/concat/locales/en.json b/src/crates/concat/locales/en.json
index cd539c67..5485d15a 100644
--- a/src/crates/concat/locales/en.json
+++ b/src/crates/concat/locales/en.json
@@ -5,25 +5,52 @@
"1 stroke": "1 stroke",
"10-bit colour": "10-bit colour",
"127.0.0.1 is this machine only. Any other address is reachable from the network, needs a token, and is still not encrypted.": "127.0.0.1 is this machine only. Any other address is reachable from the network, needs a token, and is still not encrypted.",
+ "90s Camcorder": "90s Camcorder",
+ "A bright hotspot with a string of echoes through the centre.": "A bright hotspot with a string of echoes through the centre.",
"A brighter, lighter, closer voice. Pitch at 0 follows the amount.": "A brighter, lighter, closer voice. Pitch at 0 follows the amount.",
+ "A circle opens from the centre to reveal the incoming shot.": "A circle opens from the centre to reveal the incoming shot.",
"A concert hall: long, even reflections.": "A concert hall: long, even reflections.",
+ "A cool, soft black and white with the shadows lifted, like a silver print.": "A cool, soft black and white with the shadows lifted, like a silver print.",
+ "A cool, sterile steel-and-teal grade, saturation held back.": "A cool, sterile steel-and-teal grade, saturation held back.",
+ "A cross-dissolve that blurs into the cut and sharpens back out of it.": "A cross-dissolve that blurs into the cut and sharpens back out of it.",
+ "A custom package did not load: {0}": "A custom package did not load: {0}",
"A film curve with a real toe and shoulder, warm halation around the lights, and grain that moves. Print stock, not a filter.": "A film curve with a real toe and shoulder, warm halation around the lights, and grain that moves. Print stock, not a filter.",
"A flat, boxy blur.": "A flat, boxy blur.",
+ "A gentle, true-to-life lift: barely-there warmth, skin left alone.": "A gentle, true-to-life lift: barely-there warmth, skin left alone.",
+ "A hand sweeps around the centre, revealing the incoming shot as it turns.": "A hand sweeps around the centre, revealing the incoming shot as it turns.",
"A handheld jitter.": "A handheld jitter.",
+ "A heavy warm fade with a yellowed, sun-bleached cast.": "A heavy warm fade with a yellowed, sun-bleached cast.",
"A horizontal streak, as if the camera panned.": "A horizontal streak, as if the camera panned.",
"A layer treats everything under it for as long as it runs. Trim it on the timeline to change what it covers.": "A layer treats everything under it for as long as it runs. Trim it on the timeline to change what it covers.",
"A matte: blacks lifted, whites eased down, contrast low, and a soft bloom in the light with cream in it. Airy and flattering.": "A matte: blacks lifted, whites eased down, contrast low, and a soft bloom in the light with cream in it. Airy and flattering.",
+ "A metallic gradient rolls slowly across the picture, dark to bright to dark.": "A metallic gradient rolls slowly across the picture, dark to bright to dark.",
"A metallic, modulated voice.": "A metallic, modulated voice.",
"A mirror of your own": "A mirror of your own",
+ "A recording that comes with Pocket TTS": "A recording that comes with Pocket TTS",
+ "A ring pulses outward from the centre once per loop, a stamp-like entrance flourish.": "A ring pulses outward from the centre once per loop, a stamp-like entrance flourish.",
"A seventies print: matte blacks and whites, colour faded, greens gone to yellow, a soft vignette.": "A seventies print: matte blacks and whites, colour faded, greens gone to yellow, a soft vignette.",
"A small old speaker: no top end, and a grain to the sound.": "A small old speaker: no top end, and a grain to the sound.",
"A small speaker on a long wave: narrow band, a little crunch.": "A small speaker on a long wave: narrow band, a little crunch.",
"A soft bloom around the bright parts of the picture.": "A soft bloom around the bright parts of the picture.",
+ "A soft bloom over the highlights that breathes in and out.": "A soft bloom over the highlights that breathes in and out.",
+ "A soft blurred halo spreads just outside the picture's edge, the shape itself kept sharp.": "A soft blurred halo spreads just outside the picture's edge, the shape itself kept sharp.",
+ "A soft cross-dissolve from one shot into the next.": "A soft cross-dissolve from one shot into the next.",
+ "A soft haze settles over the picture, blacks lifted and colour thinned.": "A soft haze settles over the picture, blacks lifted and colour thinned.",
+ "A soft pink lift into the highlights, flattering and warm.": "A soft pink lift into the highlights, flattering and warm.",
"A soft shadow under the words, for titles that have to sit over footage you do not control.": "A soft shadow under the words, for titles that have to sit over footage you do not control.",
"A soft, even blur.": "A soft, even blur.",
+ "A soft, hazy bloom over lifted pastel blacks.": "A soft, hazy bloom over lifted pastel blacks.",
"A solid band behind the words. Where a shadow softens the background, a plate replaces it — use it when the footage underneath is busy enough that neither weight nor outline will hold.": "A solid band behind the words. Where a shadow softens the background, a plate replaces it — use it when the footage underneath is busy enough that neither weight nor outline will hold.",
+ "A specular band sweeps diagonally across the picture on a loop.": "A specular band sweeps diagonally across the picture on a loop.",
+ "A straight edge wipes the incoming shot across the outgoing one.": "A straight edge wipes the incoming shot across the outgoing one.",
"A studio plate: dense, bright and short.": "A studio plate: dense, bright and short.",
+ "A title's words appear one at a time as the clip plays, in reading order.": "A title's words appear one at a time as the clip plays, in reading order.",
+ "A two-colour gradient rolls across the picture, its palette turned by hue.": "A two-colour gradient rolls across the picture, its palette turned by hue.",
"A warm fade with dust drifting down through it and a light leak in one corner. The CPU shows the fade and a whisper of noise.": "A warm fade with dust drifting down through it and a light leak in one corner. The CPU shows the fade and a whisper of noise.",
+ "A warm over-exposed flash burns through the cut.": "A warm over-exposed flash burns through the cut.",
+ "A warm streak of light drifts across the picture.": "A warm streak of light drifts across the picture.",
+ "A warm streak of light sweeps across the cut.": "A warm streak of light sweeps across the cut.",
+ "A whip zoom out of the outgoing shot and into the incoming one.": "A whip zoom out of the outgoing shot and into the incoming one.",
"About": "About",
"About {0}:{1} in {2} · {3} characters": "About {0}:{1} in {2} · {3} characters",
"Add": "Add",
@@ -36,18 +63,23 @@
"Adjust": "Adjust",
"Advanced": "Advanced",
"Age": "Age",
+ "Air": "Air",
"Air and presence: a lift above six kilohertz.": "Air and presence: a lift above six kilohertz.",
+ "Airy, breathy tone with attenuated low end and enhanced presence.": "Airy, breathy tone with attenuated low end and enhanced presence.",
"All media": "All media",
"almost done": "almost done",
"American": "American",
"Amount": "Amount",
+ "Amplitude": "Amplitude",
"Analysis": "Analysis",
"Angle": "Angle",
"Animation": "Animation",
"Appearance": "Appearance",
"Application": "Application",
"Apply": "Apply",
+ "As tagged": "As tagged",
"at the playhead": "at the playhead",
+ "Atmosphere": "Atmosphere",
"Audio": "Audio",
"audio effect": "audio effect",
"Audio Effects": "Audio Effects",
@@ -58,29 +90,39 @@
"Auto removal": "Auto removal",
"Auto removal keeps what the model finds and drops the rest: a person, or the one thing the picture is of. Custom removal starts from the same mask and takes corrections painted on the monitor: the smart brush keeps the whole thing it touches and the smart eraser removes it, the plain ones do exactly what you paint; Apply ends the painting. Chroma key drops one colour instead; similarity is how far from the colour still counts, softness feathers the edge.": "Auto removal keeps what the model finds and drops the rest: a person, or the one thing the picture is of. Custom removal starts from the same mask and takes corrections painted on the monitor: the smart brush keeps the whole thing it touches and the smart eraser removes it, the plain ones do exactly what you paint; Apply ends the painting. Chroma key drops one colour instead; similarity is how far from the colour still counts, softness feathers the edge.",
"Automatic": "Automatic",
+ "Autumn": "Autumn",
"Balanced": "Balanced",
"Barely there: neutral, a gentle curve, a touch more colour, and the reds calmed so a face reads even. What a talking head wants.": "Barely there: neutral, a gentle curve, a touch more colour, and the reds calmed so a face reads even. What a talking head wants.",
"Basic": "Basic",
"Bass": "Bass",
+ "Bass Shockwave": "Bass Shockwave",
"Big square pixels.": "Big square pixels.",
"Bitrate": "Bitrate",
"Bits": "Bits",
"Black & White": "Black & White",
+ "Black and white pushed hard: deep blacks, bright whites, nothing in between.": "Black and white pushed hard: deep blacks, bright whites, nothing in between.",
"Black and white through a coloured filter: red darkens skies and lightens skin, green does the reverse. A little grain if you want it.": "Black and white through a coloured filter: red darkens skies and lightens skin, green does the reverse. A little grain if you want it.",
"Blacks": "Blacks",
"Blacks crushed by a film toe, colour drained, bronze through the middle, cool in the shadows, the corners closing in.": "Blacks crushed by a film toe, colour drained, bronze through the middle, cool in the shadows, the corners closing in.",
+ "Bleach Bypass": "Bleach Bypass",
"Bleed": "Bleed",
"Blend": "Blend",
+ "Blocks of the picture tear sideways, flickering like a broken codec.": "Blocks of the picture tear sideways, flickering like a broken codec.",
+ "Bloom Pulse": "Bloom Pulse",
"Blue": "Blue",
"Blue in the shadows and midtones, highlights and skin left neutral, contrast up. Cities at dusk.": "Blue in the shadows and midtones, highlights and skin left neutral, contrast up. Cities at dusk.",
"Blue Screen": "Blue Screen",
"Blur": "Blur",
+ "Blur Dissolve": "Blur Dissolve",
"Blush": "Blush",
"Body": "Body",
+ "Bokeh": "Bokeh",
"Bold": "Bold",
"Bottom": "Bottom",
"Bounce": "Bounce",
+ "Bounce In": "Bounce In",
"Box Blur": "Box Blur",
+ "Breathe": "Breathe",
"Bright": "Bright",
"Bright and matte: whites soft and cool, blacks lifted well off the floor, colour quiet. The clean minimal look of a white room.": "Bright and matte: whites soft and cool, blacks lifted well off the floor, colour quiet. The clean minimal look of a white room.",
"Brighten": "Brighten",
@@ -92,8 +134,10 @@
"Browse": "Browse",
"Brush": "Brush",
"Build": "Build",
+ "Bulge / Pinch": "Bulge / Pinch",
"Bullet": "Bullet",
"Bypass {0}": "Bypass {0}",
+ "Camera Shake": "Camera Shake",
"Cancel": "Cancel",
"Cancel export": "Cancel export",
"Caption": "Caption",
@@ -115,21 +159,27 @@
"Choose…": "Choose…",
"Chroma key": "Chroma key",
"Chromatic Aberration": "Chromatic Aberration",
+ "Chromatic slice tear and digital pixel displacement transition.": "Chromatic slice tear and digital pixel displacement transition.",
+ "Chrome Shine": "Chrome Shine",
"Cinematic": "Cinematic",
"Clarity": "Clarity",
+ "Classic Chrome": "Classic Chrome",
"Clean": "Clean",
"Clear project cache": "Clear project cache",
"Clears the room out of a recording: rumble, hiss, sibilance and uneven level.": "Clears the room out of a recording: rumble, hiss, sibilance and uneven level.",
"Clips": "Clips",
+ "Clock Wipe": "Clock Wipe",
"Close gaps when deleting and trimming": "Close gaps when deleting and trimming",
"Close project": "Close project",
"Close window": "Close window",
"Cloudless Sky": "Cloudless Sky",
"Codec": "Codec",
"Color": "Color",
+ "Color Cycle": "Color Cycle",
"Colour": "Colour",
"Colour bleeding sideways, scan lines, softness, tape noise and too much saturation, with the slight vertical smear of a worn head.": "Colour bleeding sideways, scan lines, softness, tape noise and too much saturation, with the slight vertical smear of a worn head.",
"Colour filter": "Colour filter",
+ "Colour range": "Colour range",
"Colour that sings and contrast that bites, with a little edge: the look that reads as a better camera. Skin is held back from the boost.": "Colour that sings and contrast that bites, with a little edge: the look that reads as a better camera. Skin is held back from the boost.",
"Combo": "Combo",
"Concat {0}": "Concat {0}",
@@ -146,6 +196,7 @@
"Copy": "Copy",
"Copy system information": "Copy system information",
"Could not import {0}: {1}": "Could not import {0}: {1}",
+ "Could not read {0}": "Could not read {0}",
"Could not save: {0}": "Could not save: {0}",
"Could not show the file: {0}": "Could not show the file: {0}",
"Could not show the log: {0}": "Could not show the log: {0}",
@@ -153,16 +204,23 @@
"Creating…": "Creating…",
"Crisper edges.": "Crisper edges.",
"Crop": "Crop",
+ "Crosshatch": "Crosshatch",
+ "CRT Scanlines": "CRT Scanlines",
+ "Cube": "Cube",
+ "Curvature": "Curvature",
"Curve": "Curve",
"Custom": "Custom",
"Custom removal": "Custom removal",
"Custom URL": "Custom URL",
"Cutout": "Cutout",
+ "Cyberpunk": "Cyberpunk",
+ "Cycle": "Cycle",
"Dancing grain, the texture of film stock.": "Dancing grain, the texture of film stock.",
"Dark": "Dark",
"Dark lines across the picture every few pixels, the way a tube television drew it.": "Dark lines across the picture every few pixels, the way a tube television drew it.",
"Darken": "Darken",
"Darkened corners that draw the eye to the middle.": "Darkened corners that draw the eye to the middle.",
+ "Datamosh": "Datamosh",
"Daydream": "Daydream",
"Daylight footage made to pop: midtones lifted, colour brought up where it is muted, a breath of mint in the brightest whites, skin left alone.": "Daylight footage made to pop: midtones lifted, colour brought up where it is muted, a breath of mint in the brightest whites, skin left alone.",
"Decay": "Decay",
@@ -177,15 +235,24 @@
"Delete clip": "Delete clip",
"Delete selected": "Delete selected",
"Delete {0} clips": "Delete {0} clips",
+ "Delicious": "Delicious",
+ "Density": "Density",
"Depth": "Depth",
+ "Desaturated and blue, the blacks lifted to a matte wintry haze.": "Desaturated and blue, the blacks lifted to a matte wintry haze.",
+ "Desaturated and heavy, with a cold cast into the shadows and the corners dimmed.": "Desaturated and heavy, with a cold cast into the shadows and the corners dimmed.",
"Destination": "Destination",
"Detach audio": "Detach audio",
"Detail": "Detail",
"DETAILS": "DETAILS",
"Digicam": "Digicam",
+ "Digital tearing and channel splitting rip through the cut.": "Digital tearing and channel splitting rip through the cut.",
+ "Direction": "Direction",
"Dismiss": "Dismiss",
+ "Dissolve": "Dissolve",
"Distort": "Distort",
"Distorted": "Distorted",
+ "Distortion & Glitch": "Distortion & Glitch",
+ "Dot size": "Dot size",
"Download": "Download",
"Download a transcriber model in Settings › Transcriber first": "Download a transcriber model in Settings › Transcriber first",
"Download a transcriber model in Settings › Transcriber first.": "Download a transcriber model in Settings › Transcriber first.",
@@ -194,11 +261,14 @@
"Downloads": "Downloads",
"Drained colour, a green-cyan cast, a hard toe, and a heavy vignette. For the season.": "Drained colour, a green-cyan cast, a hard toe, and a heavy vignette. For the season.",
"Dread": "Dread",
+ "Dreamy": "Dreamy",
"Drift": "Drift",
"Drive": "Drive",
"Driven hard and clipped.": "Driven hard and clipped.",
+ "Drop In": "Drop In",
"Drop shadow": "Drop shadow",
"Drops every colour to grey.": "Drops every colour to grey.",
+ "Duotone": "Duotone",
"Duplicate": "Duplicate",
"Duration": "Duration",
"Dust": "Dust",
@@ -213,8 +283,14 @@
"Enable flip and reverse shortcuts": "Enable flip and reverse shortcuts",
"Enable {0}": "Enable {0}",
"Engine": "Engine",
+ "Enhance": "Enhance",
+ "Enhance is already at work; one clip at a time": "Enhance is already at work; one clip at a time",
"Enhance Voice": "Enhance Voice",
"Enhance voice": "Enhance voice",
+ "Enhance: {0}": "Enhance: {0}",
+ "Enhanced; the clip now shows the copy": "Enhanced; the clip now shows the copy",
+ "Enhancing {0}: {1}× on its way, frame by frame": "Enhancing {0}: {1}× on its way, frame by frame",
+ "Enhancing… {0}%": "Enhancing… {0}%",
"Eraser": "Eraser",
"Even": "Even",
"Every colour becomes its opposite.": "Every colour becomes its opposite.",
@@ -236,24 +312,30 @@
"Fade": "Fade",
"Fade in": "Fade in",
"Fade out": "Fade out",
+ "Faded, warm and grainy: an old home movie run through a projector.": "Faded, warm and grainy: an old home movie run through a projector.",
"Fades": "Fades",
"Fair": "Fair",
"Falling Dust": "Falling Dust",
"Faster": "Faster",
"Favourites": "Favourites",
"Feather": "Feather",
+ "Featured": "Featured",
"female": "female",
"Fetching the model… {0}%": "Fetching the model… {0}%",
"File": "File",
"Film": "Film",
+ "Film Burn": "Film Burn",
"Film Grain": "Film Grain",
+ "Film Reel": "Film Reel",
"Filter": "Filter",
"filter": "filter",
"Filters": "Filters",
"Finalising file": "Finalising file",
"Finding the subject… {0}%": "Finding the subject… {0}%",
+ "Fine specks of dust flicker over the picture, frame to frame.": "Fine specks of dust flicker over the picture, frame to frame.",
"Fisheye": "Fisheye",
"Fit the frame to the pane": "Fit the frame to the pane",
+ "Flakes of snow drift down over the picture.": "Flakes of snow drift down over the picture.",
"Flash": "Flash",
"Flash In": "Flash In",
"Flash Out": "Flash Out",
@@ -263,16 +345,23 @@
"Flip horizontally": "Flip horizontally",
"Flip vertical": "Flip vertical",
"Flip vertically": "Flip vertically",
+ "Float": "Float",
+ "Float Up": "Float Up",
+ "Fog": "Fog",
"Folder": "Folder",
"Font": "Font",
"Font Weight": "Font Weight",
+ "Food": "Food",
"For mainland China": "For mainland China",
"Format": "Format",
"Frame": "Frame",
"Frame rate": "Frame rate",
"French": "French",
+ "Frequency": "Frequency",
"Fresh": "Fresh",
+ "Frosted Glass": "Frosted Glass",
"Full": "Full",
+ "full range": "full range",
"Gain": "Gain",
"Gaussian Blur": "Gaussian Blur",
"General": "General",
@@ -280,32 +369,49 @@
"Generate captions": "Generate captions",
"Generate speech": "Generate speech",
"Generating voice": "Generating voice",
+ "Glitch": "Glitch",
+ "Glitch Warp": "Glitch Warp",
"Glow": "Glow",
+ "Glowing vector light streaks crossing the frame.": "Glowing vector light streaks crossing the frame.",
"Go to end": "Go to end",
"Go to start": "Go to start",
"Golden Hour": "Golden Hour",
+ "Gradient Wave": "Gradient Wave",
"Grain": "Grain",
"Graphics": "Graphics",
"Green": "Green",
"Green Screen": "Green Screen",
"Greens": "Greens",
+ "Greens and blues pushed richer, the punch a travel shot wants.": "Greens and blues pushed richer, the punch a travel shot wants.",
+ "Greens pulled toward amber, the picture dipped in fall light.": "Greens pulled toward amber, the picture dipped in fall light.",
+ "Halation": "Halation",
"Half": "Half",
"Half the size": "Half the size",
+ "Halftone": "Halftone",
"Hall": "Hall",
+ "Handheld 2D harmonic camera jitter with organic drift.": "Handheld 2D harmonic camera jitter with organic drift.",
"hardware": "hardware",
+ "Harsh, mid-focused projection from a handheld megaphone.": "Harsh, mid-focused projection from a handheld megaphone.",
"Haze": "Haze",
"Headline": "Headline",
+ "Heartbeat": "Heartbeat",
+ "Heat": "Heat",
"Height": "Height",
"Hero": "Hero",
"Hide lane": "Hide lane",
"High": "High",
+ "High-Contrast Mono": "High-Contrast Mono",
+ "High-energy pulsating stroboscopic flash.": "High-energy pulsating stroboscopic flash.",
+ "High-speed directional camera whip with motion blur.": "High-speed directional camera whip with motion blur.",
"Higher and squeakier.": "Higher and squeakier.",
"Highlights": "Highlights",
"Hindi": "Hindi",
"Hologram": "Hologram",
"Horizontal": "Horizontal",
+ "Hue": "Hue",
"Hue Shift": "Hue Shift",
"Images": "Images",
+ "Impact Ring": "Impact Ring",
"Import": "Import",
"Import a LUT (.cube)": "Import a LUT (.cube)",
"Import LUT": "Import LUT",
@@ -316,55 +422,71 @@
"Imported {0} look(s); find them under Imported": "Imported {0} look(s); find them under Imported",
"Importing…": "Importing…",
"In": "In",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.",
+ "In and Out play over the clip's first and last seconds; Combo runs its whole length; Loop repeats continuously. Each moves the clip from where you placed it, so position it first.": "In and Out play over the clip's first and last seconds; Combo runs its whole length; Loop repeats continuously. Each moves the clip from where you placed it, so position it first.",
"In use": "In use",
"Ink": "Ink",
"Inspector": "Inspector",
"Intensity": "Intensity",
"Invert": "Invert",
+ "Iris": "Iris",
"Italian": "Italian",
"Italic": "Italic",
"Ivory": "Ivory",
"Japanese": "Japanese",
+ "Jitter": "Jitter",
"Jump Cut": "Jump Cut",
"just now": "just now",
+ "Kaleidoscope": "Kaleidoscope",
"Keeps a soft-edged circle of the picture and lets the rest through.": "Keeps a soft-edged circle of the picture and lets the rest through.",
"Keeps a soft-edged rectangle of the picture and lets the rest through.": "Keeps a soft-edged rectangle of the picture and lets the rest through.",
"Keeps the picture left of a soft vertical edge and lets the rest through.": "Keeps the picture left of a soft vertical edge and lets the rest through.",
"Keys the blue out, leaving the picture over whatever is beneath.": "Keys the blue out, leaving the picture over whatever is beneath.",
"Keys the green out, leaving the picture over whatever is beneath.": "Keys the green out, leaving the picture over whatever is beneath.",
+ "Kira Kira starburst glints on luminance highlights with shimmer.": "Kira Kira starburst glints on luminance highlights with shimmer.",
"Lagoon": "Lagoon",
"Language": "Language",
"Large": "Large",
+ "Laser Beams": "Laser Beams",
"Late light: a warm balance that keeps its brightness, orange in the highlights, a whisper of magenta in the shadows, blacks lifted a touch.": "Late light: a warm balance that keeps its brightness, orange in the highlights, a whisper of magenta in the shadows, blacks lifted a touch.",
"Layer": "Layer",
"Layout": "Layout",
"Left": "Left",
"Length": "Length",
+ "Lens Flare": "Lens Flare",
"Level": "Level",
"Levels": "Levels",
"Library": "Library",
"Lift": "Lift",
"Lifts speech out of the mix: a little presence, a little control.": "Lifts speech out of the mix: a little presence, a little control.",
"Light": "Light",
+ "Light & Shadow": "Light & Shadow",
+ "Light Leak": "Light Leak",
"Light leak": "Light leak",
+ "Light Leak Flash": "Light Leak Flash",
"Lighten": "Lighten",
"Lightness": "Lightness",
"Lights": "Lights",
+ "Limited": "Limited",
"Line height": "Line height",
+ "Linear Wipe": "Linear Wipe",
"Lines": "Lines",
+ "Liquid sinusoidal horizontal and vertical ripple warping.": "Liquid sinusoidal horizontal and vertical ripple warping.",
"Listening on {0} · {1} connected": "Listening on {0} · {1} connected",
"Lo-fi": "Lo-fi",
+ "Loaded {0} custom package(s) from {1}": "Loaded {0} custom package(s) from {1}",
"Loading the model": "Loading the model",
"Location": "Location",
"Lock lane": "Lock lane",
"Lock track": "Lock track",
+ "Loop": "Loop",
"Low contrast, pink and lavender in the light, and a soft bloom over it all. The dreamy one.": "Low contrast, pink and lavender in the light, and a soft bloom over it all. The dreamy one.",
"Low light opened up: shadows lifted with the noise softened before it rises, whites held, the blue of the night kept.": "Low light opened up: shadows lifted with the noise softened before it rises, whites held, the blue of the night kept.",
"Lower and fuller.": "Lower and fuller.",
"Lower third": "Lower third",
"LUT": "LUT",
+ "Magenta and cyan pushed hard, a saturated retro-synth cast.": "Magenta and cyan pushed hard, a saturated retro-synth cast.",
"Magenta in the shadows, cyan in the highlights, hard contrast, colour turned up, and the lights themselves blooming. Night streets and signage.": "Magenta in the shadows, cyan in the highlights, hard contrast, colour turned up, and the lights themselves blooming. Night streets and signage.",
+ "Magenta into the shadows, cyan into the light, pushed hard and neon-bright.": "Magenta into the shadows, cyan into the light, pushed hard and neon-bright.",
"Magnetic timeline": "Magnetic timeline",
"Magnetic timeline: deleting and trimming close the gap": "Magnetic timeline: deleting and trimming close the gap",
"male": "male",
@@ -378,11 +500,15 @@
"Matte": "Matte",
"Media": "Media",
"Medium": "Medium",
+ "Megaphone": "Megaphone",
"Midnight": "Midnight",
"Milk": "Milk",
"Milk's warm twin: the same soft matte with cream in the whites and a little gold in the middle. Interiors and morning light.": "Milk's warm twin: the same soft matte with cream in the whites and a little gold in the middle. Interiors and morning light.",
+ "Miniature horizontal focus band with progressive blur and saturation.": "Miniature horizontal focus band with progressive blur and saturation.",
"Minimal": "Minimal",
+ "Minimum": "Minimum",
"Mirror": "Mirror",
+ "Mirror Tile": "Mirror Tile",
"Missing Media": "Missing Media",
"Mixing audio": "Mixing audio",
"Mode": "Mode",
@@ -397,7 +523,6 @@
"Moody": "Moody",
"More low end.": "More low end.",
"More sparkle.": "More sparkle.",
- "Motion": "Motion",
"Motion Blur": "Motion Blur",
"Move {0} down": "Move {0} down",
"Move {0} up": "Move {0} up",
@@ -405,10 +530,14 @@
"Mute": "Mute",
"Mute lane": "Mute lane",
"Muted and green-teal through the midtones, a gentle film curve, warmth only where a face is. The quiet grade of an indie film.": "Muted and green-teal through the midtones, a gentle film curve, warmth only where a face is. The quiet grade of an indie film.",
+ "Muted highlights and deep, open shadows: the restrained look of a classic colour negative.": "Muted highlights and deep, open shadows: the restrained look of a classic colour negative.",
"My templates": "My templates",
"Name": "Name",
"Natural": "Natural",
"Neon": "Neon",
+ "Neon Edges": "Neon Edges",
+ "Neon Flicker": "Neon Flicker",
+ "Neon Glow": "Neon Glow",
"New project": "New project",
"New token": "New token",
"Next frame": "Next frame",
@@ -418,6 +547,7 @@
"No templates yet. Mark media as slots, then save this project as a template.": "No templates yet. Mark media as slots, then save this project as a template.",
"No voice to read with": "No voice to read with",
"No {0} matches that.": "No {0} matches that.",
+ "Noir": "Noir",
"Noise": "Noise",
"Noise Reduction": "Noise Reduction",
"None": "None",
@@ -440,6 +570,7 @@
"off": "off",
"Off, a click on the ruler past the last clip lands the playhead there, and a clip placed at the playhead goes with it. On, the playhead never leaves the content.": "Off, a click on the ruler past the last clip lands the playhead there, and a clip placed at the playhead goes with it. On, the playhead never leaves the content.",
"Off, the keys do nothing.": "Off, the keys do nothing.",
+ "Oil Paint": "Oil Paint",
"On, deleting a clip pulls what follows it on the same track into the gap, and trimming an edge moves the rest of the track with it. Off, a delete leaves a gap and a trim moves only the edge. Shift-Delete closes the gap either way.": "On, deleting a clip pulls what follows it on the same track into the gap, and trimming an edge moves the rest of the track with it. Off, a delete leaves a gap and a trim moves only the edge. Shift-Delete closes the gap either way.",
"On, video decodes on this machine's own hardware, which is what makes 4K play on a laptop. A file the hardware will not take decodes in software as before.": "On, video decodes on this machine's own hardware, which is what makes 4K play on a laptop. A file the hardware will not take decodes in software as before.",
"One repeat, fading.": "One repeat, fading.",
@@ -450,6 +581,8 @@
"Open project": "Open project",
"Open project…": "Open project…",
"Operating system": "Operating system",
+ "Optical & Lens": "Optical & Lens",
+ "Organic overexposed film burn flash bridging the cut.": "Organic overexposed film burn flash bridging the cut.",
"Original source": "Original source",
"Other": "Other",
"Out": "Out",
@@ -458,11 +591,15 @@
"Output · {0}": "Output · {0}",
"Pace": "Pace",
"Pan tool": "Pan tool",
+ "Party & Club": "Party & Club",
"Paste": "Paste",
"Pause": "Pause",
"Peach": "Peach",
+ "Period": "Period",
+ "Periodic horizontal slice displacement with chromatic aberration.": "Periodic horizontal slice displacement with chromatic aberration.",
"Person": "Person",
"Pick an effect or filter from the library": "Pick an effect or filter from the library",
+ "Pick one from the Transitions tab to dissolve into this clip from the cut before it.": "Pick one from the Transitions tab to dissolve into this clip from the cut before it.",
"Pink Fuzz": "Pink Fuzz",
"Pitch": "Pitch",
"Pixelate": "Pixelate",
@@ -484,6 +621,7 @@
"Preview": "Preview",
"Preview failed: {0}": "Preview failed: {0}",
"Previous frame": "Previous frame",
+ "Prism Dispersion": "Prism Dispersion",
"Processor": "Processor",
"PROJECT": "PROJECT",
"Project": "Project",
@@ -492,16 +630,21 @@
"Pulse": "Pulse",
"Punch": "Punch",
"Pure black and pure white, cut at one level of brightness.": "Pure black and pure white, cut at one level of brightness.",
+ "Push": "Push",
"Quality": "Quality",
"Quarter": "Quarter",
+ "Radial chromatic dispersion refracting RGB channels.": "Radial chromatic dispersion refracting RGB channels.",
+ "Radial ripple expansion pulsing with beat intensity.": "Radial ripple expansion pulsing with beat intensity.",
"Radio": "Radio",
"Radius": "Radius",
"Rain": "Rain",
"Ramp in": "Ramp in",
"Ramp out": "Ramp out",
"Ramps": "Ramps",
+ "Rapid inward/outward camera rush with radial zoom blur.": "Rapid inward/outward camera rush with radial zoom blur.",
"Rate": "Rate",
"Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.": "Rate re-times the clip in place, so the timeline length changes with it. Trim afterwards, not before. A curve varies the rate over the clip; the same footage plays, faster here and slower there.",
+ "Reads in the voice heard in the clip selected on the timeline": "Reads in the voice heard in the clip selected on the timeline",
"Reattach audio": "Reattach audio",
"Recent": "Recent",
"Recommended": "Recommended",
@@ -511,6 +654,7 @@
"Reduce noise": "Reduce noise",
"Regular": "Regular",
"Relink All…": "Relink All…",
+ "Reload custom effects": "Reload custom effects",
"Remote": "Remote",
"Remote control": "Remote control",
"Remove": "Remove",
@@ -523,19 +667,30 @@
"Rendering video": "Rendering video",
"Resolution": "Resolution",
"Retro": "Retro",
+ "Retro & Film": "Retro & Film",
+ "Retro 70s": "Retro 70s",
"Retro Cartoon": "Retro Cartoon",
+ "Retro CRT scanlines and barrel screen curvature.": "Retro CRT scanlines and barrel screen curvature.",
"Reverse": "Reverse",
+ "RGB Glitch": "RGB Glitch",
+ "RGB Split": "RGB Split",
"RGB split": "RGB split",
"Richer colour where it is muted, without blowing out what is already strong.": "Richer colour where it is muted, without blowing out what is already strong.",
"Right": "Right",
+ "Rings of water ripple outward from the centre of the picture.": "Rings of water ripple outward from the centre of the picture.",
+ "Ripple": "Ripple",
"Ripple delete": "Ripple delete",
"Ripple delete {0} clips": "Ripple delete {0} clips",
"Robot": "Robot",
+ "Roll In": "Roll In",
"Room": "Room",
+ "Rosy": "Rosy",
"Rotation": "Rotation",
+ "Rotational vortex twist around a focal point.": "Rotational vortex twist around a focal point.",
"Row height": "Row height",
"Runs locally": "Runs locally",
"Sage": "Sage",
+ "Saturated and bright, the water pushed teal.": "Saturated and bright, the water pushed teal.",
"Saturation": "Saturation",
"Save": "Save",
"Save as template…": "Save as template…",
@@ -545,11 +700,18 @@
"Scale": "Scale",
"Scale and position are fractions of the output frame, so a clip keeps its framing if the project is re-sized. The same numbers move with the box on the monitor. Width and height pull one axis beyond the scale; the edge grips on the monitor do the same.": "Scale and position are fractions of the output frame, so a clip keeps its framing if the project is re-sized. The same numbers move with the box on the monitor. Width and height pull one axis beyond the scale; the edge grips on the monitor do the same.",
"Scanlines": "Scanlines",
+ "Scenery": "Scenery",
+ "Sci-Fi": "Sci-Fi",
"Screen": "Screen",
+ "Screen content": "Screen content",
"Script": "Script",
+ "Scroll Ticker": "Scroll Ticker",
"Search {0}s": "Search {0}s",
+ "Segments": "Segments",
"Select a clip on the timeline first": "Select a clip on the timeline first",
+ "Select a clip with a voice in it to clone": "Select a clip with a voice in it to clone",
"Select a video or image clip on the timeline first": "Select a video or image clip on the timeline first",
+ "Select a video, image or text clip on the timeline first": "Select a video, image or text clip on the timeline first",
"Select folder containing media files": "Select folder containing media files",
"Select the clip the transition leads into": "Select the clip the transition leads into",
"Select two clips to merge": "Select two clips to merge",
@@ -564,23 +726,27 @@
"Shadows": "Shadows",
"Shake": "Shake",
"Shape": "Shape",
+ "Shape Wipe": "Shape Wipe",
"Share": "Share",
"Sharpen": "Sharpen",
"Shift": "Shift",
"Shifts the picture towards candlelight.": "Shifts the picture towards candlelight.",
"Shifts the picture towards daylight shade.": "Shifts the picture towards daylight shade.",
+ "Shine Sweep": "Shine Sweep",
"Show advanced options": "Show advanced options",
"Show in folder": "Show in folder",
"Show lane": "Show lane",
"Show the log": "Show the log",
"Showing the look over the picture. Double-click the card, or its plus, to lay it on the timeline": "Showing the look over the picture. Double-click the card, or its plus, to lay it on the timeline",
"Silent": "Silent",
+ "Silver": "Silver",
"Similarity": "Similarity",
"Size": "Size",
"Sketch": "Sketch",
"Skies deeper and bluer, foliage cooler and calmer, the rest of the picture and every face untouched. Travel footage.": "Skies deeper and bluer, foliage cooler and calmer, the rest of the picture and every face untouched. Travel footage.",
"Skin warmed toward peach and softened, shadows lifted so lines ease, contrast low. Portraits and talking heads; it is meant to run at half strength.": "Skin warmed toward peach and softened, shadows lifted so lines ease, contrast low. Portraits and talking heads; it is meant to run at half strength.",
"Sky": "Sky",
+ "Slide": "Slide",
"Slide Down": "Slide Down",
"Slide Left": "Slide Left",
"Slide Right": "Slide Right",
@@ -591,10 +757,13 @@
"Smart brush": "Smart brush",
"Smart brush: {0}": "Smart brush: {0}",
"Smart eraser": "Smart eraser",
+ "Smooth temporal hue rotation across the entire spectrum.": "Smooth temporal hue rotation across the entire spectrum.",
"Snap to edges": "Snap to edges",
+ "Snow": "Snow",
"Soft cinema: blacks lifted, the light blooming warm, shadows a touch cool, skin kept. The look of a story told in a window seat.": "Soft cinema: blacks lifted, the light blooming warm, shadows a touch cool, skin kept. The look of a story told in a window seat.",
"Soft green through the midtones and whites, colour muted, a light matte. The trend look, gentle enough for a face.": "Soft green through the midtones and whites, colour muted, a light matte. The trend look, gentle enough for a face.",
"Soft Light": "Soft Light",
+ "Soft out-of-focus circles of light drift over the picture.": "Soft out-of-focus circles of light drift over the picture.",
"Soften": "Soften",
"Softness": "Softness",
"Solarize": "Solarize",
@@ -606,23 +775,33 @@
"Source": "Source",
"Space": "Space",
"Spanish": "Spanish",
+ "Sparkle": "Sparkle",
"Speech": "Speech",
"Speed": "Speed",
"Spin": "Spin",
"Split at playhead": "Split at playhead",
"Split at playhead (B, or ⌘B for every clip)": "Split at playhead (B, or ⌘B for every clip)",
"Spooky": "Spooky",
+ "Spread": "Spread",
+ "Stadium": "Stadium",
"stereo": "stereo",
"Stone and height: reflections that take a while to arrive.": "Stone and height: reflections that take a while to arrive.",
"Stop at the end of the content": "Stop at the end of the content",
"Strength": "Strength",
+ "Strobe Flash": "Strobe Flash",
"Stroke": "Stroke",
+ "Style": "Style",
"Stylised": "Stylised",
"Stylize": "Stylize",
"Subject": "Subject",
+ "Submerged beneath the surface with heavy low-pass filtering.": "Submerged beneath the surface with heavy low-pass filtering.",
"Subtitle": "Subtitle",
"Summary": "Summary",
+ "Super 8": "Super 8",
+ "Sway": "Sway",
"Sweet": "Sweet",
+ "Swirl": "Swirl",
+ "Symmetrical 2x2 and 4x4 kaleidoscopic mirror reflections.": "Symmetrical 2x2 and 4x4 kaleidoscopic mirror reflections.",
"System information": "System information",
"Takes the hum and hiss out from under the voice.": "Takes the hum and hiss out from under the voice.",
"Takes the room's hiss and hum out from under the voice.": "Takes the room's hiss and hum out from under the voice.",
@@ -642,24 +821,47 @@
"The 2000s point-and-shoot: hard flash, whites blown, colour up, a cool cyan cast, over-sharpened with the sensor's noise.": "The 2000s point-and-shoot: hard flash, whites blown, colour up, a cool cyan cast, over-sharpened with the sensor's noise.",
"The bulge of a very wide lens.": "The bulge of a very wide lens.",
"The café look: warm brown through the middle, greens muted to olive, contrast eased. Cosy, and kind to wood and skin alike.": "The café look: warm brown through the middle, greens muted to olive, contrast eased. Cosy, and kind to wood and skin alike.",
+ "The centre of the picture bulges outward, or pinches inward below zero.": "The centre of the picture bulges outward, or pinches inward below zero.",
"The chain runs top to bottom — reorder it with the chevrons. The eye bypasses one link without losing the values you dialled into it.": "The chain runs top to bottom — reorder it with the chevrons. The eye bypasses one link without losing the values you dialled into it.",
"The clip is no longer on the timeline": "The clip is no longer on the timeline",
+ "The colour channels pull apart through the cut and snap back together.": "The colour channels pull apart through the cut and snap back together.",
+ "The colour channels pulled apart into a bold stylised fringe.": "The colour channels pulled apart into a bold stylised fringe.",
+ "The cut twists both pictures around its centre and untwists into the next shot.": "The cut twists both pictures around its centre and untwists into the next shot.",
+ "The dark parts of the picture built from crossed pen strokes.": "The dark parts of the picture built from crossed pen strokes.",
"The early reflections of a room.": "The early reflections of a room.",
"The following media files could not be located. You can relink them to a new folder or dismiss this dialog to continue with offline placeholders.": "The following media files could not be located. You can relink them to a new folder or dismiss this dialog to continue with offline placeholders.",
+ "The incoming shot grows through a shape from the centre of the cut.": "The incoming shot grows through a shape from the centre of the cut.",
+ "The incoming shot pushes the outgoing one off the frame.": "The incoming shot pushes the outgoing one off the frame.",
+ "The incoming shot slides in over the outgoing one, which holds still underneath.": "The incoming shot slides in over the outgoing one, which holds still underneath.",
"The instant print: a cream matte, warm highlights, cyan creeping into the shadows, a little softness in the corners.": "The instant print: a cream matte, warm highlights, cyan creeping into the shadows, a little softness in the corners.",
"The left half, reflected onto the right.": "The left half, reflected onto the right.",
"The manual colour panel every picture clip carries: exposure, tone, balance, sharpness and edge.": "The manual colour panel every picture clip carries: exposure, tone, balance, sharpness and edge.",
"The narrow band of a phone line.": "The narrow band of a phone line.",
+ "The outgoing shot rotates away like a cube face as the incoming one rotates into view.": "The outgoing shot rotates away like a cube face as the incoming one rotates into view.",
+ "The outgoing shot spins away as the incoming one spins into place.": "The outgoing shot spins away as the incoming one spins into place.",
"The picture as a sci-fi projection: its hue thrown away for a blue ramp, edges glowing, scan lines drifting, a refresh sweep, tears and grain.": "The picture as a sci-fi projection: its hue thrown away for a blue ramp, edges glowing, scan lines drifting, a refresh sweep, tears and grain.",
+ "The picture flickers on and off like an unreliable neon sign.": "The picture flickers on and off like an unreliable neon sign.",
+ "The picture folded into repeating mirrored wedges around its centre.": "The picture folded into repeating mirrored wedges around its centre.",
"The picture pressed into relief, lit from the top left.": "The picture pressed into relief, lit from the top left.",
+ "The picture reduced to a grid of black and white dots.": "The picture reduced to a grid of black and white dots.",
+ "The picture scrolls sideways and wraps around, like a news ticker.": "The picture scrolls sideways and wraps around, like a news ticker.",
+ "The picture simplified into soft, posterised brush-like strokes.": "The picture simplified into soft, posterised brush-like strokes.",
+ "The picture twisted around its centre like a whirlpool.": "The picture twisted around its centre like a whirlpool.",
"The picture's edges drawn over it in its own colours.": "The picture's edges drawn over it in its own colours.",
+ "The picture's edges traced in drifting neon colour over black.": "The picture's edges traced in drifting neon colour over black.",
+ "The picture's tones remapped between a shadow colour and a highlight colour.": "The picture's tones remapped between a shadow colour and a highlight colour.",
"The project folder is created now; the edit autosaves into it.": "The project folder is created now; the edit autosaves into it.",
+ "The selected clip's voice": "The selected clip's voice",
+ "The silver-retention film process: colour washed out, contrast pushed hard.": "The silver-retention film process: colour washed out, contrast pushed hard.",
"The warm brown of an old photograph.": "The warm brown of an old photograph.",
"Theme": "Theme",
"There is nothing on the timeline to export": "There is nothing on the timeline to export",
"These settings apply to the whole edit and cannot be changed later.": "These settings apply to the whole edit and cannot be changed later.",
"This clip has no file to transcribe": "This clip has no file to transcribe",
+ "This file has no picture to enhance": "This file has no picture to enhance",
"Threshold": "Threshold",
+ "Tiles": "Tiles",
+ "Tilt Shift": "Tilt Shift",
"TIMELINE": "TIMELINE",
"Timeline": "Timeline",
"Timeline 1": "Timeline 1",
@@ -678,13 +880,20 @@
"Transcriber": "Transcriber",
"Transcribing": "Transcribing",
"Transform": "Transform",
+ "Transition": "Transition",
+ "transition": "transition",
"Transitions": "Transitions",
"Treatments": "Treatments",
"Treble": "Treble",
+ "Tropical": "Tropical",
+ "Turns": "Turns",
+ "Twirl": "Twirl",
+ "Twist": "Twist",
"Type the narration to read aloud…": "Type the narration to read aloud…",
"Type the words to put on screen…": "Type the words to put on screen…",
"Typography": "Typography",
"Umber": "Umber",
+ "Underwater": "Underwater",
"Undo": "Undo",
"Undo (⌘Z)": "Undo (⌘Z)",
"Unlock lane": "Unlock lane",
@@ -692,36 +901,62 @@
"Unpacking…": "Unpacking…",
"Untitled project": "Untitled project",
"Up or down by semitones, the length untouched.": "Up or down by semitones, the length untouched.",
+ "Vaporwave": "Vaporwave",
+ "Vast stadium echoes and reverberations across a massive arena.": "Vast stadium echoes and reverberations across a massive arena.",
"VBR": "VBR",
"Vertical": "Vertical",
"VHS": "VHS",
+ "Vibe": "Vibe",
"Vibrance": "Vibrance",
+ "Vibrant edge-detection luminescence with electric hue cycling.": "Vibrant edge-detection luminescence with electric hue cycling.",
"Video": "Video",
"Video Effects": "Video Effects",
+ "Video, YouTube": "Video, YouTube",
"View": "View",
"Vignette": "Vignette",
"Vintage": "Vintage",
+ "Vintage countdown leader with film grain and gate weave.": "Vintage countdown leader with film grain and gate weave.",
+ "Vintage VHS/camcorder on-screen display with tracking noise.": "Vintage VHS/camcorder on-screen display with tracking noise.",
+ "Vinyl": "Vinyl",
"Vivid": "Vivid",
+ "Vivid Landscape": "Vivid Landscape",
"Voice": "Voice",
"Voice added to the timeline": "Voice added to the timeline",
"Voices": "Voices",
"Volume": "Volume",
+ "Vortex Swirl": "Vortex Swirl",
"Warm": "Warm",
+ "Warm and saturated, the appetising push every food shot wants.": "Warm and saturated, the appetising push every food shot wants.",
+ "Warm red/orange glow bleeding around high-contrast edges.": "Warm red/orange glow bleeding around high-contrast edges.",
+ "Warm, vintage turntable character with band-limited sound.": "Warm, vintage turntable character with band-limited sound.",
"Warmth": "Warmth",
"Water": "Water",
"Water and sky turned aquamarine and brightened, sand and skin left warm and clean. The beach-day look creators reach for first.": "Water and sky turned aquamarine and brightened, sand and skin left warm and clean. The beach-day look creators reach for first.",
+ "Wave": "Wave",
+ "Wave Warp": "Wave Warp",
+ "Wavelength": "Wavelength",
+ "Weave": "Weave",
"What a connection must present before its first call. Left empty, the server makes one up each time it starts and shows it here.": "What a connection must present before its first call. Left empty, the server makes one up each time it starts and shows it here.",
"Where each model came from": "Where each model came from",
"Where should the project folder go?": "Where should the project folder go?",
+ "Whip Pan": "Whip Pan",
+ "Whisper": "Whisper",
"Whites": "Whites",
"Width": "Width",
+ "Winter Cool": "Winter Cool",
+ "Wipe": "Wipe",
+ "Wobble": "Wobble",
+ "Word Reveal": "Word Reveal",
"yesterday": "yesterday",
+ "Zoom": "Zoom",
+ "Zoom Blur": "Zoom Blur",
"Zoom In": "Zoom In",
"Zoom in": "Zoom in",
"Zoom Out": "Zoom Out",
"Zoom out": "Zoom out",
"Zoom to fit": "Zoom to fit",
"{0} channels": "{0} channels",
+ "{0} custom packages did not load; the first: {1}": "{0} custom packages did not load; the first: {1}",
"{0} days ago": "{0} days ago",
"{0} Hz": "{0} Hz",
"{0} installed · {1} MB on disk": "{0} installed · {1} MB on disk",
diff --git a/src/crates/concat/locales/es.json b/src/crates/concat/locales/es.json
index b29f5acf..9ff38053 100644
--- a/src/crates/concat/locales/es.json
+++ b/src/crates/concat/locales/es.json
@@ -254,7 +254,6 @@
"Imported {0} files": "{0} archivos importados",
"Importing…": "Importando…",
"In": "Entrada",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "Entrada y Salida actúan sobre los primeros y últimos segundos del clip; Combo recorre toda su duración. Cada una mueve el clip desde donde lo colocaste, así que posiciónalo primero.",
"In use": "En uso",
"Inspector": "Inspector",
"Intensity": "Intensidad",
@@ -309,7 +308,6 @@
"Montage": "Montaje",
"More low end.": "Más graves.",
"More sparkle.": "Más brillo.",
- "Motion": "Movimiento",
"Motion Blur": "Desenfoque de movimiento",
"Move {0} down": "Bajar {0}",
"Move {0} up": "Subir {0}",
diff --git a/src/crates/concat/locales/fa.json b/src/crates/concat/locales/fa.json
index 7123b7ad..d529a465 100644
--- a/src/crates/concat/locales/fa.json
+++ b/src/crates/concat/locales/fa.json
@@ -308,7 +308,6 @@
"Imported {0} look(s); find them under Imported": "{0} ظاهر وارد کردن شد؛ آن‌ها را در بخش Imported پیدا کنید",
"Importing…": "در حال وارد کردن…",
"In": "ورودی",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "In و Out در ثانیه‌های اول و آخر کلیپ پخش می‌شوند؛ Combo در تمام طول کلیپ اجرا می‌شود. هرکدام کلیپ را نسبت به محل قرارگیری‌اش حرکت می‌دهند، پس ابتدا موقعیت را تنظیم کنید.",
"In use": "در حال استفاده",
"Ink": "جوهر",
"Inspector": "بازرس",
@@ -387,7 +386,6 @@
"Moody": "حال‌وهوایی",
"More low end.": "Low End بیشتر.",
"More sparkle.": "Sparkle بیشتر.",
- "Motion": "حرکت",
"Motion Blur": "محوشدگی حرکتی (Motion Blur)",
"Move {0} down": "انتقال {0} به پایین",
"Move {0} up": "انتقال {0} به بالا",
diff --git a/src/crates/concat/locales/fr.json b/src/crates/concat/locales/fr.json
index 43a48b8c..76336a76 100644
--- a/src/crates/concat/locales/fr.json
+++ b/src/crates/concat/locales/fr.json
@@ -254,7 +254,6 @@
"Imported {0} files": "{0} fichiers importés",
"Importing…": "Importation…",
"In": "Entrée",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "Entrée et Sortie jouent sur les premières et dernières secondes du clip ; Combo sur toute sa durée. Chacune déplace le clip depuis là où vous l'avez posé : positionnez-le d'abord.",
"In use": "Utilisé",
"Inspector": "Inspecteur",
"Intensity": "Intensité",
@@ -309,7 +308,6 @@
"Montage": "Montage",
"More low end.": "Plus de graves.",
"More sparkle.": "Plus de brillance.",
- "Motion": "Mouvement",
"Motion Blur": "Flou de mouvement",
"Move {0} down": "Descendre {0}",
"Move {0} up": "Monter {0}",
diff --git a/src/crates/concat/locales/hr.json b/src/crates/concat/locales/hr.json
index cec53716..301f2def 100644
--- a/src/crates/concat/locales/hr.json
+++ b/src/crates/concat/locales/hr.json
@@ -314,7 +314,6 @@
"Imported {0} look(s); find them under Imported": "Uvezeno {0} izgleda; naći ćete ih pod Uvezeno",
"Importing…": "Uvoz…",
"In": "Ulaz",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "Ulaz i Izlaz izvode se preko prvih i zadnjih sekundi klipa; Kombo traje cijelom dužinom. Svaki miče klip s mjesta na koje ste ga stavili, pa ga prvo pozicionirajte.",
"In use": "U uporabi",
"Ink": "Tinta",
"Inspector": "Inspektor",
@@ -390,7 +389,6 @@
"Moody": "Ćudljivo",
"More low end.": "Više niskih tonova.",
"More sparkle.": "Više svjetlucanja.",
- "Motion": "Pokret",
"Motion Blur": "Zamućenje pokreta",
"Move {0} down": "Pomakni {0} dolje",
"Move {0} up": "Pomakni {0} gore",
diff --git a/src/crates/concat/locales/it.json b/src/crates/concat/locales/it.json
index c8b75aec..a9f478f4 100644
--- a/src/crates/concat/locales/it.json
+++ b/src/crates/concat/locales/it.json
@@ -254,7 +254,6 @@
"Imported {0} files": "{0} file importati",
"Importing…": "Importazione…",
"In": "Entrata",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "Entrata e Uscita agiscono sui primi e sugli ultimi secondi della clip; Combo su tutta la durata. Ognuna sposta la clip da dove l'hai messa, quindi posizionala prima.",
"In use": "In uso",
"Inspector": "Ispettore",
"Intensity": "Intensità",
@@ -309,7 +308,6 @@
"Montage": "Montaggio",
"More low end.": "Più bassi.",
"More sparkle.": "Più brillantezza.",
- "Motion": "Movimento",
"Motion Blur": "Sfocatura di movimento",
"Move {0} down": "Sposta {0} in basso",
"Move {0} up": "Sposta {0} in alto",
diff --git a/src/crates/concat/locales/ja.json b/src/crates/concat/locales/ja.json
index 6f2a6e6f..b555f6fc 100644
--- a/src/crates/concat/locales/ja.json
+++ b/src/crates/concat/locales/ja.json
@@ -254,7 +254,6 @@
"Imported {0} files": "{0} 個のファイルを読み込みました",
"Importing…": "読み込み中…",
"In": "イン",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "インとアウトはクリップの最初と最後の数秒で再生され、コンボは全体にわたって再生されます。どれも配置した位置からクリップを動かすので、先に位置を決めてください。",
"In use": "使用中",
"Inspector": "インスペクター",
"Intensity": "強さ",
@@ -309,7 +308,6 @@
"Montage": "モンタージュ",
"More low end.": "低音を増やします。",
"More sparkle.": "きらめきを増やします。",
- "Motion": "モーション",
"Motion Blur": "モーションブラー",
"Move {0} down": "{0} を下へ",
"Move {0} up": "{0} を上へ",
diff --git a/src/crates/concat/locales/ko.json b/src/crates/concat/locales/ko.json
index ebd673f8..aef625a0 100644
--- a/src/crates/concat/locales/ko.json
+++ b/src/crates/concat/locales/ko.json
@@ -254,7 +254,6 @@
"Imported {0} files": "파일 {0}개를 가져왔습니다",
"Importing…": "가져오는 중…",
"In": "인",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "인과 아웃은 클립의 처음과 마지막 몇 초 동안 재생되고, 콤보는 전체 길이에 걸쳐 재생됩니다. 모두 배치한 위치에서 클립을 움직이므로 먼저 위치를 잡으세요.",
"In use": "사용 중",
"Inspector": "인스펙터",
"Intensity": "강도",
@@ -309,7 +308,6 @@
"Montage": "몽타주",
"More low end.": "저음을 더 키웁니다.",
"More sparkle.": "반짝임을 더합니다.",
- "Motion": "모션",
"Motion Blur": "모션 블러",
"Move {0} down": "{0} 아래로",
"Move {0} up": "{0} 위로",
diff --git a/src/crates/concat/locales/pt-BR.json b/src/crates/concat/locales/pt-BR.json
index 8d7035c0..cfea8c44 100644
--- a/src/crates/concat/locales/pt-BR.json
+++ b/src/crates/concat/locales/pt-BR.json
@@ -254,7 +254,6 @@
"Imported {0} files": "{0} arquivos importados",
"Importing…": "Importando…",
"In": "Entrada",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "Entrada e Saída atuam nos primeiros e últimos segundos do clipe; Combo percorre toda a duração. Cada uma move o clipe de onde você o colocou, então posicione-o primeiro.",
"In use": "Em uso",
"Inspector": "Inspetor",
"Intensity": "Intensidade",
@@ -309,7 +308,6 @@
"Montage": "Montagem",
"More low end.": "Mais graves.",
"More sparkle.": "Mais brilho.",
- "Motion": "Movimento",
"Motion Blur": "Desfoque de movimento",
"Move {0} down": "Mover {0} para baixo",
"Move {0} up": "Mover {0} para cima",
diff --git a/src/crates/concat/locales/ru.json b/src/crates/concat/locales/ru.json
index a9b4aae1..5ebb567a 100644
--- a/src/crates/concat/locales/ru.json
+++ b/src/crates/concat/locales/ru.json
@@ -254,7 +254,6 @@
"Imported {0} files": "Импортировано файлов: {0}",
"Importing…": "Импорт…",
"In": "Начало",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "Начало и Конец играют на первых и последних секундах клипа; Комбо — по всей длине. Каждая двигает клип от места, куда вы его поставили, поэтому сначала расположите его.",
"In use": "Используется",
"Inspector": "Инспектор",
"Intensity": "Интенсивность",
@@ -309,7 +308,6 @@
"Montage": "Монтаж",
"More low end.": "Больше низов.",
"More sparkle.": "Больше блеска.",
- "Motion": "Движение",
"Motion Blur": "Размытие в движении",
"Move {0} down": "Переместить {0} вниз",
"Move {0} up": "Переместить {0} вверх",
diff --git a/src/crates/concat/locales/tr.json b/src/crates/concat/locales/tr.json
index eef6616e..28423538 100644
--- a/src/crates/concat/locales/tr.json
+++ b/src/crates/concat/locales/tr.json
@@ -254,7 +254,6 @@
"Imported {0} files": "{0} dosya içe aktarıldı",
"Importing…": "İçe aktarılıyor…",
"In": "Giriş",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "Giriş ve Çıkış klibin ilk ve son saniyelerinde oynar; Kombo tüm süresince sürer. Her biri klibi yerleştirdiğiniz yerden hareket ettirir, o yüzden önce konumlandırın.",
"In use": "Kullanımda",
"Inspector": "Denetçi",
"Intensity": "Yoğunluk",
@@ -309,7 +308,6 @@
"Montage": "Montaj",
"More low end.": "Daha çok bas.",
"More sparkle.": "Daha çok parıltı.",
- "Motion": "Hareket",
"Motion Blur": "Hareket bulanıklığı",
"Move {0} down": "{0} aşağı taşı",
"Move {0} up": "{0} yukarı taşı",
diff --git a/src/crates/concat/locales/zh-Hans.json b/src/crates/concat/locales/zh-Hans.json
index 413098fa..04d917c8 100644
--- a/src/crates/concat/locales/zh-Hans.json
+++ b/src/crates/concat/locales/zh-Hans.json
@@ -254,7 +254,6 @@
"Imported {0} files": "已导入 {0} 个文件",
"Importing…": "正在导入…",
"In": "入场",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "入场和出场作用于片段的开头和结尾几秒;组合贯穿全程。它们都会从你放置的位置移动片段,所以请先定好位置。",
"In use": "使用中",
"Inspector": "检查器",
"Intensity": "强度",
@@ -309,7 +308,6 @@
"Montage": "蒙太奇",
"More low end.": "更多低频。",
"More sparkle.": "更多亮泽。",
- "Motion": "运动",
"Motion Blur": "运动模糊",
"Move {0} down": "下移 {0}",
"Move {0} up": "上移 {0}",
diff --git a/src/crates/concat/locales/zh-TW.json b/src/crates/concat/locales/zh-TW.json
index 3a977c45..379450c4 100644
--- a/src/crates/concat/locales/zh-TW.json
+++ b/src/crates/concat/locales/zh-TW.json
@@ -314,7 +314,6 @@
"Imported {0} look(s); find them under Imported": "已匯入 {0} 個調色風格,可在 [Imported] 分類中找到",
"Importing…": "正在匯入…",
"In": "進場",
- "In and Out play over the clip's first and last seconds; Combo runs its whole length. Each moves the clip from where you placed it, so position it first.": "進場與退場動畫分別在片段開頭與結尾播放;組合動畫則持續整段片段。動畫會以片段目前的位置為起點移動,因此請先調整位置。",
"In use": "使用中",
"Ink": "墨線",
"Inspector": "檢查器",
@@ -390,7 +389,6 @@
"Moody": "沉鬱",
"More low end.": "增強低頻。",
"More sparkle.": "增添明亮感。",
- "Motion": "動態",
"Motion Blur": "動態模糊",
"Move {0} down": "將 {0} 下移",
"Move {0} up": "將 {0} 上移",
diff --git a/src/crates/concat/src/host.rs b/src/crates/concat/src/host.rs
index cab5ebfd..c864d720 100644
--- a/src/crates/concat/src/host.rs
+++ b/src/crates/concat/src/host.rs
@@ -552,6 +552,7 @@ pub fn media_art(
project: String,
stream: Option<u32>,
pictures: bool,
+ range: Option<concat_media::ColorRange>,
) -> MediaArt {
use concat_project::model::MediaKind;
if stream.is_some() {
@@ -587,7 +588,7 @@ pub fn media_art(
.flatten();
// The filmstrip reads the proxy where the file has one: the tiles are
// small, and a 4K file's frames cost more than they show.
- let strip_source = concat_host::proxy::existing(std::path::Path::new(&project), &path)
+ let strip_source = concat_host::proxy::existing(std::path::Path::new(&project), &path, range)
.map(|proxy| proxy.to_string_lossy().into_owned())
.unwrap_or_else(|| path.clone());
let strip = if pictures {
diff --git a/src/crates/concat/src/lib.rs b/src/crates/concat/src/lib.rs
index d63707eb..f6e40878 100644
--- a/src/crates/concat/src/lib.rs
+++ b/src/crates/concat/src/lib.rs
@@ -1020,6 +1020,9 @@ pub fn run() -> Result<(), slint::PlatformError> {
app.on_export_ten_bit_changed(on_window!(|state, on: bool| {
state.handle(Msg::Export(ExportMsg::TenBitChanged(on)));
}));
+ app.on_export_color_range_changed(on_window!(|state, index: i32| {
+ state.handle(Msg::Export(ExportMsg::ColorRangeChanged(index)));
+ }));
app.on_export_advanced_toggled(on_window!(|state, on: bool| {
state.handle(Msg::Export(ExportMsg::AdvancedToggled(on)));
}));
diff --git a/src/crates/concat/src/panes/export.rs b/src/crates/concat/src/panes/export.rs
index a6539300..c874fd1f 100644
--- a/src/crates/concat/src/panes/export.rs
+++ b/src/crates/concat/src/panes/export.rs
@@ -14,6 +14,7 @@
//! fields.
use concat_host::export::{self, ExportSpec};
+use concat_media::ColorRange;
use crate::format::{bytes, eta};
use crate::host::{on_ui, spawn};
@@ -38,6 +39,8 @@ pub enum ExportMsg {
QualityChanged(i32),
CodecChanged(i32),
TenBitChanged(bool),
+ /// Limited or full range, as a row of the Advanced section's list.
+ ColorRangeChanged(i32),
/// The Advanced section is opened or closed.
AdvancedToggled(bool),
/// VBR or CBR.
@@ -74,6 +77,10 @@ pub struct ExportPane {
/// Index into `VideoCodec::ALL`.
pub codec: usize,
pub ten_bit: bool,
+ /// Index into `ColorRange::ALL`: 0 limited, 1 full. Read only while
+ /// the Advanced section is open, like the bitrate.
+ /// https://github.com/jub0t/Concat/issues/103
+ pub color_range: usize,
/// The Advanced section is open: bitrate controls show, and the size
/// estimate reads the chosen bitrate.
pub advanced: bool,
@@ -102,6 +109,7 @@ impl Default for ExportPane {
quality: 1,
codec: 0,
ten_bit: false,
+ color_range: 0,
advanced: false,
rate_mode: 0,
bitrate: 8000,
@@ -136,6 +144,9 @@ impl ExportPane {
ExportMsg::QualityChanged(index) => self.quality = (index.max(0) as usize).min(2),
ExportMsg::CodecChanged(index) => self.codec = (index.max(0) as usize).min(2),
ExportMsg::TenBitChanged(on) => self.ten_bit = on,
+ ExportMsg::ColorRangeChanged(index) => {
+ self.color_range = (index.max(0) as usize).min(ColorRange::ALL.len() - 1);
+ }
ExportMsg::AdvancedToggled(on) => self.advanced = on,
ExportMsg::RateModeChanged(index) => self.rate_mode = index.max(0) as usize,
ExportMsg::BitrateChanged(text) => {
@@ -231,6 +242,17 @@ impl ExportPane {
concat_media::VideoCodec::ALL[self.codec.min(concat_media::VideoCodec::ALL.len() - 1)]
}
+ /// The range the file is written in: the Advanced section's choice
+ /// while the section is open, video range otherwise - so a sheet with
+ /// Advanced off exports what it always did.
+ pub fn color_range(&self) -> ColorRange {
+ if self.advanced {
+ ColorRange::ALL[self.color_range.min(ColorRange::ALL.len() - 1)]
+ } else {
+ ColorRange::Limited
+ }
+ }
+
/// Starts the render on a worker. Its reports come back as messages.
fn start(&mut self, studio: &mut Studio) {
let Some(session) = studio.session.as_ref() else {
@@ -270,6 +292,7 @@ impl ExportPane {
} else {
0
},
+ color_range: self.color_range(),
};
let (frame_w, frame_h) = studio.output_size();
let titles = studio
@@ -351,6 +374,7 @@ impl ExportPane {
quality: self.quality as i32,
codec: self.codec as i32,
ten_bit: self.ten_bit,
+ color_range: self.color_range as i32,
advanced: self.advanced,
rate_mode: self.rate_mode as i32,
bitrate: self.bitrate as i32,
@@ -363,6 +387,9 @@ impl ExportPane {
if self.ten_bit {
words.push("10-bit".to_owned());
}
+ if self.color_range() == ColorRange::Full {
+ words.push(t("full range"));
+ }
if codec
.encoders(true)
.first()
diff --git a/src/crates/concat/src/studio.rs b/src/crates/concat/src/studio.rs
index 4fc39170..a920614e 100644
--- a/src/crates/concat/src/studio.rs
+++ b/src/crates/concat/src/studio.rs
@@ -1901,6 +1901,7 @@ impl Studio {
&item.path,
width,
height,
+ item.color_range.map(concat_export::engine_range),
);
}
}
@@ -1914,6 +1915,9 @@ impl Studio {
duration: Option<f64>,
stream: Option<u32>,
pictures: bool,
+ /// The levels the file is read as, so the filmstrip reads the
+ /// proxy written for that reading.
+ range: Option<concat_media::ColorRange>,
}
let project = self.project();
let mut wanted: Vec<Want> = project
@@ -1938,6 +1942,7 @@ impl Studio {
duration: item.duration,
stream: None,
pictures: item.kind != model::MediaKind::Audio,
+ range: item.color_range.map(concat_export::engine_range),
})
.collect();
// The other streams clips have chosen, once each.
@@ -1975,6 +1980,7 @@ impl Studio {
duration: item.duration,
stream: Some(stream),
pictures: false,
+ range: item.color_range.map(concat_export::engine_range),
});
}
for want in wanted {
@@ -1987,6 +1993,7 @@ impl Studio {
duration,
stream,
mut pictures,
+ range,
} = want;
// Restore pictures from the project's JPEG artwork cache before
@@ -2016,7 +2023,7 @@ impl Studio {
spawn_art(
move || {
media_art(
- id, path, kind, has_audio, duration, project, stream, pictures,
+ id, path, kind, has_audio, duration, project, stream, pictures, range,
)
},
|studio, _, _, art: MediaArt| {
@@ -3154,7 +3161,11 @@ impl Studio {
let after = echo.active().clip(&clip).cloned();
self.echo = None;
let Some(after) = after else { return };
- let new_duration = after.transition_in.as_ref().map(|t| t.duration).unwrap_or(0.0);
+ let new_duration = after
+ .transition_in
+ .as_ref()
+ .map(|t| t.duration)
+ .unwrap_or(0.0);
if (new_duration - f64::from(original_duration)).abs() > 1e-4 {
self.set_clip_transition_duration(&clip, new_duration);
}
@@ -3195,11 +3206,30 @@ impl Studio {
};
self.begin_echo();
let value = f64::from(value);
+ // The one field that is the media's rather than the clip's: set on
+ // the echo's bin item, and committed as its own command below.
+ if field == ClipField::ColorRange {
+ let media_id = self.clip(&id).map(|clip| clip.media_id.clone());
+ if let Some(media_id) = media_id
+ && let Some(item) = self
+ .echo
+ .as_mut()
+ .and_then(|echo| echo.media.iter_mut().find(|item| item.id == media_id))
+ {
+ item.color_range = match value as i32 {
+ 1 => Some(model::ColorRange::Limited),
+ 2 => Some(model::ColorRange::Full),
+ _ => None,
+ };
+ }
+ return;
+ }
let Some(clip) = self.echo_clip_mut(&id) else {
return;
};
let text = clip.text.get_or_insert_with(TextStyle::default);
match field {
+ ClipField::ColorRange => {}
ClipField::Scale => clip.scale = value.clamp(0.05, 8.0),
ClipField::AudioTrack => {
// The first row is the file's default and is stored as such,
@@ -3576,6 +3606,26 @@ impl Studio {
if patch != ClipPatch::default() {
commands.push(Command::UpdateClip { clip_id: id, patch });
}
+ // The media's own field, edited through the clip: the echo's bin
+ // item against the session's.
+ let range_after = self
+ .echo
+ .as_ref()
+ .and_then(|echo| echo.media_by_id(&after.media_id))
+ .map(|item| item.color_range);
+ let range_before = self
+ .session
+ .as_ref()
+ .and_then(|session| session.project().media_by_id(&after.media_id))
+ .map(|item| item.color_range);
+ if let (Some(now), Some(was)) = (range_after, range_before)
+ && now != was
+ {
+ commands.push(Command::SetMediaColorRange {
+ media_id: after.media_id.clone(),
+ range: now,
+ });
+ }
self.echo = None;
if commands.is_empty() {
return;
@@ -5907,6 +5957,19 @@ impl Studio {
});
SelectedClipData {
present: true,
+ // -1 hides the control: a title, a layer or a sound has no
+ // picture file whose levels could be named.
+ color_range: if clip.kind.is_visual() {
+ self.project()
+ .media_by_id(&clip.media_id)
+ .map_or(-1, |item| match item.color_range {
+ None => 0,
+ Some(model::ColorRange::Limited) => 1,
+ Some(model::ColorRange::Full) => 2,
+ })
+ } else {
+ -1
+ },
frame_width: self.output_size().0 as i32,
frame_height: self.output_size().1 as i32,
id: clip.id.as_str().into(),
@@ -6194,7 +6257,14 @@ impl Studio {
views: self
.library
.iter()
- .map(|view| (view.query.clone(), view.group, view.favourites, view.category.clone()))
+ .map(|view| {
+ (
+ view.query.clone(),
+ view.group,
+ view.favourites,
+ view.category.clone(),
+ )
+ })
.collect(),
favourites: starred.clone(),
};
diff --git a/src/crates/concat/ui/app.slint b/src/crates/concat/ui/app.slint
index 20ca1258..b298170d 100644
--- a/src/crates/concat/ui/app.slint
+++ b/src/crates/concat/ui/app.slint
@@ -185,6 +185,7 @@ export component App inherits Window {
callback export-quality-changed(index: int);
callback export-codec-changed(index: int);
callback export-ten-bit-changed(on: bool);
+ callback export-color-range-changed(index: int);
callback export-advanced-toggled(on: bool);
callback export-rate-mode-changed(index: int);
callback export-bitrate-changed(text: string);
@@ -484,6 +485,7 @@ export component App inherits Window {
quality-changed(index) => { root.export-quality-changed(index); }
codec-changed(index) => { root.export-codec-changed(index); }
ten-bit-changed(on) => { root.export-ten-bit-changed(on); }
+ color-range-changed(index) => { root.export-color-range-changed(index); }
advanced-toggled(on) => { root.export-advanced-toggled(on); }
rate-mode-changed(index) => { root.export-rate-mode-changed(index); }
bitrate-changed(text) => { root.export-bitrate-changed(text); }
diff --git a/src/crates/concat/ui/dialogs/export.slint b/src/crates/concat/ui/dialogs/export.slint
index 8e710e35..1ec09b3a 100644
--- a/src/crates/concat/ui/dialogs/export.slint
+++ b/src/crates/concat/ui/dialogs/export.slint
@@ -34,6 +34,8 @@ export struct ExportData {
/// index into the codec list: H.264, HEVC, AV1
codec: int,
ten-bit: bool,
+ /// 0 = limited (video) range, 1 = full. Shown under Advanced.
+ color-range: int,
/// The Advanced section is open: bitrate controls show.
advanced: bool,
/// 0 = VBR, 1 = CBR.
@@ -166,6 +168,7 @@ export component ExportDialog inherits Modal {
callback quality-changed(index: int);
callback codec-changed(index: int);
callback ten-bit-changed(on: bool);
+ callback color-range-changed(index: int);
callback advanced-toggled(on: bool);
callback rate-mode-changed(index: int);
callback bitrate-changed(text: string);
@@ -346,6 +349,25 @@ export component ExportDialog inherits Modal {
}
}
+ // The levels the file is written in. Limited is what every player
+ // and YouTube expect; full is for screen content bound for a PC
+ // player that reads the tag. Both are tagged true, so the choice
+ // is about the player, not about the picture.
+ // https://github.com/jub0t/Concat/issues/103
+ if !root.running && root.data.advanced: DialogSection {
+ title: I18n.t("Colour");
+
+ DialogRow {
+ label: I18n.t("Colour range");
+ Select {
+ current: root.data.color-range;
+ options: [I18n.t("Limited"), I18n.t("Full")];
+ details: [I18n.t("Video, YouTube"), I18n.t("Screen content")];
+ changed(index) => { root.color-range-changed(index); }
+ }
+ }
+ }
+
// ── the footer ───────────────────────────────────────────────────
Rectangle {
height: 1px;
diff --git a/src/crates/concat/ui/inspector/clip-inspector.slint b/src/crates/concat/ui/inspector/clip-inspector.slint
index c3fb144c..d7eb61ee 100644
--- a/src/crates/concat/ui/inspector/clip-inspector.slint
+++ b/src/crates/concat/ui/inspector/clip-inspector.slint
@@ -1410,7 +1410,9 @@ export component AudioPanel inherits VerticalLayout {
/// which one this clip plays; a file with one has nothing to choose and
/// shows no row.
in property <[string]> audio-tracks;
- property <bool> choosing: root.audio-tracks.length > 1;
+ /// The Source section has something to offer: a choice of audio
+ /// track, or a picture file whose levels can be named.
+ property <bool> choosing: root.audio-tracks.length > 1 || root.selected.color-range >= 0;
callback set(field: ClipField, value: float);
callback commit();
@@ -1445,7 +1447,7 @@ export component AudioPanel inherits VerticalLayout {
progress: root.selected.enhance-progress;
fetching: root.selected.enhance-fetching;
}
- Row {
+ if root.audio-tracks.length > 1: Row {
label: I18n.t("Audio track");
Select {
options: root.audio-tracks;
@@ -1456,6 +1458,23 @@ export component AudioPanel inherits VerticalLayout {
}
}
}
+ // The levels the file really spans, for one that lies about it: a
+ // screen recording that plays grey where it should be black is a
+ // full-range file tagged nothing, and "Full" is the fix. Set on
+ // the media, so every clip of the file follows.
+ // https://github.com/jub0t/Concat/issues/103
+ if root.selected.color-range >= 0: Row {
+ label: I18n.t("Colour range");
+ Select {
+ options: [I18n.t("As tagged"), I18n.t("Limited"), I18n.t("Full")];
+ details: ["", "16-235", "0-255"];
+ current: root.selected.color-range;
+ changed(index) => {
+ root.set(ClipField.color-range, index);
+ root.commit();
+ }
+ }
+ }
}
}
diff --git a/src/crates/concat/ui/timeline/model.slint b/src/crates/concat/ui/timeline/model.slint
index b011c950..8838dc93 100644
--- a/src/crates/concat/ui/timeline/model.slint
+++ b/src/crates/concat/ui/timeline/model.slint
@@ -166,6 +166,9 @@ export enum ClipField {
/// which of the media's audio tracks the clip plays, as a row of
/// Editor.audio-tracks
audio-track,
+ /// the levels the clip's file is read as: 0 as tagged, 1 limited,
+ /// 2 full. A property of the media, set from the clip.
+ color-range,
}
/// One keyable property's state at the playhead, as the inspector needs it.
@@ -331,6 +334,11 @@ export struct SelectedClipData {
enhance-progress: float,
enhance-fetching: bool,
+ // the levels the clip's media is read as: 0 as the file is tagged,
+ // 1 limited, 2 full; -1 for a clip with no picture file behind it,
+ // which hides the control
+ color-range: int,
+
// the overlay, when this is a text clip
content: string,
font-family: string,