github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

DRAY things up a bit

Browse source
This commit is contained in:
JasonLG1979 2023-07-03 15:20:23 -05:00
parent 33e2ce65d3
commit ac68d2431e
1 changed files with 14 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
playback/src/resampler.rs
View file

@ -48,66 +48,17 @@ impl<'a> IntoIterator for &'a DelayLine {
} }
} }
trait Convoluter { struct ConvolutionFilter {
fn new(interpolation_quality: InterpolationQuality, resample_factor_reciprocal: f64) -> Self coefficients: Vec<f64>,
where
Self: Sized;
fn convolute(&mut self, sample: f64) -> f64;
fn clear(&mut self);
}
struct WindowedSincInterpolator {
interpolation_coefficients: Vec<f64>,
delay_line: DelayLine, delay_line: DelayLine,
} }
impl Convoluter for WindowedSincInterpolator { impl ConvolutionFilter {
fn new(interpolation_quality: InterpolationQuality, resample_factor_reciprocal: f64) -> Self { fn new(coefficients: Vec<f64>) -> Self {
let interpolation_coefficients = let delay_line = DelayLine::new(coefficients.len());
interpolation_quality.get_interpolation_coefficients(resample_factor_reciprocal);
let delay_line = DelayLine::new(interpolation_coefficients.len());
Self { Self {
interpolation_coefficients, coefficients,
delay_line,
}
}
fn convolute(&mut self, sample: f64) -> f64 {
// Since our interpolation coefficients are pre-calculated
// we can basically pretend like the Interpolator is a FIR filter.
self.delay_line.push(sample);
// Temporal convolution
self.interpolation_coefficients
.iter()
.zip(&self.delay_line)
.fold(0.0, |acc, (coefficient, delay_line_sample)| {
acc + coefficient * delay_line_sample
})
}
fn clear(&mut self) {
self.delay_line.clear();
}
}
struct LinearFirFilter {
fir_filter_coefficients: Vec<f64>,
delay_line: DelayLine,
}
impl Convoluter for LinearFirFilter {
fn new(interpolation_quality: InterpolationQuality, resample_factor_reciprocal: f64) -> Self {
let fir_filter_coefficients =
interpolation_quality.get_fir_filter_coefficients(resample_factor_reciprocal);
let delay_line = DelayLine::new(fir_filter_coefficients.len());
Self {
fir_filter_coefficients,
delay_line, delay_line,
} }
} }
@ -116,7 +67,7 @@ impl Convoluter for LinearFirFilter {
self.delay_line.push(sample); self.delay_line.push(sample);
// Temporal convolution // Temporal convolution
self.fir_filter_coefficients self.coefficients
.iter() .iter()
.zip(&self.delay_line) .zip(&self.delay_line)
.fold(0.0, |acc, (coefficient, delay_line_sample)| { .fold(0.0, |acc, (coefficient, delay_line_sample)| {
@ -140,7 +91,7 @@ trait MonoResampler {
} }
struct MonoSincResampler { struct MonoSincResampler {
interpolator: WindowedSincInterpolator, interpolator: ConvolutionFilter,
input_buffer: Vec<f64>, input_buffer: Vec<f64>,
resample_factor_reciprocal: f64, resample_factor_reciprocal: f64,
delay_line_latency: u64, delay_line_latency: u64,
@ -156,9 +107,9 @@ impl MonoResampler for MonoSincResampler {
* spec.resample_factor_reciprocal) as u64; * spec.resample_factor_reciprocal) as u64;
Self { Self {
interpolator: WindowedSincInterpolator::new( interpolator: ConvolutionFilter::new(
interpolation_quality, interpolation_quality
spec.resample_factor_reciprocal, .get_interpolation_coefficients(spec.resample_factor_reciprocal),
), ),
input_buffer: Vec::with_capacity(SOURCE_SAMPLE_RATE as usize), input_buffer: Vec::with_capacity(SOURCE_SAMPLE_RATE as usize),
@ -210,7 +161,7 @@ impl MonoResampler for MonoSincResampler {
} }
struct MonoLinearResampler { struct MonoLinearResampler {
fir_filter: LinearFirFilter, fir_filter: ConvolutionFilter,
input_buffer: Vec<f64>, input_buffer: Vec<f64>,
resample_factor_reciprocal: f64, resample_factor_reciprocal: f64,
delay_line_latency: u64, delay_line_latency: u64,
@ -225,9 +176,8 @@ impl MonoResampler for MonoLinearResampler {
(NUM_FIR_FILTER_TAPS as f64 * spec.resample_factor_reciprocal) as u64; (NUM_FIR_FILTER_TAPS as f64 * spec.resample_factor_reciprocal) as u64;
Self { Self {
fir_filter: LinearFirFilter::new( fir_filter: ConvolutionFilter::new(
interpolation_quality, interpolation_quality.get_fir_filter_coefficients(spec.resample_factor_reciprocal),
spec.resample_factor_reciprocal,
), ),
input_buffer: Vec::with_capacity(SOURCE_SAMPLE_RATE as usize), input_buffer: Vec::with_capacity(SOURCE_SAMPLE_RATE as usize),