Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Keep FrameRate::from_f64 nonzero for tiny positive fps

NetterSilver1c9041478ce5
diff --git a/crates/time/src/lib.rs b/crates/time/src/lib.rs
index 7a64a82bb..265c0c389 100644
--- a/crates/time/src/lib.rs
+++ b/crates/time/src/lib.rs
@@ -198,7 +198,9 @@ impl FrameRate {
return r;
}
}
- FrameRate::new((fps * 1000.0).round() as i64, 1000)
+ let num = (fps * 1000.0).round() as i64;
+ // A tiny positive rate must not round to the invalid 0/1 rate.
+ FrameRate::new(if fps > 0.0 { num.max(1) } else { num }, 1000)
}
pub fn as_f64(self) -> f64 {
@@ -533,6 +535,12 @@ pub const SAMPLE_RATES: [i64; 6] = [32_000, 44_100, 48_000, 88_200, 96_000, 192_
mod tests {
use super::*;
+ #[test]
+ fn from_f64_tiny_positive_fps_is_nonzero() {
+ let r = FrameRate::from_f64(0.0001);
+ assert!(r.num > 0 && r.den > 0, "got {r:?}");
+ }
+
#[test]
fn frame_rate_constructors_accept_extreme_numbers() {
assert_eq!(FrameRate::new(i64::MIN, 1), FrameRate { num: i64::MIN, den: 1 });