Avoid socketserver panic when calculating time points

HEnquist · Sep 15, 2023 · 3e3026d · 3e3026d
1 parent 58a0bca
commit 3e3026d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "camilladsp"
-version = "2.0.0-alpha2"
+version = "2.0.0-alpha3"
 authors = ["Henrik Enquist <[email protected]>"]
 edition = "2021"
 description = "A flexible tool for processing audio"

diff --git a/src/socketserver.rs b/src/socketserver.rs
@@ -1320,8 +1320,9 @@ fn clamped_volume(vol: f32) -> f32 {
 }
 
 fn playback_signal_peak_since(shared_data: &SharedData, time: f32) -> Vec<f32> {
+    let clamped_time = time.clamp(0.0, 1000.0);
     let time_instant = Instant::now()
-        .checked_sub(Duration::from_secs_f32(time))
+        .checked_sub(Duration::from_secs_f32(clamped_time))
         .unwrap();
     let res = shared_data
         .playback_status
@@ -1338,8 +1339,9 @@ fn playback_signal_peak_since(shared_data: &SharedData, time: f32) -> Vec<f32> {
 }
 
 fn playback_signal_rms_since(shared_data: &SharedData, time: f32) -> Vec<f32> {
+    let clamped_time = time.clamp(0.0, 1000.0);
     let time_instant = Instant::now()
-        .checked_sub(Duration::from_secs_f32(time))
+        .checked_sub(Duration::from_secs_f32(clamped_time))
         .unwrap();
     let res = shared_data
         .playback_status
@@ -1356,8 +1358,9 @@ fn playback_signal_rms_since(shared_data: &SharedData, time: f32) -> Vec<f32> {
 }
 
 fn capture_signal_peak_since(shared_data: &SharedData, time: f32) -> Vec<f32> {
+    let clamped_time = time.clamp(0.0, 1000.0);
     let time_instant = Instant::now()
-        .checked_sub(Duration::from_secs_f32(time))
+        .checked_sub(Duration::from_secs_f32(clamped_time))
         .unwrap();
     let res = shared_data
         .capture_status
@@ -1374,8 +1377,9 @@ fn capture_signal_peak_since(shared_data: &SharedData, time: f32) -> Vec<f32> {
 }
 
 fn capture_signal_rms_since(shared_data: &SharedData, time: f32) -> Vec<f32> {
+    let clamped_time = time.clamp(0.0, 1000.0);
     let time_instant = Instant::now()
-        .checked_sub(Duration::from_secs_f32(time))
+        .checked_sub(Duration::from_secs_f32(clamped_time))
         .unwrap();
     let res = shared_data
         .capture_status