Merge pull request #181 from Holzhaus/dependabot/cargo/symphonia-0.6.0

chore(deps): bump symphonia from 0.5.5 to 0.6.0

Author: Holzhaus

Cargo.lock

@@ -39,7 +39,7 @@ simplelog = "0.12.2"
 unicode-segmentation = "1.13.3"
 unicode-width = "0.2.2"
 itertools = "0.15.0"
-symphonia = { version = "0.5.5", features = ["all-formats", "all-codecs"] }
+symphonia = { version = "0.6.0", features = ["all-formats", "all-codecs"] }
 rusty-chromaprint = "0.3.0"
 base64 = "0.22.1"
 float_eq = "1"

Cargo.toml

@@ -17,7 +17,7 @@ use crate::config::Config;
 use base64::prelude::{Engine, BASE64_URL_SAFE_NO_PAD};
 
 use symphonia::core::audio::Channels;
-use symphonia::core::codecs::CodecParameters;
+use symphonia::core::formats::Track;
 
 use rusty_chromaprint::{Configuration, FingerprintCompressor, Fingerprinter};
 
@@ -56,12 +56,16 @@ const MAX_DURATION: usize = 120;
 impl Analyzer for ChromaprintFingerprintAnalyzer {
     type Result = ChromaprintFingerprintResult;
 
-    fn initialize(_config: &Config, codec_params: &CodecParameters) -> Result<Self, AnalyzerError> {
-        let sample_rate = codec_params
-            .sample_rate
-            .ok_or(AnalyzerError::MissingSampleRate)?;
-        let channels = codec_params
+    fn initialize(_config: &Config, track: &Track) -> Result<Self, AnalyzerError> {
+        let spec = track
+            .codec_params
+            .as_ref()
+            .and_then(|params| params.audio())
+            .ok_or(AnalyzerError::NoSupportedAudioTracks)?;
+        let sample_rate = spec.sample_rate.ok_or(AnalyzerError::MissingSampleRate)?;
+        let channels = spec
             .channels
+            .as_ref()
             .map(Channels::count)
             .and_then(|channel_count| u32::try_from(channel_count).ok())
             .ok_or(AnalyzerError::MissingAudioChannels)?;
@@ -80,8 +84,15 @@ impl Analyzer for ChromaprintFingerprintAnalyzer {
         Ok(analyzer)
     }
 
-    fn feed(&mut self, samples: &[i16]) -> Result<(), AnalyzerError> {
+    fn feed(&mut self, samples: &[f32]) -> Result<(), AnalyzerError> {
         let remaining = self.stream_size_max - self.stream_size;
+
+        #[allow(clippy::cast_possible_truncation)]
+        let samples: Vec<i16> = samples
+            .iter()
+            .map(|&sample| (sample * 32_768.0).trunc() as i16)
+            .collect();
+
         let chunk_size = samples.len().min(remaining);
         self.stream_size += chunk_size;
         self.fingerprinter.consume(&samples[..chunk_size]);

src/analyzer/chromaprint.rs

@@ -14,7 +14,7 @@ use super::{Analyzer, AnalyzerError};
 use crate::config::Config;
 
 use symphonia::core::audio::Channels;
-use symphonia::core::codecs::CodecParameters;
+use symphonia::core::formats::Track;
 
 use ebur128::{energy_to_loudness, EbuR128, Mode};
 
@@ -178,12 +178,16 @@ fn ratio_to_dbfs(value: f64) -> f64 {
 impl Analyzer for EbuR128Analyzer {
     type Result = EbuR128Result;
 
-    fn initialize(_config: &Config, codec_params: &CodecParameters) -> Result<Self, AnalyzerError> {
-        let sample_rate = codec_params
-            .sample_rate
-            .ok_or(AnalyzerError::MissingSampleRate)?;
-        let channel_count = codec_params
+    fn initialize(_config: &Config, track: &Track) -> Result<Self, AnalyzerError> {
+        let params = track
+            .codec_params
+            .as_ref()
+            .and_then(|params| params.audio())
+            .ok_or(AnalyzerError::NoSupportedAudioTracks)?;
+        let sample_rate = params.sample_rate.ok_or(AnalyzerError::MissingSampleRate)?;
+        let channel_count = params
             .channels
+            .as_ref()
             .map(Channels::count)
             .ok_or(AnalyzerError::MissingAudioChannels)?;
 
@@ -202,11 +206,7 @@ impl Analyzer for EbuR128Analyzer {
         Ok(analyzer)
     }
 
-    fn feed(&mut self, samples: &[i16]) -> Result<(), AnalyzerError> {
-        let samples: Vec<f32> = samples
-            .iter()
-            .map(|&sample| f32::from(sample) / f32::from(i16::MAX))
-            .collect();
+    fn feed(&mut self, samples: &[f32]) -> Result<(), AnalyzerError> {
         for chunk in samples.chunks(self.chunk_size) {
             self.ebur128.add_frames_f32(chunk)?;
         }