The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.
Rust ffmpegfree-video-editormodel-context-protocolnon-linear-editoroffline-firstopen-source-video-editorself-hostedvideo-editingvideo-editing-automationvideo-editing-softwarevideo-editing-toolsvideo-editorvoice-cloningyoutube-automationyoutube-shorts
feat(export): a bitrate, not a quality tier: Higher, Recommended, Lower or typed, and a size that is the size written
Jareer89258aae6385
diff --git a/src/crates/concat-media/src/encode.rs b/src/crates/concat-media/src/encode.rsindex 0e2ba730..66b6e924 100644--- a/src/crates/concat-media/src/encode.rs+++ b/src/crates/concat-media/src/encode.rs@@ -227,6 +227,12 @@ pub enum RateMode {/// Only the soft encoders support it; hardware encoders fall back to/// VBR because their rate control differs.Cbr,+ /// A file's: `bitrate_kbps` is the average the encoder aims for, and a+ /// busy passage may reach half again as much, so the size is known+ /// before the render and a calm passage is not padded to the target.+ /// What every editor's bitrate setting means, and what the export+ /// sheet asks for.+ Average,}impl RateMode {@@ -235,11 +241,12 @@ impl RateMode {match self {RateMode::Vbr => "vbr",RateMode::Cbr => "cbr",+ RateMode::Average => "average",}}/// Every mode, in the order a menu lists them.- pub const ALL: [RateMode; 2] = [RateMode::Vbr, RateMode::Cbr];+ pub const ALL: [RateMode; 3] = [RateMode::Vbr, RateMode::Cbr, RateMode::Average];}/// Encoder settings.@@ -604,6 +611,7 @@ fn open_video(let family = Family::of(encoder_name);let pixel_format = family.pixel_format(options.ten_bit);let cbr = options.rate_mode == RateMode::Cbr && options.bitrate_kbps > 0;+ let average = options.rate_mode == RateMode::Average && options.bitrate_kbps > 0;let mut video = ffmpeg::codec::Context::new_with_codec(codec).encoder().video()@@ -659,7 +667,7 @@ fn open_video(// The encoders steered by a bitrate alone take one whatever the mode:// the target in CBR, and in VBR the rate the CRF would come to.if family.steered_by_bitrate() {- let kbps = if cbr {+ let kbps = if cbr || average {options.bitrate_kbps} else {implied_kbps(options.codec, options.crf, width, height, rate)@@ -670,8 +678,19 @@ fn open_video(let fps = (f64::from(rate.numerator()) / f64::from(rate.denominator().max(1))).round();video.set_gop((fps.max(1.0) * 2.0) as u32);}+ // An average, on the context as well as in each encoder's own words:+ // the AV1 encoders read the target and the ceiling from there.+ if average {+ video.set_bit_rate(options.bitrate_kbps as usize * 1000);+ video.set_max_bit_rate(options.bitrate_kbps as usize * 1500);+ }let crf = options.crf.to_string();let bitrate = format!("{}k", options.bitrate_kbps);+ // The average's ceiling, half again the target, and a buffer of two+ // seconds' worth: room for a cut to a busy shot without the encoder+ // starving the frames after it.+ let peak = format!("{}k", options.bitrate_kbps * 3 / 2);+ let window = format!("{}k", options.bitrate_kbps * 2);// One second of VBV, not two. With a looser buffer x264 can stay// well under b:v on calm content and never emit the padding that// makes a CBR a CBR; `bufsize == bitrate` is where it starts@@ -705,10 +724,24 @@ fn open_video("bufsize" => bufsize.as_str(),"x265-params" => "strict-cbr=1",},+ "libx264" | "libx265" if average => ffmpeg::dict! {+ "preset" => options.preset.as_str(),+ "b" => bitrate.as_str(),+ "maxrate" => peak.as_str(),+ "bufsize" => window.as_str(),+ },"libx264" | "libx265" => ffmpeg::dict! {"preset" => options.preset.as_str(),"crf" => crf.as_str(),},+ // The context carries the target and the ceiling (above); the+ // encoder runs its own VBR to them.+ "libsvtav1" if average => ffmpeg::dict! {+ "preset" => &svt_preset(&options.preset).to_string(),+ },+ "libaom-av1" if average => ffmpeg::dict! {+ "cpu-used" => "6",+ },"libsvtav1" => ffmpeg::dict! {"preset" => &svt_preset(&options.preset).to_string(),// AV1's CRF runs to 63 and reads a few steps coarser than@@ -719,6 +752,16 @@ fn open_video("crf" => &options.crf.saturating_add(8).min(63).to_string(),"cpu-used" => "6",},+ // VideoToolbox steers by the context's bitrate when it is given no+ // quality.+ "hevc_videotoolbox" | "h264_videotoolbox" if average => ffmpeg::dict! {+ "profile" => match (encoder_name, options.ten_bit) {+ ("h264_videotoolbox", _) => "high",+ (_, true) => "main10",+ (_, false) => "main",+ },+ "allow_sw" => "1",+ },"hevc_videotoolbox" | "h264_videotoolbox" => ffmpeg::dict! {"q:v" => &videotoolbox_quality(options.crf).to_string(),"profile" => match (encoder_name, options.ten_bit) {@@ -748,6 +791,13 @@ fn open_video("maxrate" => bitrate.as_str(),"bufsize" => bufsize.as_str(),},+ _ if family == Family::Nvenc && average => ffmpeg::dict! {+ "preset" => "p5",+ "rc" => "vbr",+ "b" => bitrate.as_str(),+ "maxrate" => peak.as_str(),+ "bufsize" => window.as_str(),+ },_ if family == Family::Nvenc => ffmpeg::dict! {"preset" => "p5","rc" => "vbr",@@ -761,6 +811,12 @@ fn open_video("maxrate" => bitrate.as_str(),"bufsize" => bufsize.as_str(),},+ _ if family == Family::Qsv && average => ffmpeg::dict! {+ "preset" => "medium",+ "b" => bitrate.as_str(),+ "maxrate" => peak.as_str(),+ "bufsize" => window.as_str(),+ },_ if family == Family::Qsv => ffmpeg::dict! {"preset" => "medium","global_quality" => &options.crf.clamp(1, 51).to_string(),@@ -770,6 +826,12 @@ fn open_video("rc" => "cbr","b" => bitrate.as_str(),},+ _ if family == Family::Amf && average => ffmpeg::dict! {+ "quality" => "quality",+ "rc" => "vbr_peak",+ "b" => bitrate.as_str(),+ "maxrate" => peak.as_str(),+ },_ if family == Family::Amf => ffmpeg::dict! {"quality" => "quality","rc" => "cqp",@@ -1802,6 +1864,62 @@ mod tests {let _ = std::fs::remove_dir_all(&dir);}+ /// An average-bitrate export, the export sheet's: busy pictures come+ /// out near the target, so the size the sheet promised is the size+ /// written, and calm ones well under it, not padded up to it as CBR+ /// pads.+ #[test]+ fn an_average_export_keeps_near_its_target_and_does_not_pad() {+ let dir =+ std::env::temp_dir().join(format!("concat-media-abr-test-{}", std::process::id()));+ let _ = std::fs::remove_dir_all(&dir);+ std::fs::create_dir_all(&dir).expect("scratch dir");+ const KBPS: u32 = 2_000;+ const FRAMES: u32 = 60;+ let seconds = f64::from(FRAMES) / 30.0;+ for codec in [VideoCodec::H264, VideoCodec::Hevc] {+ let options = EncodeOptions {+ codec,+ preset: "ultrafast".to_owned(),+ rate_mode: RateMode::Average,+ bitrate_kbps: KBPS,+ hardware: false,+ ..EncodeOptions::default()+ };+ let rate_of = |noisy: bool| {+ let path = dir.join(format!("{}-{noisy}.mp4", codec.name()));+ let mut encoder = Encoder::create(&path, 320, 180, FrameRate::THIRTY, &options)+ .unwrap_or_else(|error| panic!("{codec:?} average opens: {error}"));+ let mut frame = Frame::black(320, 180);+ let mut state = 0x2545_F491_4F6C_DD1D_u64;+ for _ in 0..FRAMES {+ if noisy {+ for byte in frame.pixels_mut() {+ state ^= state << 13;+ state ^= state >> 7;+ state ^= state << 17;+ *byte = state as u8;+ }+ }+ encoder.write_frame(&frame).expect("writes");+ }+ encoder.finish().expect("finishes");+ std::fs::metadata(&path).expect("written").len() as f64 * 8.0 / 1000.0 / seconds+ };+ let busy = rate_of(true);+ assert!(+ (f64::from(KBPS) * 0.6..=f64::from(KBPS) * 1.6).contains(&busy),+ "{codec:?} averaging {KBPS} kb/s came out at {busy:.0} kb/s on noise"+ );+ let calm = rate_of(false);+ assert!(+ calm < f64::from(KBPS) * 0.5,+ "{codec:?} averaging {KBPS} kb/s padded a black picture to {calm:.0} kb/s"+ );+ }+ let _ = std::fs::remove_dir_all(&dir);+ }+/// Every written frame decodes back, at a frame rate an even number of/// frames does not land on a round second at (25 fps, 6 seconds: every/// packet but the last infers its duration from the one after it, so adiff --git a/src/crates/concat/locales/ar.json b/src/crates/concat/locales/ar.jsonindex 61b72919..c0c804ff 100644--- a/src/crates/concat/locales/ar.json+++ b/src/crates/concat/locales/ar.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "صامت",- "export.advanced": "متقدّم","export.asTheTimeline": "مثل المخطط الزمني","export.bitrate": "معدّل البت","export.browse": "استعراض","export.cancelExport": "إلغاء التصدير",- "export.cbr": "CBR","export.codec": "الترميز",- "export.colour": "اللون","export.contents": "المحتويات","export.couldNotPublish": "تعذّر الحفظ في {0}: {1}","export.couldNotShowFile": "تعذّر عرض الملف: {0}",@@ -200,11 +197,10 @@"export.exported": "تم التصدير · {0}","export.finalisingFile": "جارٍ إنهاء الملف","export.format": "الصيغة",- "export.fullRange": "النطاق الكامل","export.halfTheSize": "نصف الحجم","export.hardware": "عتاد",- "export.high": "عالية",- "export.master": "رئيسي",+ "export.higher": "أعلى",+ "export.lower": "أقل","export.mixingAudio": "جارٍ مزج الصوت","export.nameNeedsToBeAFileName": "يجب أن يكون الاسم اسم ملف: غير فارغ، ولا يحتوي أيًّا من / \\ : * ? \" < > |","export.notOnThisDevice": "غير متوفر على هذا الجهاز",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} موجود بالفعل. سيستبدله التصدير.","export.replaceFileTitle": "استبدال الملف؟","export.resolution": "الدقة",- "export.screenContent": "محتوى الشاشة",- "export.share": "مشاركة",- "export.showAdvancedOptions": "إظهار الخيارات المتقدّمة","export.showInFolder": "إظهار في المجلد","export.smallest": "الأصغر","export.summary": "الملخّص",@@ -228,8 +221,6 @@"export.tenBitColour": "لون 10 بت","export.timelineSize": "المخطط الزمني","export.toneMapped": "مُعيَّن الدرجات، يعمل في أي مكان",- "export.vbr": "VBR",- "export.videoYoutube": "فيديو، YouTube","format.almostDone": "على وشك الانتهاء","format.daysAgo": "قبل {0} أيام","format.justNow": "الآن",diff --git a/src/crates/concat/locales/bn.json b/src/crates/concat/locales/bn.jsonindex 99c9878e..7cbd863f 100644--- a/src/crates/concat/locales/bn.json+++ b/src/crates/concat/locales/bn.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "নীরব",- "export.advanced": "অ্যাডভান্সড","export.asTheTimeline": "টাইমলাইন অনুযায়ী","export.bitrate": "বিটরেট","export.browse": "ব্রাউজ করুন","export.cancelExport": "এক্সপোর্ট বাতিল করুন",- "export.cbr": "CBR","export.codec": "কোডেক",- "export.colour": "রঙ","export.contents": "বিষয়বস্তু","export.couldNotPublish": "{0}-এ সংরক্ষণ করা যায়নি: {1}","export.couldNotShowFile": "ফাইলটি দেখানো যায়নি: {0}",@@ -200,11 +197,10 @@"export.exported": "এক্সপোর্ট হয়েছে · {0}","export.finalisingFile": "ফাইল চূড়ান্ত করা হচ্ছে","export.format": "ফরম্যাট",- "export.fullRange": "full range","export.halfTheSize": "অর্ধেক আকার","export.hardware": "হার্ডওয়্যার",- "export.high": "উচ্চ",- "export.master": "মাস্টার",+ "export.higher": "বেশি",+ "export.lower": "কম","export.mixingAudio": "অডিও মিক্স করা হচ্ছে","export.nameNeedsToBeAFileName": "নামটি একটি ফাইলের নাম হতে হবে: খালি নয়, এবং / \\ : * ? \" < > | এগুলো থাকবে না","export.notOnThisDevice": "এই ডিভাইসে নেই",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} ইতিমধ্যে বিদ্যমান। এক্সপোর্ট করলে এটি প্রতিস্থাপিত হবে।","export.replaceFileTitle": "ফাইলটি প্রতিস্থাপন করবেন?","export.resolution": "রেজোলিউশন",- "export.screenContent": "স্ক্রিন কনটেন্ট",- "export.share": "শেয়ার করুন",- "export.showAdvancedOptions": "অ্যাডভান্সড অপশন দেখান","export.showInFolder": "ফোল্ডারে দেখান","export.smallest": "সবচেয়ে ছোট","export.summary": "সারসংক্ষেপ",@@ -228,8 +221,6 @@"export.tenBitColour": "10-বিট রঙ","export.timelineSize": "টাইমলাইন","export.toneMapped": "টোন-ম্যাপড, সব জায়গায় চলে",- "export.vbr": "VBR",- "export.videoYoutube": "ভিডিও, YouTube","format.almostDone": "প্রায় শেষ","format.daysAgo": "{0} দিন আগে","format.justNow": "এইমাত্র",diff --git a/src/crates/concat/locales/de.json b/src/crates/concat/locales/de.jsonindex aaf39edf..071fa581 100644--- a/src/crates/concat/locales/de.json+++ b/src/crates/concat/locales/de.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "Stumm",- "export.advanced": "Advanced","export.asTheTimeline": "Wie die Timeline","export.bitrate": "Bitrate","export.browse": "Durchsuchen","export.cancelExport": "Export abbrechen",- "export.cbr": "CBR","export.codec": "Codec",- "export.colour": "Farbe","export.contents": "Inhalt","export.couldNotPublish": "Konnte nicht in {0} speichern: {1}","export.couldNotShowFile": "Datei konnte nicht angezeigt werden: {0}",@@ -200,11 +197,10 @@"export.exported": "Exportiert · {0}","export.finalisingFile": "Datei wird fertiggestellt","export.format": "Format",- "export.fullRange": "voller Umfang","export.halfTheSize": "Halb so groß","export.hardware": "Hardware",- "export.high": "Hoch",- "export.master": "Master",+ "export.higher": "Höher",+ "export.lower": "Niedriger","export.mixingAudio": "Ton wird gemischt","export.nameNeedsToBeAFileName": "Der Name muss ein Dateiname sein: nicht leer und ohne / \\ : * ? \" < > |","export.notOnThisDevice": "Nicht auf diesem Gerät",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} ist schon da. Der Export ersetzt sie.","export.replaceFileTitle": "Datei ersetzen?","export.resolution": "Auflösung",- "export.screenContent": "Bildschirminhalt",- "export.share": "Teilen",- "export.showAdvancedOptions": "Show advanced options","export.showInFolder": "Im Ordner zeigen","export.smallest": "Am kleinsten","export.summary": "Zusammenfassung",@@ -228,8 +221,6 @@"export.tenBitColour": "10-Bit-Farbe","export.timelineSize": "Zeitleiste","export.toneMapped": "Tonegemappt, läuft überall",- "export.vbr": "VBR",- "export.videoYoutube": "Video, YouTube","format.almostDone": "fast fertig","format.daysAgo": "vor {0} Tagen","format.justNow": "gerade eben",diff --git a/src/crates/concat/locales/en.json b/src/crates/concat/locales/en.jsonindex b9b6abe9..4260a025 100644--- a/src/crates/concat/locales/en.json+++ b/src/crates/concat/locales/en.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "Silent",- "export.advanced": "Advanced","export.asTheTimeline": "As the timeline","export.bitrate": "Bitrate","export.browse": "Browse","export.cancelExport": "Cancel export",- "export.cbr": "CBR","export.codec": "Codec",- "export.colour": "Colour","export.contents": "Contents","export.couldNotPublish": "Could not save to {0}: {1}","export.couldNotShowFile": "Could not show the file: {0}",@@ -200,11 +197,10 @@"export.exported": "Exported · {0}","export.finalisingFile": "Finalising file","export.format": "Format",- "export.fullRange": "full range","export.halfTheSize": "Half the size","export.hardware": "hardware",- "export.high": "High",- "export.master": "Master",+ "export.higher": "Higher",+ "export.lower": "Lower","export.mixingAudio": "Mixing audio","export.nameNeedsToBeAFileName": "The name has to be a file name: not empty, and none of / \\ : * ? \" < > |","export.notOnThisDevice": "Not on this device",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} is already there. Exporting replaces it.","export.replaceFileTitle": "Replace the file?","export.resolution": "Resolution",- "export.screenContent": "Screen content",- "export.share": "Share",- "export.showAdvancedOptions": "Show advanced options","export.showInFolder": "Show in folder","export.smallest": "Smallest","export.summary": "Summary",@@ -228,8 +221,6 @@"export.tenBitColour": "10-bit colour","export.timelineSize": "Timeline","export.toneMapped": "Tone-mapped, plays anywhere",- "export.vbr": "VBR",- "export.videoYoutube": "Video, YouTube","format.almostDone": "almost done","format.daysAgo": "{0} days ago","format.justNow": "just now",diff --git a/src/crates/concat/locales/es.json b/src/crates/concat/locales/es.jsonindex 7d1e36a3..6d59bc51 100644--- a/src/crates/concat/locales/es.json+++ b/src/crates/concat/locales/es.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "Silencio",- "export.advanced": "Advanced","export.asTheTimeline": "Como la línea de tiempo","export.bitrate": "Bitrate","export.browse": "Examinar","export.cancelExport": "Cancelar exportación",- "export.cbr": "CBR","export.codec": "Códec",- "export.colour": "Color","export.contents": "Contenido","export.couldNotPublish": "No se pudo guardar en {0}: {1}","export.couldNotShowFile": "No se pudo mostrar el archivo: {0}",@@ -200,11 +197,10 @@"export.exported": "Exportado · {0}","export.finalisingFile": "Finalizando el archivo","export.format": "Formato",- "export.fullRange": "rango completo","export.halfTheSize": "La mitad de tamaño","export.hardware": "hardware",- "export.high": "Alta",- "export.master": "Máster",+ "export.higher": "Más alta",+ "export.lower": "Más baja","export.mixingAudio": "Mezclando el audio","export.nameNeedsToBeAFileName": "El nombre tiene que ser un nombre de archivo: no vacío y sin / \\ : * ? \" < > |","export.notOnThisDevice": "No disponible en este dispositivo",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} ya existe. Exportar lo reemplaza.","export.replaceFileTitle": "¿Reemplazar el archivo?","export.resolution": "Resolución",- "export.screenContent": "Contenido de pantalla",- "export.share": "Compartir",- "export.showAdvancedOptions": "Show advanced options","export.showInFolder": "Mostrar en la carpeta","export.smallest": "El más pequeño","export.summary": "Resumen",@@ -228,8 +221,6 @@"export.tenBitColour": "Color de 10 bits","export.timelineSize": "Línea de tiempo","export.toneMapped": "Convertido a SDR, se ve en todas partes",- "export.vbr": "VBR",- "export.videoYoutube": "Vídeo, YouTube","format.almostDone": "casi listo","format.daysAgo": "hace {0} días","format.justNow": "ahora mismo",diff --git a/src/crates/concat/locales/fa.json b/src/crates/concat/locales/fa.jsonindex 529dcbd0..fc1e71e7 100644--- a/src/crates/concat/locales/fa.json+++ b/src/crates/concat/locales/fa.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "بیصدا",- "export.advanced": "پیشرفته","export.asTheTimeline": "مانند تایملاین","export.bitrate": "نرخ بیت (Bitrate)","export.browse": "مرور","export.cancelExport": "لغو خروجی گرفتن",- "export.cbr": "CBR","export.codec": "Codec",- "export.colour": "رنگ","export.contents": "محتوا","export.couldNotPublish": "ذخیره در {0} ممکن نبود: {1}","export.couldNotShowFile": "نمایش فایل ممکن نشد: {0}",@@ -200,11 +197,10 @@"export.exported": "خروجی گرفتن شد · {0}","export.finalisingFile": "در حال نهاییسازی فایل","export.format": "فرمت",- "export.fullRange": "محدوده کامل","export.halfTheSize": "نصف اندازه","export.hardware": "سختافزار",- "export.high": "بالا",- "export.master": "اصلی (Master)",+ "export.higher": "بیشتر",+ "export.lower": "کمتر","export.mixingAudio": "در حال میکس کردن صدا","export.nameNeedsToBeAFileName": "نام باید نام یک فایل باشد: خالی نباشد و بدون / \\ : * ? \" < > |","export.notOnThisDevice": "در این دستگاه نیست",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} از قبل وجود دارد. خروجی گرفتن آن را جایگزین میکند.","export.replaceFileTitle": "فایل جایگزین شود؟","export.resolution": "رزولوشن",- "export.screenContent": "محتوای صفحه",- "export.share": "اشتراکگذاری",- "export.showAdvancedOptions": "نمایش گزینههای پیشرفته","export.showInFolder": "نمایش در پوشه","export.smallest": "کوچکترین","export.summary": "خلاصه",@@ -228,8 +221,6 @@"export.tenBitColour": "رنگ 10-bit","export.timelineSize": "خط زمان","export.toneMapped": "با Tone Mapping، همهجا پخش میشود",- "export.vbr": "VBR",- "export.videoYoutube": "ویدئو، YouTube","format.almostDone": "تقریباً تمام شد","format.daysAgo": "{0} روز پیش","format.justNow": "همین الان",diff --git a/src/crates/concat/locales/fr.json b/src/crates/concat/locales/fr.jsonindex f0d49afb..8f86bff3 100644--- a/src/crates/concat/locales/fr.json+++ b/src/crates/concat/locales/fr.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "Silence",- "export.advanced": "Advanced","export.asTheTimeline": "Comme la timeline","export.bitrate": "Bitrate","export.browse": "Parcourir","export.cancelExport": "Annuler l'export",- "export.cbr": "CBR","export.codec": "Codec",- "export.colour": "Couleur","export.contents": "Contenu","export.couldNotPublish": "Impossible d’enregistrer dans {0} : {1}","export.couldNotShowFile": "Impossible d'afficher le fichier : {0}",@@ -200,11 +197,10 @@"export.exported": "Exporté · {0}","export.finalisingFile": "Finalisation du fichier","export.format": "Format",- "export.fullRange": "plage complète","export.halfTheSize": "Deux fois plus petit","export.hardware": "matériel",- "export.high": "Haute",- "export.master": "Master",+ "export.higher": "Plus élevé",+ "export.lower": "Plus faible","export.mixingAudio": "Mixage de l'audio","export.nameNeedsToBeAFileName": "Le nom doit être un nom de fichier : non vide et sans / \\ : * ? \" < > |","export.notOnThisDevice": "Pas sur cet appareil",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} existe déjà. L’export le remplace.","export.replaceFileTitle": "Remplacer le fichier ?","export.resolution": "Résolution",- "export.screenContent": "Contenu d'écran",- "export.share": "Partage",- "export.showAdvancedOptions": "Show advanced options","export.showInFolder": "Afficher dans le dossier","export.smallest": "Le plus petit","export.summary": "Résumé",@@ -228,8 +221,6 @@"export.tenBitColour": "Couleur 10 bits","export.timelineSize": "Timeline","export.toneMapped": "Ramené en SDR, lisible partout",- "export.vbr": "VBR",- "export.videoYoutube": "Vidéo, YouTube","format.almostDone": "presque fini","format.daysAgo": "il y a {0} jours","format.justNow": "à l'instant",diff --git a/src/crates/concat/locales/he.json b/src/crates/concat/locales/he.jsonindex 9ade5468..2e84eb95 100644--- a/src/crates/concat/locales/he.json+++ b/src/crates/concat/locales/he.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "שקט",- "export.advanced": "מתקדם","export.asTheTimeline": "כמו ציר הזמן","export.bitrate": "קצב סיביות","export.browse": "עיון","export.cancelExport": "ביטול הייצוא",- "export.cbr": "CBR","export.codec": "מקודד",- "export.colour": "צבע","export.contents": "תוכן","export.couldNotPublish": "לא ניתן לשמור אל {0}: {1}","export.couldNotShowFile": "לא ניתן להציג את הקובץ: {0}",@@ -200,11 +197,10 @@"export.exported": "הייצוא הושלם · {0}","export.finalisingFile": "מסיים את הקובץ","export.format": "פורמט",- "export.fullRange": "טווח מלא","export.halfTheSize": "חצי מהגודל","export.hardware": "חומרה",- "export.high": "גבוהה",- "export.master": "מאסטר",+ "export.higher": "גבוה יותר",+ "export.lower": "נמוך יותר","export.mixingAudio": "מערבב שמע","export.nameNeedsToBeAFileName": "השם חייב להיות שם קובץ: לא ריק, ובלי אף אחד מהתווים / \\ : * ? \" < > |","export.notOnThisDevice": "לא במכשיר הזה",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} כבר קיים. הייצוא יחליף אותו.","export.replaceFileTitle": "להחליף את הקובץ?","export.resolution": "רזולוציה",- "export.screenContent": "תוכן מסך",- "export.share": "שיתוף",- "export.showAdvancedOptions": "הצגת אפשרויות מתקדמות","export.showInFolder": "הצגה בתיקייה","export.smallest": "הקטן ביותר","export.summary": "סיכום",@@ -228,8 +221,6 @@"export.tenBitColour": "צבע 10 סיביות","export.timelineSize": "ציר זמן","export.toneMapped": "עם מיפוי טונים, מתנגן בכל מקום",- "export.vbr": "VBR",- "export.videoYoutube": "וידאו, YouTube","format.almostDone": "כמעט סיים","format.daysAgo": "לפני {0} ימים","format.justNow": "זה עתה",diff --git a/src/crates/concat/locales/hi.json b/src/crates/concat/locales/hi.jsonindex c3c3913a..75e0d3aa 100644--- a/src/crates/concat/locales/hi.json+++ b/src/crates/concat/locales/hi.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "मौन",- "export.advanced": "उन्नत","export.asTheTimeline": "टाइमलाइन जैसा","export.bitrate": "बिटरेट","export.browse": "ब्राउज़ करें","export.cancelExport": "एक्सपोर्ट रद्द करें",- "export.cbr": "CBR","export.codec": "कोडेक",- "export.colour": "रंग","export.contents": "सामग्री","export.couldNotPublish": "{0} में सेव नहीं हो सका: {1}","export.couldNotShowFile": "फ़ाइल नहीं दिखाई जा सकी: {0}",@@ -200,11 +197,10 @@"export.exported": "एक्सपोर्ट हो गया · {0}","export.finalisingFile": "फ़ाइल को अंतिम रूप दिया जा रहा है","export.format": "फ़ॉर्मेट",- "export.fullRange": "पूर्ण रेंज","export.halfTheSize": "आधा साइज़","export.hardware": "हार्डवेयर",- "export.high": "उच्च",- "export.master": "मास्टर",+ "export.higher": "ज़्यादा",+ "export.lower": "कम","export.mixingAudio": "ऑडियो मिक्स हो रहा है","export.nameNeedsToBeAFileName": "नाम एक फ़ाइल नाम होना चाहिए: खाली नहीं, और इनमें से कोई चिह्न नहीं: / \\ : * ? \" < > |","export.notOnThisDevice": "इस डिवाइस पर उपलब्ध नहीं",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} पहले से मौजूद है। एक्सपोर्ट करने पर यह बदल जाएगी।","export.replaceFileTitle": "फ़ाइल बदलें?","export.resolution": "रिज़ॉल्यूशन",- "export.screenContent": "स्क्रीन सामग्री",- "export.share": "शेयर करें",- "export.showAdvancedOptions": "उन्नत विकल्प दिखाएं","export.showInFolder": "फ़ोल्डर में दिखाएं","export.smallest": "सबसे छोटा","export.summary": "सारांश",@@ -228,8 +221,6 @@"export.tenBitColour": "10-बिट रंग","export.timelineSize": "टाइमलाइन","export.toneMapped": "टोन-मैप्ड, हर जगह चलता है",- "export.vbr": "VBR",- "export.videoYoutube": "वीडियो, YouTube","format.almostDone": "लगभग हो गया","format.daysAgo": "{0} दिन पहले","format.justNow": "अभी-अभी",diff --git a/src/crates/concat/locales/hr.json b/src/crates/concat/locales/hr.jsonindex 5aa08f7e..84c78b6b 100644--- a/src/crates/concat/locales/hr.json+++ b/src/crates/concat/locales/hr.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "Tiho",- "export.advanced": "Advanced","export.asTheTimeline": "Kao vremenska crta","export.bitrate": "Bitrate","export.browse": "Pregledaj","export.cancelExport": "Prekini izvoz",- "export.cbr": "CBR","export.codec": "Kodek",- "export.colour": "Boja","export.contents": "Sadržaj","export.couldNotPublish": "Nije moguće spremiti u {0}: {1}","export.couldNotShowFile": "Nije moguće prikazati datoteku: {0}",@@ -200,11 +197,10 @@"export.exported": "Izvezeno · {0}","export.finalisingFile": "Dovršavanje datoteke","export.format": "Format",- "export.fullRange": "puni raspon","export.halfTheSize": "Upola manje","export.hardware": "hardver",- "export.high": "Visoko",- "export.master": "Master",+ "export.higher": "Viša",+ "export.lower": "Niža","export.mixingAudio": "Miksanje zvuka","export.nameNeedsToBeAFileName": "Naziv mora biti naziv datoteke: ne prazan i bez / \\ : * ? \" < > |","export.notOnThisDevice": "Nije na ovom uređaju",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} već postoji. Izvoz će je zamijeniti.","export.replaceFileTitle": "Zamijeniti datoteku?","export.resolution": "Rezolucija",- "export.screenContent": "Sadržaj zaslona",- "export.share": "Podijeli",- "export.showAdvancedOptions": "Show advanced options","export.showInFolder": "Prikaži u mapi","export.smallest": "Najmanje","export.summary": "Sažetak",@@ -228,8 +221,6 @@"export.tenBitColour": "10-bitna boja","export.timelineSize": "Vremenska crta","export.toneMapped": "Mapirano u SDR, radi svugdje",- "export.vbr": "VBR",- "export.videoYoutube": "Video, YouTube","format.almostDone": "skoro gotovo","format.daysAgo": "prije {0} dana","format.justNow": "upravo sada",diff --git a/src/crates/concat/locales/id.json b/src/crates/concat/locales/id.jsonindex 15fa8eca..c16a1360 100644--- a/src/crates/concat/locales/id.json+++ b/src/crates/concat/locales/id.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "Senyap",- "export.advanced": "Lanjutan","export.asTheTimeline": "Sama seperti linimasa","export.bitrate": "Laju bit","export.browse": "Telusuri","export.cancelExport": "Batalkan ekspor",- "export.cbr": "CBR","export.codec": "Kodek",- "export.colour": "Warna","export.contents": "Isi","export.couldNotPublish": "Tidak dapat menyimpan ke {0}: {1}","export.couldNotShowFile": "Tidak dapat menampilkan file: {0}",@@ -200,11 +197,10 @@"export.exported": "Diekspor · {0}","export.finalisingFile": "Menyelesaikan file","export.format": "Format",- "export.fullRange": "rentang penuh","export.halfTheSize": "Setengah ukuran","export.hardware": "perangkat keras",- "export.high": "Tinggi",- "export.master": "Master",+ "export.higher": "Lebih tinggi",+ "export.lower": "Lebih rendah","export.mixingAudio": "Mencampur audio","export.nameNeedsToBeAFileName": "Nama harus berupa nama file: tidak kosong, dan tanpa / \\ : * ? \" < > |","export.notOnThisDevice": "Tidak tersedia di perangkat ini",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} sudah ada. Mengekspor akan menggantinya.","export.replaceFileTitle": "Ganti file?","export.resolution": "Resolusi",- "export.screenContent": "Konten layar",- "export.share": "Bagikan",- "export.showAdvancedOptions": "Tampilkan opsi lanjutan","export.showInFolder": "Tampilkan di folder","export.smallest": "Terkecil","export.summary": "Ringkasan",@@ -228,8 +221,6 @@"export.tenBitColour": "Warna 10-bit","export.timelineSize": "Linimasa","export.toneMapped": "Dipetakan nada, dapat diputar di mana saja",- "export.vbr": "VBR",- "export.videoYoutube": "Video, YouTube","format.almostDone": "hampir selesai","format.daysAgo": "{0} hari lalu","format.justNow": "baru saja",diff --git a/src/crates/concat/locales/it.json b/src/crates/concat/locales/it.jsonindex f304863f..1e4d6cbb 100644--- a/src/crates/concat/locales/it.json+++ b/src/crates/concat/locales/it.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "Silenzio",- "export.advanced": "Advanced","export.asTheTimeline": "Come la timeline","export.bitrate": "Bitrate","export.browse": "Sfoglia","export.cancelExport": "Annulla esportazione",- "export.cbr": "CBR","export.codec": "Codec",- "export.colour": "Colore","export.contents": "Contenuto","export.couldNotPublish": "Impossibile salvare in {0}: {1}","export.couldNotShowFile": "Impossibile mostrare il file: {0}",@@ -200,11 +197,10 @@"export.exported": "Esportato · {0}","export.finalisingFile": "Finalizzazione del file","export.format": "Formato",- "export.fullRange": "gamma completa","export.halfTheSize": "Metà delle dimensioni","export.hardware": "hardware",- "export.high": "Alta",- "export.master": "Master",+ "export.higher": "Più alta",+ "export.lower": "Più bassa","export.mixingAudio": "Mixaggio dell'audio","export.nameNeedsToBeAFileName": "Il nome deve essere un nome di file: non vuoto e senza / \\ : * ? \" < > |","export.notOnThisDevice": "Non su questo dispositivo",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} esiste già. L’esportazione lo sostituisce.","export.replaceFileTitle": "Sostituire il file?","export.resolution": "Risoluzione",- "export.screenContent": "Contenuto dello schermo",- "export.share": "Condivisione",- "export.showAdvancedOptions": "Show advanced options","export.showInFolder": "Mostra nella cartella","export.smallest": "Il più piccolo","export.summary": "Riepilogo",@@ -228,8 +221,6 @@"export.tenBitColour": "Colore a 10 bit","export.timelineSize": "Timeline","export.toneMapped": "Convertito in SDR, si vede ovunque",- "export.vbr": "VBR",- "export.videoYoutube": "Video, YouTube","format.almostDone": "quasi fatto","format.daysAgo": "{0} giorni fa","format.justNow": "proprio ora",diff --git a/src/crates/concat/locales/ja.json b/src/crates/concat/locales/ja.jsonindex 25fa6511..32df5b4e 100644--- a/src/crates/concat/locales/ja.json+++ b/src/crates/concat/locales/ja.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "無音",- "export.advanced": "詳細設定","export.asTheTimeline": "タイムラインのまま","export.bitrate": "ビットレート","export.browse": "参照","export.cancelExport": "書き出しをキャンセル",- "export.cbr": "CBR","export.codec": "コーデック",- "export.colour": "カラー","export.contents": "内容","export.couldNotPublish": "{0} に保存できませんでした: {1}","export.couldNotShowFile": "ファイルを表示できませんでした : {0}",@@ -200,11 +197,10 @@"export.exported": "書き出し済み · {0}","export.finalisingFile": "ファイルを仕上げています","export.format": "形式",- "export.fullRange": "フルレンジ","export.halfTheSize": "半分のサイズ","export.hardware": "ハードウェア",- "export.high": "高",- "export.master": "マスター",+ "export.higher": "高め",+ "export.lower": "低め","export.mixingAudio": "オーディオをミックス中","export.nameNeedsToBeAFileName": "名前はファイル名にしてください。空にせず、/ \\ : * ? \" < > | は使えません","export.notOnThisDevice": "このデバイスでは使用不可",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} はすでにあります。書き出すと置き換えられます。","export.replaceFileTitle": "ファイルを置き換えますか?","export.resolution": "解像度",- "export.screenContent": "画面収録",- "export.share": "共有",- "export.showAdvancedOptions": "詳細オプションを表示","export.showInFolder": "フォルダーで表示","export.smallest": "最小","export.summary": "概要",@@ -228,8 +221,6 @@"export.tenBitColour": "10ビットカラー","export.timelineSize": "タイムライン","export.toneMapped": "トーンマッピング済み、どこでも再生可",- "export.vbr": "VBR",- "export.videoYoutube": "ビデオ、YouTube","format.almostDone": "まもなく完了","format.daysAgo": "{0} 日前","format.justNow": "今",diff --git a/src/crates/concat/locales/ko.json b/src/crates/concat/locales/ko.jsonindex 3d025161..a3c69135 100644--- a/src/crates/concat/locales/ko.json+++ b/src/crates/concat/locales/ko.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "무음",- "export.advanced": "Advanced","export.asTheTimeline": "타임라인 그대로","export.bitrate": "Bitrate","export.browse": "찾아보기","export.cancelExport": "내보내기 취소",- "export.cbr": "CBR","export.codec": "코덱",- "export.colour": "색상","export.contents": "내용","export.couldNotPublish": "{0}에 저장할 수 없습니다: {1}","export.couldNotShowFile": "파일을 표시할 수 없습니다: {0}",@@ -200,11 +197,10 @@"export.exported": "내보냄 · {0}","export.finalisingFile": "파일 마무리 중","export.format": "형식",- "export.fullRange": "전체 범위","export.halfTheSize": "절반 크기","export.hardware": "하드웨어",- "export.high": "높음",- "export.master": "마스터",+ "export.higher": "높게",+ "export.lower": "낮게","export.mixingAudio": "오디오 믹싱 중","export.nameNeedsToBeAFileName": "이름은 파일 이름이어야 합니다. 비워 둘 수 없고 / \\ : * ? \" < > | 는 쓸 수 없습니다","export.notOnThisDevice": "이 기기에서 사용 불가",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} 이(가) 이미 있습니다. 내보내면 바뀝니다.","export.replaceFileTitle": "파일을 바꿀까요?","export.resolution": "해상도",- "export.screenContent": "화면 콘텐츠",- "export.share": "공유",- "export.showAdvancedOptions": "Show advanced options","export.showInFolder": "폴더에서 보기","export.smallest": "가장 작음","export.summary": "요약",@@ -228,8 +221,6 @@"export.tenBitColour": "10비트 색상","export.timelineSize": "타임라인","export.toneMapped": "톤 매핑, 어디서나 재생",- "export.vbr": "VBR",- "export.videoYoutube": "비디오, YouTube","format.almostDone": "거의 완료","format.daysAgo": "{0}일 전","format.justNow": "방금",diff --git a/src/crates/concat/locales/nl.json b/src/crates/concat/locales/nl.jsonindex 959131aa..d015eb7e 100644--- a/src/crates/concat/locales/nl.json+++ b/src/crates/concat/locales/nl.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "Stil",- "export.advanced": "Geavanceerd","export.asTheTimeline": "Zoals de tijdlijn","export.bitrate": "Bitsnelheid","export.browse": "Bladeren","export.cancelExport": "Export annuleren",- "export.cbr": "CBR","export.codec": "Codec",- "export.colour": "Kleur","export.contents": "Inhoud","export.couldNotPublish": "Kan niet opslaan in {0}: {1}","export.couldNotShowFile": "Kan het bestand niet tonen: {0}",@@ -200,11 +197,10 @@"export.exported": "Geëxporteerd · {0}","export.finalisingFile": "Bestand afronden","export.format": "Indeling",- "export.fullRange": "volledig bereik","export.halfTheSize": "Half zo groot","export.hardware": "hardware",- "export.high": "Hoog",- "export.master": "Master",+ "export.higher": "Hoger",+ "export.lower": "Lager","export.mixingAudio": "Audio mixen","export.nameNeedsToBeAFileName": "De naam moet een bestandsnaam zijn: niet leeg, en zonder / \\ : * ? \" < > |","export.notOnThisDevice": "Niet op dit apparaat",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} bestaat al. Exporteren vervangt het.","export.replaceFileTitle": "Het bestand vervangen?","export.resolution": "Resolutie",- "export.screenContent": "Scherminhoud",- "export.share": "Delen",- "export.showAdvancedOptions": "Geavanceerde opties tonen","export.showInFolder": "Tonen in map","export.smallest": "Kleinst","export.summary": "Overzicht",@@ -228,8 +221,6 @@"export.tenBitColour": "10-bits kleur","export.timelineSize": "Tijdlijn","export.toneMapped": "Omgezet naar SDR, speelt overal af",- "export.vbr": "VBR",- "export.videoYoutube": "Video, YouTube","format.almostDone": "bijna klaar","format.daysAgo": "{0} dagen geleden","format.justNow": "zojuist",diff --git a/src/crates/concat/locales/pl.json b/src/crates/concat/locales/pl.jsonindex 6370c2c2..2b63682f 100644--- a/src/crates/concat/locales/pl.json+++ b/src/crates/concat/locales/pl.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "Cisza",- "export.advanced": "Zaawansowane","export.asTheTimeline": "Jak oś czasu","export.bitrate": "Szybkość transmisji","export.browse": "Przeglądaj","export.cancelExport": "Anuluj eksport",- "export.cbr": "CBR","export.codec": "Kodek",- "export.colour": "Kolor","export.contents": "Zawartość","export.couldNotPublish": "Nie udało się zapisać w {0}: {1}","export.couldNotShowFile": "Nie udało się pokazać pliku: {0}",@@ -200,11 +197,10 @@"export.exported": "Wyeksportowano · {0}","export.finalisingFile": "Finalizowanie pliku","export.format": "Format",- "export.fullRange": "pełny zakres","export.halfTheSize": "O połowę mniejszy","export.hardware": "sprzętowo",- "export.high": "Wysoka",- "export.master": "Wzorzec",+ "export.higher": "Wyższa",+ "export.lower": "Niższa","export.mixingAudio": "Miksowanie dźwięku","export.nameNeedsToBeAFileName": "Nazwa musi być nazwą pliku: niepusta i bez znaków / \\ : * ? \" < > |","export.notOnThisDevice": "Niedostępne na tym urządzeniu",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} już istnieje. Eksport go zastąpi.","export.replaceFileTitle": "Zastąpić plik?","export.resolution": "Rozdzielczość",- "export.screenContent": "Zawartość ekranu",- "export.share": "Udostępnij",- "export.showAdvancedOptions": "Pokaż opcje zaawansowane","export.showInFolder": "Pokaż w folderze","export.smallest": "Najmniejszy","export.summary": "Podsumowanie",@@ -228,8 +221,6 @@"export.tenBitColour": "Kolor 10-bitowy","export.timelineSize": "Oś czasu","export.toneMapped": "Zmapowane do SDR, odtwarza się wszędzie",- "export.vbr": "VBR",- "export.videoYoutube": "Wideo, YouTube","format.almostDone": "prawie gotowe","format.daysAgo": "{0} dni temu","format.justNow": "przed chwilą",diff --git a/src/crates/concat/locales/pt-BR.json b/src/crates/concat/locales/pt-BR.jsonindex 49dc5b90..0676afd0 100644--- a/src/crates/concat/locales/pt-BR.json+++ b/src/crates/concat/locales/pt-BR.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "Silêncio",- "export.advanced": "Advanced","export.asTheTimeline": "Como a linha do tempo","export.bitrate": "Bitrate","export.browse": "Procurar","export.cancelExport": "Cancelar exportação",- "export.cbr": "CBR","export.codec": "Codec",- "export.colour": "Cor","export.contents": "Conteúdo","export.couldNotPublish": "Não foi possível salvar em {0}: {1}","export.couldNotShowFile": "Não foi possível mostrar o arquivo: {0}",@@ -200,11 +197,10 @@"export.exported": "Exportado · {0}","export.finalisingFile": "Finalizando o arquivo","export.format": "Formato",- "export.fullRange": "faixa completa","export.halfTheSize": "Metade do tamanho","export.hardware": "hardware",- "export.high": "Alta",- "export.master": "Master",+ "export.higher": "Mais alta",+ "export.lower": "Mais baixa","export.mixingAudio": "Mixando o áudio","export.nameNeedsToBeAFileName": "O nome precisa ser um nome de arquivo: não vazio e sem / \\ : * ? \" < > |","export.notOnThisDevice": "Indisponível neste dispositivo",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} já existe. Exportar o substitui.","export.replaceFileTitle": "Substituir o arquivo?","export.resolution": "Resolução",- "export.screenContent": "Conteúdo de tela",- "export.share": "Compartilhar",- "export.showAdvancedOptions": "Show advanced options","export.showInFolder": "Mostrar na pasta","export.smallest": "O menor","export.summary": "Resumo",@@ -228,8 +221,6 @@"export.tenBitColour": "Cor de 10 bits","export.timelineSize": "Linha do tempo","export.toneMapped": "Convertido para SDR, toca em qualquer lugar",- "export.vbr": "VBR",- "export.videoYoutube": "Vídeo, YouTube","format.almostDone": "quase pronto","format.daysAgo": "há {0} dias","format.justNow": "agora mesmo",diff --git a/src/crates/concat/locales/ru.json b/src/crates/concat/locales/ru.jsonindex 883fc795..0183d961 100644--- a/src/crates/concat/locales/ru.json+++ b/src/crates/concat/locales/ru.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Гц","controls.kelvin": "{0} K","controls.silent": "Тишина",- "export.advanced": "Дополнительно","export.asTheTimeline": "Как на таймлайне","export.bitrate": "Битрейт","export.browse": "Обзор","export.cancelExport": "Отменить экспорт",- "export.cbr": "CBR","export.codec": "Кодек",- "export.colour": "Цвет","export.contents": "Содержимое","export.couldNotPublish": "Не удалось сохранить в {0}: {1}","export.couldNotShowFile": "Не удалось показать файл: {0}",@@ -200,11 +197,10 @@"export.exported": "Экспортировано · {0}","export.finalisingFile": "Завершение файла","export.format": "Формат",- "export.fullRange": "полный диапазон","export.halfTheSize": "Вдвое меньше","export.hardware": "аппаратно",- "export.high": "Высокое",- "export.master": "Мастер",+ "export.higher": "Выше",+ "export.lower": "Ниже","export.mixingAudio": "Сведение звука","export.nameNeedsToBeAFileName": "Имя должно быть именем файла: не пустым и без / \\ : * ? \" < > |","export.notOnThisDevice": "Недоступно на этом устройстве",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} уже есть. Экспорт заменит его.","export.replaceFileTitle": "Заменить файл?","export.resolution": "Разрешение",- "export.screenContent": "Содержимое экрана",- "export.share": "Для отправки",- "export.showAdvancedOptions": "Показать дополнительные параметры","export.showInFolder": "Показать в папке","export.smallest": "Самый маленький","export.summary": "Сводка",@@ -228,8 +221,6 @@"export.tenBitColour": "10-битный цвет","export.timelineSize": "Таймлайн","export.toneMapped": "Приведено к SDR, играет везде",- "export.vbr": "VBR",- "export.videoYoutube": "Видео, YouTube","format.almostDone": "почти готово","format.daysAgo": "{0} дн. назад","format.justNow": "только что",diff --git a/src/crates/concat/locales/th.json b/src/crates/concat/locales/th.jsonindex 43d01eb0..78036b1c 100644--- a/src/crates/concat/locales/th.json+++ b/src/crates/concat/locales/th.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "เงียบ",- "export.advanced": "ขั้นสูง","export.asTheTimeline": "ตามไทม์ไลน์","export.bitrate": "บิตเรต","export.browse": "เรียกดู","export.cancelExport": "ยกเลิกการส่งออก",- "export.cbr": "CBR","export.codec": "โคเดก",- "export.colour": "สี","export.contents": "เนื้อหา","export.couldNotPublish": "บันทึกไปที่ {0} ไม่ได้: {1}","export.couldNotShowFile": "แสดงไฟล์ไม่ได้: {0}",@@ -200,11 +197,10 @@"export.exported": "ส่งออกแล้ว · {0}","export.finalisingFile": "กำลังเตรียมไฟล์ให้เสร็จ","export.format": "รูปแบบ",- "export.fullRange": "ช่วงเต็ม","export.halfTheSize": "ขนาดครึ่งเดียว","export.hardware": "ฮาร์ดแวร์",- "export.high": "สูง",- "export.master": "มาสเตอร์",+ "export.higher": "สูงขึ้น",+ "export.lower": "ต่ำลง","export.mixingAudio": "กำลังมิกซ์เสียง","export.nameNeedsToBeAFileName": "ชื่อต้องเป็นชื่อไฟล์ที่ใช้ได้: ห้ามว่าง และห้ามมี / \\ : * ? \" < > |","export.notOnThisDevice": "ไม่มีในอุปกรณ์นี้",@@ -218,9 +214,6 @@"export.replaceFileMessage": "มี {0} อยู่แล้ว การส่งออกจะแทนที่ไฟล์นี้","export.replaceFileTitle": "แทนที่ไฟล์ไหม","export.resolution": "ความละเอียด",- "export.screenContent": "เนื้อหาบนหน้าจอ",- "export.share": "แชร์",- "export.showAdvancedOptions": "แสดงตัวเลือกขั้นสูง","export.showInFolder": "แสดงในโฟลเดอร์","export.smallest": "เล็กที่สุด","export.summary": "สรุป",@@ -228,8 +221,6 @@"export.tenBitColour": "สี 10 บิต","export.timelineSize": "ไทม์ไลน์","export.toneMapped": "แมปโทนแล้ว เล่นได้ทุกที่",- "export.vbr": "VBR",- "export.videoYoutube": "วิดีโอ, YouTube","format.almostDone": "ใกล้เสร็จแล้ว","format.daysAgo": "{0} วันที่แล้ว","format.justNow": "เมื่อสักครู่",diff --git a/src/crates/concat/locales/tr.json b/src/crates/concat/locales/tr.jsonindex 980f145d..85b5329b 100644--- a/src/crates/concat/locales/tr.json+++ b/src/crates/concat/locales/tr.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "Sessiz",- "export.advanced": "Advanced","export.asTheTimeline": "Zaman çizelgesindeki gibi","export.bitrate": "Bitrate","export.browse": "Gözat","export.cancelExport": "Dışa aktarmayı iptal et",- "export.cbr": "CBR","export.codec": "Kodek",- "export.colour": "Renk","export.contents": "İçerik","export.couldNotPublish": "{0} konumuna kaydedilemedi: {1}","export.couldNotShowFile": "Dosya gösterilemedi: {0}",@@ -200,11 +197,10 @@"export.exported": "Dışa aktarıldı · {0}","export.finalisingFile": "Dosya tamamlanıyor","export.format": "Biçim",- "export.fullRange": "tam aralık","export.halfTheSize": "Yarı boyut","export.hardware": "donanım",- "export.high": "Yüksek",- "export.master": "Master",+ "export.higher": "Daha yüksek",+ "export.lower": "Daha düşük","export.mixingAudio": "Ses karıştırılıyor","export.nameNeedsToBeAFileName": "Ad bir dosya adı olmalı: boş olmamalı ve / \\ : * ? \" < > | içermemeli","export.notOnThisDevice": "Bu cihazda yok",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} zaten var. Dışa aktarma onu değiştirir.","export.replaceFileTitle": "Dosya değiştirilsin mi?","export.resolution": "Çözünürlük",- "export.screenContent": "Ekran içeriği",- "export.share": "Paylaşım",- "export.showAdvancedOptions": "Show advanced options","export.showInFolder": "Klasörde göster","export.smallest": "En küçük","export.summary": "Özet",@@ -228,8 +221,6 @@"export.tenBitColour": "10 bit renk","export.timelineSize": "Zaman çizelgesi","export.toneMapped": "Ton eşlemeli, her yerde oynar",- "export.vbr": "VBR",- "export.videoYoutube": "Video, YouTube","format.almostDone": "neredeyse bitti","format.daysAgo": "{0} gün önce","format.justNow": "az önce",diff --git a/src/crates/concat/locales/uk.json b/src/crates/concat/locales/uk.jsonindex 378f3cb3..f7330895 100644--- a/src/crates/concat/locales/uk.json+++ b/src/crates/concat/locales/uk.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Гц","controls.kelvin": "{0} K","controls.silent": "Тиша",- "export.advanced": "Додатково","export.asTheTimeline": "Як на часовій шкалі","export.bitrate": "Бітрейт","export.browse": "Огляд","export.cancelExport": "Скасувати експорт",- "export.cbr": "CBR","export.codec": "Кодек",- "export.colour": "Колір","export.contents": "Вміст","export.couldNotPublish": "Не вдалося зберегти в {0}: {1}","export.couldNotShowFile": "Не вдалося показати файл: {0}",@@ -200,11 +197,10 @@"export.exported": "Експортовано · {0}","export.finalisingFile": "Завершення файлу","export.format": "Формат",- "export.fullRange": "повний діапазон","export.halfTheSize": "Удвічі менший розмір","export.hardware": "апаратно",- "export.high": "Висока",- "export.master": "Мастер",+ "export.higher": "Вища",+ "export.lower": "Нижча","export.mixingAudio": "Зведення аудіо","export.nameNeedsToBeAFileName": "Назва має бути іменем файлу: не порожньою й без символів / \\ : * ? \" < > |","export.notOnThisDevice": "Недоступно на цьому пристрої",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} уже існує. Експорт замінить його.","export.replaceFileTitle": "Замінити файл?","export.resolution": "Роздільність",- "export.screenContent": "Вміст екрана",- "export.share": "Поділитися",- "export.showAdvancedOptions": "Показати додаткові параметри","export.showInFolder": "Показати в папці","export.smallest": "Найменший","export.summary": "Підсумок",@@ -228,8 +221,6 @@"export.tenBitColour": "10-бітний колір","export.timelineSize": "Часова шкала","export.toneMapped": "Тонове відображення, відтворюється будь-де",- "export.vbr": "VBR",- "export.videoYoutube": "Відео, YouTube","format.almostDone": "майже готово","format.daysAgo": "{0} дн. тому","format.justNow": "щойно",diff --git a/src/crates/concat/locales/ur.json b/src/crates/concat/locales/ur.jsonindex 728674ea..a847e532 100644--- a/src/crates/concat/locales/ur.json+++ b/src/crates/concat/locales/ur.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "خاموش",- "export.advanced": "اعلیٰ","export.asTheTimeline": "ٹائم لائن کی طرح","export.bitrate": "بٹ ریٹ","export.browse": "براؤز کریں","export.cancelExport": "ایکسپورٹ منسوخ کریں",- "export.cbr": "CBR","export.codec": "کوڈیک",- "export.colour": "رنگ","export.contents": "مشمولات","export.couldNotPublish": "{0} میں محفوظ نہیں ہو سکا: {1}","export.couldNotShowFile": "فائل نہیں دکھائی جا سکی: {0}",@@ -200,11 +197,10 @@"export.exported": "ایکسپورٹ ہو گیا · {0}","export.finalisingFile": "فائل مکمل کی جا رہی ہے","export.format": "فارمیٹ",- "export.fullRange": "مکمل رینج","export.halfTheSize": "آدھا سائز","export.hardware": "ہارڈویئر",- "export.high": "اعلیٰ",- "export.master": "ماسٹر",+ "export.higher": "زیادہ",+ "export.lower": "کم","export.mixingAudio": "آڈیو مکس ہو رہا ہے","export.nameNeedsToBeAFileName": "نام فائل کا نام ہونا چاہیے: خالی نہ ہو، اور اس میں / \\ : * ? \" < > | میں سے کچھ نہ ہو","export.notOnThisDevice": "اس ڈیوائس پر نہیں",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} پہلے سے موجود ہے۔ ایکسپورٹ اسے تبدیل کر دے گا۔","export.replaceFileTitle": "فائل تبدیل کریں؟","export.resolution": "ریزولوشن",- "export.screenContent": "اسکرین کا مواد",- "export.share": "شیئر کریں",- "export.showAdvancedOptions": "اعلیٰ اختیارات دکھائیں","export.showInFolder": "فولڈر میں دکھائیں","export.smallest": "سب سے چھوٹا","export.summary": "خلاصہ",@@ -228,8 +221,6 @@"export.tenBitColour": "10 بٹ رنگ","export.timelineSize": "ٹائم لائن","export.toneMapped": "ٹون میپڈ، کہیں بھی چلتا ہے",- "export.vbr": "VBR",- "export.videoYoutube": "ویڈیو، YouTube","format.almostDone": "تقریباً مکمل","format.daysAgo": "{0} دن پہلے","format.justNow": "ابھی ابھی",diff --git a/src/crates/concat/locales/vi.json b/src/crates/concat/locales/vi.jsonindex 5db6d6a3..372127ea 100644--- a/src/crates/concat/locales/vi.json+++ b/src/crates/concat/locales/vi.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "Im lặng",- "export.advanced": "Nâng cao","export.asTheTimeline": "Như trên dòng thời gian","export.bitrate": "Tốc độ bit","export.browse": "Duyệt…","export.cancelExport": "Hủy xuất",- "export.cbr": "CBR (tốc độ bit cố định)","export.codec": "Bộ mã hóa",- "export.colour": "Màu sắc","export.contents": "Nội dung","export.couldNotPublish": "Không thể lưu vào {0}: {1}","export.couldNotShowFile": "Không thể hiển thị tệp: {0}",@@ -200,11 +197,10 @@"export.exported": "Đã xuất · {0}","export.finalisingFile": "Đang hoàn tất tệp","export.format": "Định dạng",- "export.fullRange": "toàn dải","export.halfTheSize": "Một nửa kích thước","export.hardware": "phần cứng",- "export.high": "Cao",- "export.master": "Bản chính",+ "export.higher": "Cao hơn",+ "export.lower": "Thấp hơn","export.mixingAudio": "Đang trộn âm thanh","export.nameNeedsToBeAFileName": "Tên phải là tên tệp: không được để trống và không chứa / \\: * ? \" < > |","export.notOnThisDevice": "Không có trên thiết bị này",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} đã tồn tại. Khi xuất, tệp này sẽ bị thay thế.","export.replaceFileTitle": "Thay thế tệp?","export.resolution": "Độ phân giải",- "export.screenContent": "Nội dung màn hình",- "export.share": "Chia sẻ",- "export.showAdvancedOptions": "Hiện tùy chọn nâng cao","export.showInFolder": "Hiện trong thư mục","export.smallest": "Nhỏ nhất","export.summary": "Tóm tắt",@@ -228,8 +221,6 @@"export.tenBitColour": "Màu 10-bit","export.timelineSize": "Dòng thời gian","export.toneMapped": "Ánh xạ tông màu, phát được ở mọi nơi",- "export.vbr": "VBR (tốc độ bit biến đổi)",- "export.videoYoutube": "Video, YouTube","format.almostDone": "sắp xong","format.daysAgo": "{0} ngày trước","format.justNow": "vừa xong",diff --git a/src/crates/concat/locales/zh-Hans.json b/src/crates/concat/locales/zh-Hans.jsonindex 6e74da4f..ae0ac896 100644--- a/src/crates/concat/locales/zh-Hans.json+++ b/src/crates/concat/locales/zh-Hans.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "无声",- "export.advanced": "高级","export.asTheTimeline": "与时间线相同","export.bitrate": "码率","export.browse": "浏览","export.cancelExport": "取消导出",- "export.cbr": "CBR","export.codec": "编码器",- "export.colour": "颜色","export.contents": "目录","export.couldNotPublish": "无法保存到 {0}:{1}","export.couldNotShowFile": "无法显示文件:{0}",@@ -200,11 +197,10 @@"export.exported": "已导出 · {0}","export.finalisingFile": "正在完成文件","export.format": "格式",- "export.fullRange": "全范围","export.halfTheSize": "缩小一半","export.hardware": "硬件",- "export.high": "高",- "export.master": "母版",+ "export.higher": "更高",+ "export.lower": "更低","export.mixingAudio": "正在混合音频","export.nameNeedsToBeAFileName": "名称必须是文件名:不能为空,也不能含有 / \\ : * ? \" < > |","export.notOnThisDevice": "此设备不支持",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} 已经存在。导出会将其替换。","export.replaceFileTitle": "替换文件?","export.resolution": "分辨率",- "export.screenContent": "屏幕内容",- "export.share": "分享",- "export.showAdvancedOptions": "显示高级选项","export.showInFolder": "在文件夹中显示","export.smallest": "最小","export.summary": "摘要",@@ -228,8 +221,6 @@"export.tenBitColour": "10 位色彩","export.timelineSize": "时间线","export.toneMapped": "色调映射,随处可播",- "export.vbr": "VBR",- "export.videoYoutube": "视频、YouTube","format.almostDone": "即将完成","format.daysAgo": "{0} 天前","format.justNow": "刚刚",diff --git a/src/crates/concat/locales/zh-TW.json b/src/crates/concat/locales/zh-TW.jsonindex 485cdac7..a719601b 100644--- a/src/crates/concat/locales/zh-TW.json+++ b/src/crates/concat/locales/zh-TW.json@@ -180,14 +180,11 @@"controls.hertz": "{0} Hz","controls.kelvin": "{0} K","controls.silent": "無聲",- "export.advanced": "進階","export.asTheTimeline": "與時間軸相同","export.bitrate": "位元率","export.browse": "瀏覽","export.cancelExport": "取消匯出",- "export.cbr": "CBR","export.codec": "編碼格式",- "export.colour": "顏色","export.contents": "目錄","export.couldNotPublish": "無法儲存到 {0}:{1}","export.couldNotShowFile": "無法顯示檔案:{0}",@@ -200,11 +197,10 @@"export.exported": "已匯出 · {0}","export.finalisingFile": "正在完成檔案","export.format": "格式",- "export.fullRange": "全範圍","export.halfTheSize": "檔案大小減半","export.hardware": "硬體",- "export.high": "高",- "export.master": "母帶",+ "export.higher": "更高",+ "export.lower": "更低","export.mixingAudio": "正在混合音訊","export.nameNeedsToBeAFileName": "名稱必須是檔案名稱:不能為空,也不能含有 / \\ : * ? \" < > |","export.notOnThisDevice": "此裝置不支援",@@ -218,9 +214,6 @@"export.replaceFileMessage": "{0} 已經存在。匯出會將其取代。","export.replaceFileTitle": "取代檔案?","export.resolution": "解析度",- "export.screenContent": "螢幕內容",- "export.share": "分享",- "export.showAdvancedOptions": "顯示進階選項","export.showInFolder": "在資料夾中顯示","export.smallest": "最小","export.summary": "摘要",@@ -228,8 +221,6 @@"export.tenBitColour": "10 位元色彩","export.timelineSize": "時間軸","export.toneMapped": "色調映射,到處可播",- "export.vbr": "VBR",- "export.videoYoutube": "影片、YouTube","format.almostDone": "即將完成","format.daysAgo": "{0} 天前","format.justNow": "剛剛",diff --git a/src/crates/concat/src/lib.rs b/src/crates/concat/src/lib.rsindex 82d2fa73..64444096 100644--- a/src/crates/concat/src/lib.rs+++ b/src/crates/concat/src/lib.rs@@ -1554,15 +1554,6 @@ fn start(project: Option<std::path::PathBuf>, smoke: bool) -> Result<(), slint::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)));- }));- app.on_export_rate_mode_changed(on_window!(|state, index: i32| {- state.handle(Msg::Export(ExportMsg::RateModeChanged(index)));- }));app.on_export_bitrate_changed(on_window!(|state, text: SharedString| {state.handle(Msg::Export(ExportMsg::BitrateChanged(text.to_string())));}));diff --git a/src/crates/concat/src/panes/export.rs b/src/crates/concat/src/panes/export.rsindex dad0f497..7bdbb913 100644--- a/src/crates/concat/src/panes/export.rs+++ b/src/crates/concat/src/panes/export.rs@@ -21,9 +21,7 @@ use crate::host::{on_ui, spawn};use crate::i18n::{self, t, tf};use crate::panes::Msg;use crate::platform;-use crate::studio::{- AUDIO_BPS, EXPORT_CRF, EXPORT_SHORT_SIDES, EXPORT_TIERS, RATES, Studio, home_folder,-};+use crate::studio::{AUDIO_BPS, EXPORT_CRF, EXPORT_SHORT_SIDES, RATES, Studio, home_folder};use crate::ui::{ExportData, ExportPhase};use slint::{ModelRc, SharedString, VecModel};@@ -42,13 +40,8 @@ pub enum ExportMsg {TenBitChanged(bool),/// For an HDR timeline: written HDR (true), or tone-mapped to SDR.HdrChanged(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.- RateModeChanged(i32),- /// The target bitrate field: digits only, in kbps.+ /// The target bitrate field, in Mbps as typed: the bitrate becomes a+ /// custom one.BitrateChanged(String),/// Back to the form after a finished or failed render.Again,@@ -83,22 +76,14 @@ pub struct ExportPane {pub folder: String,pub resolution: usize,pub rate: usize,+ /// The bitrate: 0 higher, 1 recommended, 2 lower, 3 the typed one.pub quality: usize,/// Index into `VideoCodec::ALL`.pub codec: usize,pub ten_bit: bool,/// An HDR timeline written tone-mapped to SDR rather than as it is.pub sdr: 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,- /// Index into `RateMode::ALL`.- pub rate_mode: usize,- /// Target bitrate in kbps, used when `rate_mode` is CBR.+ /// The typed bitrate in kbps, the one written when `quality` is 3.pub bitrate: u32,pub phase: ExportPhase,pub progress: f32,@@ -122,9 +107,6 @@ impl Default for ExportPane {codec: 0,ten_bit: false,sdr: false,- color_range: 0,- advanced: false,- rate_mode: 0,bitrate: 8000,phase: ExportPhase::Idle,progress: 0.0,@@ -165,7 +147,15 @@ impl ExportPane {ExportMsg::RateChanged(index) => {self.rate = (index.max(0) as usize).min(Self::rates(studio).len() - 1);}- ExportMsg::QualityChanged(index) => self.quality = (index.max(0) as usize).min(2),+ ExportMsg::QualityChanged(index) => {+ let index = (index.max(0) as usize).min(CUSTOM);+ // The typed field starts from what the card had, so a+ // custom bitrate is an edit of the last one, not 8 Mbps.+ if index == CUSTOM && self.quality != CUSTOM {+ self.bitrate = self.target_kbps(studio, self.quality);+ }+ self.quality = index;+ }// A codec this device cannot encode is not taken: the picker// says so under it, and the choice before stands.ExportMsg::CodecChanged(index) => {@@ -176,15 +166,10 @@ impl ExportPane {}ExportMsg::TenBitChanged(on) => self.ten_bit = on,ExportMsg::HdrChanged(on) => self.sdr = !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) => {- let digits: String = text.chars().filter(|c| c.is_ascii_digit()).collect();- if let Ok(value) = digits.parse::<u32>() {- self.bitrate = value.clamp(100, 200_000);+ if let Some(kbps) = typed_kbps(&text) {+ self.bitrate = kbps;+ self.quality = CUSTOM;}}ExportMsg::Again => {@@ -352,24 +337,37 @@ impl ExportPane {Self::frame_for(studio, short)}- /// A rough size of the file at one quality tier, in bytes.- pub fn size_bytes(&self, studio: &Studio, tier: usize) -> f32 {+ /// The bitrate a choice aims for, in kbps. Recommended is what YouTube+ /// asks uploads at for the frame - 5 Mbps at 720p, 8 at 1080p, 16 at+ /// 1440p and 40 at 4K, half again above 30 fps - which every other+ /// platform takes too, less for HEVC and AV1, which spend fewer bits+ /// on the same picture, and a quarter more at ten bits. Higher is+ /// twice it, a master to keep or to grade again; Lower half, a draft+ /// or a message. Rounded to half a megabit, as a person would say it.+ pub fn target_kbps(&self, studio: &Studio, choice: usize) -> u32 {+ if choice >= CUSTOM {+ return self.bitrate;+ }let (width, height) = self.size(studio);let (num, den) = self.rate(studio);- let rate = num as f32 / den as f32;- let pixels = (width as f32 * height as f32) / (1920.0 * 1080.0);- // In CBR the bitrate is the number, not the tier; the pixels, rate- // and codec factors no longer apply because the encoder is pinned.- let video = if self.advanced && self.rate_mode == 1 {- self.bitrate as f32 * 1000.0- } else {- EXPORT_TIERS[tier.min(2)]- * 1_000_000.0- * pixels- * (rate / 30.0)- * self.codec(studio).size_factor()- * if self.deep(studio) { 1.05 } else { 1.0 }+ let fps = num as f32 / den.max(1) as f32;+ let base = match width.min(height) {+ 0..=480 => 2_500.0,+ 481..=720 => 5_000.0,+ 721..=1080 => 8_000.0,+ 1081..=1440 => 16_000.0,+ _ => 40_000.0,};+ let motion = if fps > 30.5 { 1.5 } else { 1.0 };+ let deep = if self.deep(studio) { 1.25 } else { 1.0 };+ let kbps = base * motion * self.codec(studio).size_factor() * deep * TIERS[choice];+ ((kbps / 500.0).round() * 500.0).max(500.0) as u32+ }++ /// The file's size at one choice, in bytes: the bitrate is an average+ /// the encoder keeps to, so this is what is written, give or take.+ pub fn size_bytes(&self, studio: &Studio, choice: usize) -> f32 {+ let video = self.target_kbps(studio, choice) as f32 * 1000.0;(video + AUDIO_BPS) * studio.duration().max(1.0) / 8.0}@@ -408,17 +406,6 @@ impl ExportPane {self.hdr(studio) || (self.ten_bit && self.codec(studio).ten_bit_available())}- /// 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, once the name is a file's and no/// file is already there; its reports come back as messages.fn start(&mut self, studio: &mut Studio) {@@ -466,21 +453,16 @@ impl ExportPane {};let spec = ExportSpec {output: output.clone(),- crf: EXPORT_CRF[self.quality.min(2)],+ // Unused at an average bitrate; the quality the encoder falls+ // back on were it ever not given one.+ crf: EXPORT_CRF,preset: "veryfast".into(),codec: self.codec(studio),ten_bit: self.deep(studio),- rate_mode: if self.advanced && self.rate_mode == 1 {- concat_media::RateMode::Cbr- } else {- concat_media::RateMode::Vbr- },- bitrate_kbps: if self.advanced && self.rate_mode == 1 {- self.bitrate- } else {- 0- },- color_range: self.color_range(),+ rate_mode: concat_media::RateMode::Average,+ bitrate_kbps: self.target_kbps(studio, self.quality),+ // Video range, what every player and every platform expects.+ color_range: ColorRange::Limited,hdr: self.hdr(studio),};let (frame_w, frame_h) = studio.output_size();@@ -642,10 +624,10 @@ impl ExportPane {_ => "HDR (HLG)",}.into(),- color_range: self.color_range as i32,- advanced: self.advanced,- rate_mode: self.rate_mode as i32,- bitrate: self.bitrate as i32,+ target: mbps_number(self.target_kbps(studio, self.quality)).into(),+ rate_high: mbps(self.target_kbps(studio, 0)).into(),+ rate_balanced: mbps(self.target_kbps(studio, 1)).into(),+ rate_small: mbps(self.target_kbps(studio, 2)).into(),encoding: {// "HEVC 10-bit · hardware": the standard, the depth when it// is the deeper one, and whether the platform's own encoder@@ -664,9 +646,6 @@ impl ExportPane {.to_owned(),);}- if self.color_range() == ColorRange::Full {- words.push(t("export.fullRange"));- }if codec.hardware_encoded(true, self.deep(studio)) {words.push(format!("· {}", t("export.hardware")));}@@ -676,6 +655,7 @@ impl ExportPane {size_high: bytes(self.size_bytes(studio, 0)).into(),size_balanced: bytes(self.size_bytes(studio, 1)).into(),size_small: bytes(self.size_bytes(studio, 2)).into(),+ size_chosen: bytes(self.size_bytes(studio, self.quality)).into(),phase: self.phase,progress: self.progress,stage: self.stage.as_str().into(),@@ -696,6 +676,39 @@ impl ExportPane {}}+/// The bitrate choices as multiples of the recommended one: higher,+/// recommended, lower. Index [`CUSTOM`] is the typed bitrate.+const TIERS: [f32; 3] = [2.0, 1.0, 0.5];+const CUSTOM: usize = 3;++/// "8 Mbps", "7.5 Mbps": a bitrate as the sheet says it.+fn mbps(kbps: u32) -> String {+ format!("{} Mbps", mbps_number(kbps))+}++/// The number alone, for the field that takes it back: "8", "7.5".+fn mbps_number(kbps: u32) -> String {+ let value = kbps as f32 / 1000.0;+ if (value - value.round()).abs() < 0.05 {+ format!("{}", value.round() as u32)+ } else {+ format!("{value:.1}")+ }+}++/// A typed bitrate in Mbps - "12", "7.5", "7,5 Mbps" - as kbps, between+/// half a megabit and 400; `None` for nothing a number can be read from.+fn typed_kbps(text: &str) -> Option<u32> {+ let number: String = text+ .trim()+ .chars()+ .map(|c| if c == ',' { '.' } else { c })+ .take_while(|c| c.is_ascii_digit() || *c == '.')+ .collect();+ let value: f32 = number.parse().ok()?;+ Some(((value * 1000.0).round() as u32).clamp(500, 400_000))+}+/// The typed name as the file's, or `None` for one that cannot be: empty/// once trimmed, a dot or two, or holding a character no file system/// here takes. The set is Windows' - a slash and a backslash, the colon,@@ -746,4 +759,23 @@ mod tests {assert_eq!(ExportPane::rate_name((15, 1)), "15 fps");assert_eq!(ExportPane::rate_name((12500, 1000)), "12.5 fps");}++ /// A bitrate reads back as a person would type it, and what is typed+ /// is read the way it was meant: a decimal comma, a unit after it,+ /// and nothing below half a megabit or past 400.+ #[test]+ fn a_bitrate_is_said_and_read_in_megabits() {+ assert_eq!(mbps(8000), "8 Mbps");+ assert_eq!(mbps(7500), "7.5 Mbps");+ assert_eq!(mbps_number(40_000), "40");+ assert_eq!(typed_kbps("12"), Some(12_000));+ assert_eq!(typed_kbps("7,5 Mbps"), Some(7_500));+ assert_eq!(typed_kbps(" 7.5 "), Some(7_500));+ assert_eq!(typed_kbps("0.1"), Some(500));+ assert_eq!(typed_kbps("9000"), Some(400_000));+ assert_eq!(typed_kbps("Mbps"), None);+ assert_eq!(typed_kbps(""), None);+ // What the field shows is what it takes back.+ assert_eq!(typed_kbps(&mbps(7500)), Some(7500));+ }}diff --git a/src/crates/concat/src/studio.rs b/src/crates/concat/src/studio.rsindex 8df7573a..20006854 100644--- a/src/crates/concat/src/studio.rs+++ b/src/crates/concat/src/studio.rs@@ -158,10 +158,9 @@ pub const EXPORT_SHORT_SIDES: [u32; 4] = [2160, 1440, 1080, 720];/// compact dock: a phone, a tablet held upright, a desktop window squeezed/// to a corner. Four panes across less than this is four slivers.pub const COMPACT_WIDTH: f32 = 860.0;-/// Megabits per second at 1080p30 for each quality tier, for the size-/// estimate; and the CRF each tier renders at.-pub(crate) const EXPORT_TIERS: [f32; 3] = [16.0, 8.0, 4.0];-pub(crate) const EXPORT_CRF: [u8; 3] = [16, 20, 26];+/// The quality an export's encoder falls back on were it given no+/// bitrate: the export sheet always gives one.+pub(crate) const EXPORT_CRF: u8 = 20;pub(crate) const AUDIO_BPS: f32 = 192_000.0;/// The frame shapes the launch screen offers, as the ratio behind eachdiff --git a/src/crates/concat/ui/app.slint b/src/crates/concat/ui/app.slintindex 9c887d89..f8e4ab54 100644--- a/src/crates/concat/ui/app.slint+++ b/src/crates/concat/ui/app.slint@@ -232,9 +232,6 @@ export component App inherits Window {callback export-codec-changed(index: int);callback export-ten-bit-changed(on: bool);callback export-hdr-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);callback export-start();callback export-cancel();@@ -760,9 +757,6 @@ export component App inherits Window {codec-changed(index) => { root.export-codec-changed(index); }ten-bit-changed(on) => { root.export-ten-bit-changed(on); }hdr-changed(on) => { root.export-hdr-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); }begin => { root.export-start(); }cancel => { root.export-cancel(); }diff --git a/src/crates/concat/ui/dialogs/export.slint b/src/crates/concat/ui/dialogs/export.slintindex a5997497..1d0f0b55 100644--- a/src/crates/concat/ui/dialogs/export.slint+++ b/src/crates/concat/ui/dialogs/export.slint@@ -66,14 +66,13 @@ export struct ExportData {deep-available: bool,/// "HDR (HLG)" or "HDR (PQ)": the timeline's own.hdr-label: string,- /// 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.- rate-mode: int,- /// Target bitrate in kbps, used when rate-mode is CBR.- bitrate: int,+ /// The bitrate the file is written at, in Mbps, as the field shows+ /// it: "8", "7.5".+ target: string,+ /// What each choice aims for: "16 Mbps", "8 Mbps", "4 Mbps".+ rate-high: string,+ rate-balanced: string,+ rate-small: string,/// "HEVC 10-bit · hardware": what the file will be encoded asencoding: string,/// What each preset would weigh. Three strings rather than a list: a Slint@@ -81,6 +80,8 @@ export struct ExportData {size-high: string,size-balanced: string,size-small: string,+ /// What the chosen bitrate would weigh, the typed one included.+ size-chosen: string,phase: ExportPhase,/// 0..1progress: float,@@ -432,105 +433,56 @@ component OutputSection inherits DialogSection {}}+// The bitrate, as every editor asks for it: recommended for the frame and+// the rate, twice that or half it, or a number typed. The encoder keeps to+// an average, so the size on each card is the size written, give or take.component QualitySection inherits DialogSection {in property <ExportData> data;callback quality-changed(index: int);-- title: I18n.t("common.quality");-- HorizontalLayout {- spacing: 6px;-- QualityCard {- label: I18n.t("export.high");- note: I18n.t("export.master");- size: root.data.size-high;- current: root.data.quality == 0;- clicked => { root.quality-changed(0); }- }- QualityCard {- label: I18n.t("common.balanced");- note: I18n.t("export.recommended");- size: root.data.size-balanced;- current: root.data.quality == 1;- clicked => { root.quality-changed(1); }- }- QualityCard {- label: I18n.t("common.small");- note: I18n.t("export.share");- size: root.data.size-small;- current: root.data.quality == 2;- clicked => { root.quality-changed(2); }- }- }-}--// The switch, and what it opens: the bitrate, and 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-component AdvancedSection inherits VerticalLayout {- in property <ExportData> data;- in property <bool> first;- /// The bitrate and colour groups shown outright, with no switch to- /// show them: a sheet that has the window has room for them, and a- /// switch there was one more thing to click before a choice.- in property <bool> always;-- callback advanced-toggled(on: bool);- callback rate-mode-changed(index: int);callback bitrate-changed(text: string);- callback color-range-changed(index: int);- if !root.always: DialogSection {- first: root.first;- title: I18n.t("export.advanced");+ title: I18n.t("export.bitrate");- DialogRow {- label: I18n.t("export.showAdvancedOptions");- Switch {- checked: root.data.advanced;- toggled(on) => { root.advanced-toggled(on); }+ VerticalLayout {+ spacing: 8px;++ HorizontalLayout {+ spacing: 6px;++ QualityCard {+ label: I18n.t("export.higher");+ note: root.data.rate-high;+ size: root.data.size-high;+ current: root.data.quality == 0;+ clicked => { root.quality-changed(0); }+ }+ QualityCard {+ label: I18n.t("export.recommended");+ note: root.data.rate-balanced;+ size: root.data.size-balanced;+ current: root.data.quality == 1;+ clicked => { root.quality-changed(1); }+ }+ QualityCard {+ label: I18n.t("export.lower");+ note: root.data.rate-small;+ size: root.data.size-small;+ current: root.data.quality == 2;+ clicked => { root.quality-changed(2); }}}- }-- if root.always || root.data.advanced: DialogSection {- first: root.always && root.first;- title: I18n.t("export.bitrate");+ // The number the file is written at, whichever card set it; a+ // number typed here is a bitrate of its own.DialogRow {- label: I18n.t("common.mode");- Select {- current: root.data.rate-mode;- options: [I18n.t("export.vbr"), I18n.t("export.cbr")];- changed(index) => { root.rate-mode-changed(index); }- }- }- if root.data.rate-mode == 1: DialogRow {label: I18n.t("export.targetBitrate");Field {- value: root.data.bitrate + " kbps";+ value: root.data.target + " Mbps";edited(text) => { root.bitrate-changed(text); }}}}-- if root.always || root.data.advanced: DialogSection {- title: I18n.t("export.colour");-- DialogRow {- label: I18n.t("common.colourRange");- Select {- current: root.data.color-range;- options: [I18n.t("common.limited"), I18n.t("common.full")];- details: [I18n.t("export.videoYoutube"), I18n.t("export.screenContent")];- changed(index) => { root.color-range-changed(index); }- }- }- }}// What is under the groups: the failure, the progress, the result, and@@ -666,9 +618,7 @@ component ExportFooter inherits VerticalLayout {min-width: root.narrow ? 0px : 320px;glyph: Glyph.export;label: root.data.empty ? I18n.t("export.nothingToExport")- : I18n.t("export.exportEstimate") + (root.data.quality == 0 ? root.data.size-high- : root.data.quality == 1 ? root.data.size-balanced- : root.data.size-small);+ : I18n.t("export.exportEstimate") + root.data.size-chosen;enabled: !root.data.empty && root.data.name != "";clicked => { root.begin(); }}@@ -717,9 +667,6 @@ export component ExportDialog inherits Rectangle {callback codec-changed(index: int);callback ten-bit-changed(on: bool);callback hdr-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);callback begin();callback cancel();@@ -861,13 +808,7 @@ export component ExportDialog inherits Rectangle {if !root.running: QualitySection {data: root.data;quality-changed(index) => { root.quality-changed(index); }- }- if !root.running: AdvancedSection {- data: root.data;- advanced-toggled(on) => { root.advanced-toggled(on); }- rate-mode-changed(index) => { root.rate-mode-changed(index); }bitrate-changed(text) => { root.bitrate-changed(text); }- color-range-changed(index) => { root.color-range-changed(index); }}}@@ -900,6 +841,7 @@ export component ExportDialog inherits Rectangle {QualitySection {data: root.data;quality-changed(index) => { root.quality-changed(index); }+ bitrate-changed(text) => { root.bitrate-changed(text); }}}@@ -915,14 +857,6 @@ export component ExportDialog inherits Rectangle {ten-bit-changed(on) => { root.ten-bit-changed(on); }hdr-changed(on) => { root.hdr-changed(on); }}- AdvancedSection {- always: true;- data: root.data;- advanced-toggled(on) => { root.advanced-toggled(on); }- rate-mode-changed(index) => { root.rate-mode-changed(index); }- bitrate-changed(text) => { root.bitrate-changed(text); }- color-range-changed(index) => { root.color-range-changed(index); }- }}}@@ -973,14 +907,7 @@ export component ExportDialog inherits Rectangle {first: true;data: root.data;quality-changed(index) => { root.quality-changed(index); }- }- AdvancedSection {- always: true;- data: root.data;- advanced-toggled(on) => { root.advanced-toggled(on); }- rate-mode-changed(index) => { root.rate-mode-changed(index); }- bitrate-changed(text) => { root.bitrate-changed(text); }- color-range-changed(index) => { root.color-range-changed(index); }+ bitrate-changed(text) => { root.bitrate-changed(text); }}}}