Skip to content

Commit 46ad6cf

Browse files
tmatthlu-zero
tmatth
authored and
lu-zero
committed
resampler: fix clippy lints
1 parent 33e6827 commit 46ad6cf

File tree

6 files changed

+41
-48
lines changed

6 files changed

+41
-48
lines changed

‎benches/resampling_rust.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ fn resample_rs() {
3232
.process_float(0, &fin[off..off + in_len], &mut fout[..out_len])
3333
.unwrap();
3434

35-
off += in_len as usize;
35+
off += in_len;
3636
avail += INBLOCK as isize - in_len as isize;
3737

3838
if off >= INBLOCK {
3939
off -= INBLOCK;
4040
}
4141

42-
data.push(fout[..out_len as usize].to_vec());
42+
data.push(fout[..out_len].to_vec());
4343

4444
rate += 5000;
4545
if rate > 128000 {

‎examples/testresample.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ fn main() {
4343
rate, off, prev_in_len, prev_out_len, in_len, out_len
4444
);
4545

46-
off += in_len as usize;
46+
off += in_len;
4747
avail += INBLOCK as isize - in_len as isize;
4848

4949
if off >= INBLOCK {
5050
off -= INBLOCK;
5151
}
5252

53-
data.push(fout[..out_len as usize].to_vec());
53+
data.push(fout[..out_len].to_vec());
5454

5555
rate += 5000;
5656
if rate > 128000 {

‎fft/src/fftwrap.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl DrftLookup {
6262

6363
out.iter_mut()
6464
.zip(in_0.iter())
65-
.take(self.n as usize)
65+
.take(self.n)
6666
.for_each(|(o, i)| *o = scale * *i);
6767

6868
self.spx_drft_forward(out);
@@ -72,7 +72,7 @@ impl DrftLookup {
7272
if in_0 == out {
7373
eprintln!("FFT should not be done in-place");
7474
} else {
75-
out.copy_from_slice(&in_0[..self.n as usize]);
75+
out.copy_from_slice(&in_0[..self.n]);
7676
}
7777

7878
self.spx_drft_backward(out);
@@ -91,7 +91,7 @@ impl DrftLookup {
9191
return;
9292
}
9393

94-
let mut trigcache_temp = self.trigcache[self.n as usize..].to_vec();
94+
let mut trigcache_temp = self.trigcache[self.n..].to_vec();
9595

9696
drftf1(
9797
self.n as i32,
@@ -101,15 +101,15 @@ impl DrftLookup {
101101
&mut self.splitcache,
102102
);
103103

104-
self.trigcache[self.n as usize..].copy_from_slice(&trigcache_temp);
104+
self.trigcache[self.n..].copy_from_slice(&trigcache_temp);
105105
}
106106

107107
pub fn spx_drft_backward(&mut self, data: &mut [f32]) {
108108
if self.n == 1 {
109109
return;
110110
}
111111

112-
let mut trigcache_temp = self.trigcache[self.n as usize..].to_vec();
112+
let mut trigcache_temp = self.trigcache[self.n..].to_vec();
113113

114114
drftb1(
115115
self.n as i32,
@@ -119,6 +119,6 @@ impl DrftLookup {
119119
&mut self.splitcache,
120120
);
121121

122-
self.trigcache[self.n as usize..].copy_from_slice(&trigcache_temp);
122+
self.trigcache[self.n..].copy_from_slice(&trigcache_temp);
123123
}
124124
}

‎resampler/src/speex.rs

+17-17
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ impl SpeexResamplerState {
204204
out_stride: 1,
205205
buffer_size: 160,
206206
oversample: 0,
207-
last_sample: vec![0; nb_channels as usize],
208-
magic_samples: vec![0; nb_channels as usize],
209-
samp_frac_num: vec![0; nb_channels as usize],
207+
last_sample: vec![0; nb_channels],
208+
magic_samples: vec![0; nb_channels],
209+
samp_frac_num: vec![0; nb_channels],
210210
};
211211
st.set_quality(quality);
212212
st.set_rate_frac(ratio_num, ratio_den, in_rate, out_rate);
@@ -325,7 +325,7 @@ impl SpeexResamplerState {
325325
channel_index,
326326
&mut yselfack.as_mut_slice(),
327327
ochunk,
328-
) as u32;
328+
);
329329
ochunk -= omagic;
330330
olen -= omagic
331331
}
@@ -365,8 +365,8 @@ impl SpeexResamplerState {
365365

366366
ilen -= ichunk;
367367
olen -= ochunk;
368-
out = &mut out[(ochunk + omagic * ostride_save as u32) as usize..];
369-
in_0 = &in_0[(ichunk * istride_save as u32) as usize..];
368+
out = &mut out[(ochunk + omagic * ostride_save) as usize..];
369+
in_0 = &in_0[(ichunk * istride_save) as usize..];
370370
}
371371
self.out_stride = ostride_save;
372372
*in_len -= ilen;
@@ -821,9 +821,9 @@ fn resampler_basic_zero(
821821
out[(out_stride * out_sample) as usize] = 0.0;
822822
out_sample += 1;
823823
last_sample += int_advance;
824-
samp_frac_num += frac_advance as u32;
824+
samp_frac_num += frac_advance;
825825
if samp_frac_num >= den_rate {
826-
samp_frac_num -= den_rate as u32;
826+
samp_frac_num -= den_rate;
827827
last_sample += 1
828828
}
829829
}
@@ -884,7 +884,7 @@ fn resampler_basic_interpolate_single(
884884

885885
out_sample += 1;
886886
last_sample += int_advance;
887-
samp_frac_num += frac_advance as u32;
887+
samp_frac_num += frac_advance;
888888
if samp_frac_num >= den_rate {
889889
samp_frac_num -= den_rate;
890890
last_sample += 1;
@@ -1146,9 +1146,9 @@ fn resampler_basic_direct_single(
11461146

11471147
out_sample += 1;
11481148
last_sample += int_advance;
1149-
samp_frac_num += frac_advance as u32;
1149+
samp_frac_num += frac_advance;
11501150
if samp_frac_num >= den_rate {
1151-
samp_frac_num -= den_rate as u32;
1151+
samp_frac_num -= den_rate;
11521152
last_sample += 1
11531153
}
11541154
}
@@ -1189,13 +1189,13 @@ fn resampler_basic_direct_double(
11891189

11901190
out_sample += 1;
11911191
last_sample += int_advance;
1192-
samp_frac_num += frac_advance as u32;
1192+
samp_frac_num += frac_advance;
11931193
if samp_frac_num >= den_rate {
1194-
samp_frac_num -= den_rate as u32;
1194+
samp_frac_num -= den_rate;
11951195
last_sample += 1;
11961196
}
11971197
}
1198-
st.last_sample[channel_index as usize] = last_sample as u32;
1198+
st.last_sample[channel_index as usize] = last_sample;
11991199
st.samp_frac_num[channel_index as usize] = samp_frac_num;
12001200
out_sample as i32
12011201
}
@@ -1243,7 +1243,7 @@ fn speex_resampler_process_native(
12431243
out_len,
12441244
);
12451245
if st.last_sample[channel_index as usize] < *in_len {
1246-
*in_len = st.last_sample[channel_index as usize] as u32;
1246+
*in_len = st.last_sample[channel_index as usize];
12471247
}
12481248
*out_len = out_sample as u32;
12491249
st.last_sample[channel_index as usize] -= *in_len;
@@ -1268,7 +1268,7 @@ fn speex_resampler_magic<'a, 'b>(
12681268
st,
12691269
channel_index,
12701270
&mut tmp_in_len,
1271-
*out,
1271+
out,
12721272
&mut out_len,
12731273
);
12741274
st.magic_samples[channel_idx] -= tmp_in_len;
@@ -1282,7 +1282,7 @@ fn speex_resampler_magic<'a, 'b>(
12821282
.for_each(|(x, &y)| *x = y);
12831283
}
12841284
let value: &'b mut [f32] = mem::take(out);
1285-
*out = &mut value[(out_len * st.out_stride as u32) as usize..];
1285+
*out = &mut value[(out_len * st.out_stride) as usize..];
12861286
out_len
12871287
}
12881288

‎resampler/src/speex/native.rs

+11-18
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn interpolate_step_single(
2424
) {
2525
let mut accum: [f32; 4] = [0.; 4];
2626
in_slice.iter().zip(0..n).for_each(|(&curr_in, j)| {
27-
let idx = (2 + (j + 1) * oversample as usize) - offset as usize;
27+
let idx = (2 + (j + 1) * oversample) - offset;
2828
accum.iter_mut().zip(sinc_table.iter().skip(idx)).for_each(
2929
|(v, &s)| {
3030
*v += curr_in * s;
@@ -33,7 +33,7 @@ pub fn interpolate_step_single(
3333
});
3434
let mut interp: [f32; 4] = [0.; 4];
3535
cubic_coef(frac, &mut interp);
36-
out_slice[(out_stride * out_sample) as usize] = interp
36+
out_slice[(out_stride * out_sample)] = interp
3737
.iter()
3838
.zip(accum.iter())
3939
.map(|(&x, &y)| x * y)
@@ -55,7 +55,7 @@ pub fn interpolate_step_double(
5555
) {
5656
let mut accum: [f64; 4] = [0.0; 4];
5757
in_slice.iter().zip(0..n).for_each(|(&curr_in, j)| {
58-
let idx = (2 + (j + 1) * oversample as usize) - offset as usize;
58+
let idx = (2 + (j + 1) * oversample) - offset;
5959
accum.iter_mut().zip(sinc_table.iter().skip(idx)).for_each(
6060
|(v, &s)| {
6161
*v += (curr_in * s) as f64;
@@ -64,7 +64,7 @@ pub fn interpolate_step_double(
6464
});
6565
let mut interp: [f32; 4] = [0.; 4];
6666
cubic_coef(frac, &mut interp);
67-
out_slice[(out_stride * out_sample) as usize] = interp
67+
out_slice[(out_stride * out_sample)] = interp
6868
.iter()
6969
.zip(accum.iter())
7070
.map(|(&x, &y)| x * y as f32)
@@ -83,10 +83,10 @@ pub fn direct_step_single(
8383
let mut sum: f32 = 0.0;
8484
let mut j = 0;
8585
while j < n {
86-
sum += sinc_table[j as usize] * in_slice[j as usize];
86+
sum += sinc_table[j] * in_slice[j];
8787
j += 1
8888
}
89-
out_slice[(out_stride * out_sample) as usize] = sum;
89+
out_slice[(out_stride * out_sample)] = sum;
9090
}
9191

9292
#[inline(always)]
@@ -102,20 +102,13 @@ pub fn direct_step_double(
102102
let mut j = 0;
103103

104104
while j < n {
105-
accum[0usize] +=
106-
f64::from(sinc_table[j as usize] * in_slice[j as usize]);
107-
accum[1usize] += f64::from(
108-
sinc_table[(j + 1) as usize] * in_slice[(j + 1) as usize],
109-
);
110-
accum[2usize] += f64::from(
111-
sinc_table[(j + 2) as usize] * in_slice[(j + 2) as usize],
112-
);
113-
accum[3usize] += f64::from(
114-
sinc_table[(j + 3) as usize] * in_slice[(j + 3) as usize],
115-
);
105+
accum[0usize] += f64::from(sinc_table[j] * in_slice[j]);
106+
accum[1usize] += f64::from(sinc_table[(j + 1)] * in_slice[(j + 1)]);
107+
accum[2usize] += f64::from(sinc_table[(j + 2)] * in_slice[(j + 2)]);
108+
accum[3usize] += f64::from(sinc_table[(j + 3)] * in_slice[(j + 3)]);
116109
j += 4
117110
}
118111
let sum: f64 =
119112
accum[0usize] + accum[1usize] + accum[2usize] + accum[3usize];
120-
out_slice[(out_stride * out_sample) as usize] = sum as f32;
113+
out_slice[(out_stride * out_sample)] = sum as f32;
121114
}

‎tests/resampler.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ mod comparison {
7878
assert_eq!(in_len, in_len_native);
7979
assert_eq!(out_len, out_len_native);
8080

81-
off += in_len as usize;
81+
off += in_len;
8282
avail += INBLOCK as isize - in_len as isize;
8383

8484
if off >= INBLOCK {
8585
off -= INBLOCK;
8686
}
8787

88-
let fout_s = &fout[..out_len as usize];
89-
let fout_native_s = &fout_native[..out_len as usize];
88+
let fout_s = &fout[..out_len];
89+
let fout_native_s = &fout_native[..out_len];
9090

9191
fout_s
9292
.iter()

0 commit comments

Comments
 (0)