core: Increase buffer size, try to open 44.1Khz stream

Author: jpochyla

psst-core/src/audio/output.rs

@@ -27,7 +27,7 @@ impl AudioOutput {
 
         // Get the default device config, so we know what sample format and sample rate
         // the device supports.
-        let supported = device.default_output_config()?;
+        let supported = Self::preferred_output_config(&device)?;
 
         let (callback_send, callback_recv) = bounded(16);
 
@@ -48,6 +48,24 @@ impl AudioOutput {
         })
     }
 
+    fn preferred_output_config(
+        device: &cpal::Device,
+    ) -> Result<cpal::SupportedStreamConfig, Error> {
+        const PREFERRED_SAMPLE_RATE: cpal::SampleRate = cpal::SampleRate(44_100);
+
+        let mut configs: Vec<_> = device.supported_output_configs()?.collect();
+        configs.sort_by(|a, b| a.cmp_default_heuristics(b));
+
+        for range in configs {
+            let r = range.min_sample_rate()..=range.max_sample_rate();
+            if r.contains(&PREFERRED_SAMPLE_RATE) {
+                return Ok(range.with_sample_rate(PREFERRED_SAMPLE_RATE));
+            }
+        }
+
+        Ok(device.default_output_config()?)
+    }
+
     pub fn sink(&self) -> AudioSink {
         self.sink.clone()
     }
@@ -237,6 +255,12 @@ impl From<cpal::DefaultStreamConfigError> for Error {
     }
 }
 
+impl From<cpal::SupportedStreamConfigsError> for Error {
+    fn from(err: cpal::SupportedStreamConfigsError) -> Error {
+        Error::AudioOutputError(Box::new(err))
+    }
+}
+
 impl From<cpal::BuildStreamError> for Error {
     fn from(err: cpal::BuildStreamError) -> Error {
         Error::AudioOutputError(Box::new(err))

psst-core/src/player/worker.rs

@@ -95,7 +95,7 @@ impl DecoderSource {
             norm_factor,
         } = loaded;
 
-        const REPORT_PRECISION: Duration = Duration::from_millis(1000);
+        const REPORT_PRECISION: Duration = Duration::from_millis(900);
 
         // Gather the source signal parameters and compute how often we should report
         // the play-head position.
@@ -258,7 +258,7 @@ struct Worker {
 
 impl Worker {
     fn default_buffer() -> SpscRb<f32> {
-        const DEFAULT_BUFFER_SIZE: usize = 64 * 1024;
+        const DEFAULT_BUFFER_SIZE: usize = 128 * 1024;
 
         SpscRb::new(DEFAULT_BUFFER_SIZE)
     }