More touch ups

playback/src/config.rs

@@ -8,10 +8,14 @@ use crate::{
     RESAMPLER_INPUT_SIZE, SAMPLE_RATE,
 };
 
-// Reciprocals allow us to multiply instead of divide during interpolation.
-const HZ48000_RESAMPLE_FACTOR_RECIPROCAL: f64 = SAMPLE_RATE as f64 / 48_000.0;
-const HZ88200_RESAMPLE_FACTOR_RECIPROCAL: f64 = SAMPLE_RATE as f64 / 88_200.0;
-const HZ96000_RESAMPLE_FACTOR_RECIPROCAL: f64 = SAMPLE_RATE as f64 / 96_000.0;
+const HZ48000_RESAMPLE_FACTOR: f64 = 48_000.0 / (SAMPLE_RATE as f64);
+const HZ88200_RESAMPLE_FACTOR: f64 = 88_200.0 / (SAMPLE_RATE as f64);
+const HZ96000_RESAMPLE_FACTOR: f64 = 96_000.0 / (SAMPLE_RATE as f64);
+
+// Reciprocals allow us to multiply instead of divide during normal interpolation.
+const HZ48000_RESAMPLE_FACTOR_RECIPROCAL: f64 = 1.0 / HZ48000_RESAMPLE_FACTOR;
+const HZ88200_RESAMPLE_FACTOR_RECIPROCAL: f64 = 1.0 / HZ88200_RESAMPLE_FACTOR;
+const HZ96000_RESAMPLE_FACTOR_RECIPROCAL: f64 = 1.0 / HZ96000_RESAMPLE_FACTOR;
 
 // sample rate * channels
 const HZ44100_SAMPLES_PER_SECOND: f64 = 44_100.0 * 2.0;
@@ -23,13 +27,13 @@ const HZ96000_SAMPLES_PER_SECOND: f64 = 96_000.0 * 2.0;
 // to be integers, which is a very good thing. That means no fractional samples
 // which translates to much better interpolation.
 const HZ48000_INTERPOLATION_OUTPUT_SIZE: usize =
-    (RESAMPLER_INPUT_SIZE as f64 * (1.0 / HZ48000_RESAMPLE_FACTOR_RECIPROCAL)) as usize;
+    (RESAMPLER_INPUT_SIZE as f64 * HZ48000_RESAMPLE_FACTOR) as usize;
 
 const HZ88200_INTERPOLATION_OUTPUT_SIZE: usize =
-    (RESAMPLER_INPUT_SIZE as f64 * (1.0 / HZ88200_RESAMPLE_FACTOR_RECIPROCAL)) as usize;
+    (RESAMPLER_INPUT_SIZE as f64 * HZ88200_RESAMPLE_FACTOR) as usize;
 
 const HZ96000_INTERPOLATION_OUTPUT_SIZE: usize =
-    (RESAMPLER_INPUT_SIZE as f64 * (1.0 / HZ96000_RESAMPLE_FACTOR_RECIPROCAL)) as usize;
+    (RESAMPLER_INPUT_SIZE as f64 * HZ96000_RESAMPLE_FACTOR) as usize;
 
 #[derive(Clone, Copy, Debug, Default)]
 pub enum SampleRate {
@@ -134,6 +138,17 @@ impl SampleRate {
         }
     }
 
+    pub fn get_resample_factor(&self) -> Option<f64> {
+        use SampleRate::*;
+
+        match self {
+            Hz44100 => None,
+            Hz48000 => Some(HZ48000_RESAMPLE_FACTOR),
+            Hz88200 => Some(HZ88200_RESAMPLE_FACTOR),
+            Hz96000 => Some(HZ96000_RESAMPLE_FACTOR),
+        }
+    }
+
     pub fn get_resample_factor_reciprocal(&self) -> Option<f64> {
         use SampleRate::*;