aboutsummaryrefslogtreecommitdiffstats
path: root/nihav-game
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2022-09-22 17:53:58 +0200
committerKostya Shishkov <kostya.shishkov@gmail.com>2022-09-22 17:53:58 +0200
commit6f2630992fe340ad1a122ec10c649f756e478185 (patch)
treec8c95d46546cd71e2cd5e15faef02ca9acd2b70b /nihav-game
parentf44bddc9b5520507c7571b89763de668238d790a (diff)
downloadnihav-6f2630992fe340ad1a122ec10c649f756e478185.tar.gz
fix some clippy warnings
Diffstat (limited to 'nihav-game')
-rw-r--r--nihav-game/src/codecs/midivid3.rs2
-rw-r--r--nihav-game/src/codecs/vmd.rs4
-rw-r--r--nihav-game/src/codecs/vx.rs4
-rw-r--r--nihav-game/src/demuxers/smush.rs2
4 files changed, 6 insertions, 6 deletions
diff --git a/nihav-game/src/codecs/midivid3.rs b/nihav-game/src/codecs/midivid3.rs
index 31b8618..7878f2b 100644
--- a/nihav-game/src/codecs/midivid3.rs
+++ b/nihav-game/src/codecs/midivid3.rs
@@ -275,7 +275,7 @@ fn decode_values(br: &mut BitReader, dst: &mut [i16], cb: &Codebook<u32>) -> Dec
*el = 0;
zero_run -= 1;
} else {
- let val = br.read_cb(&cb)? as u8;
+ let val = br.read_cb(cb)? as u8;
if val == 0 {
zero_run = if br.read_bool()? {
br.read(6)? as usize + 8
diff --git a/nihav-game/src/codecs/vmd.rs b/nihav-game/src/codecs/vmd.rs
index 25f8b6d..f3a1d87 100644
--- a/nihav-game/src/codecs/vmd.rs
+++ b/nihav-game/src/codecs/vmd.rs
@@ -519,8 +519,8 @@ impl NADecoder for VMDAudioDecoder {
VMDAudioMode::DPCM => {
let mut adata = abuf.get_abuf_i16().unwrap();
let off1 = adata.get_offset(1);
- let mut dst = adata.get_data_mut().unwrap();
- self.decode_16bit(&mut dst, off1, &mut br, nblocks, mask)?;
+ let dst = adata.get_data_mut().unwrap();
+ self.decode_16bit(dst, off1, &mut br, nblocks, mask)?;
},
VMDAudioMode::U8 => {
let mut adata = abuf.get_abuf_u8().unwrap();
diff --git a/nihav-game/src/codecs/vx.rs b/nihav-game/src/codecs/vx.rs
index c13fc49..057f617 100644
--- a/nihav-game/src/codecs/vx.rs
+++ b/nihav-game/src/codecs/vx.rs
@@ -1197,10 +1197,10 @@ impl VXAudioDecoder {
f0[i] = (pfilt[i] + f1 [i]) >> 1;
f2[i] = (f1 [i] + cfilt[i]) >> 1;
}
- apply_lpc(&mut cur_buf[ 0..][..32], &prev_buf[128..], &mut self.lpc_hist, &f0);
+ apply_lpc(&mut cur_buf[ 0..][..32], &prev_buf[128..], &mut self.lpc_hist, &f0);
apply_lpc(&mut cur_buf[32..][..32], &prev_buf[128 + 32..], &mut self.lpc_hist, &f1);
apply_lpc(&mut cur_buf[64..][..32], &prev_buf[128 + 64..], &mut self.lpc_hist, &f2);
- apply_lpc(&mut cur_buf[96..][..32], &prev_buf[128 + 96..], &mut self.lpc_hist, &cfilt);
+ apply_lpc(&mut cur_buf[96..][..32], &prev_buf[128 + 96..], &mut self.lpc_hist, cfilt);
Ok(())
}
fn decode_intra(&mut self, br: &mut ByteReader, val: u16) -> DecoderResult<()> {
diff --git a/nihav-game/src/demuxers/smush.rs b/nihav-game/src/demuxers/smush.rs
index e863118..6476184 100644
--- a/nihav-game/src/demuxers/smush.rs
+++ b/nihav-game/src/demuxers/smush.rs
@@ -577,7 +577,7 @@ impl<'a> DemuxCore<'a> for MCMPDemuxer<'a> {
arate = self.src.read_u32le()?;
validate!(arate > 0);
} else {
- parse_iact(&mut self.src, data_start, &mut arate, &mut abits, &mut chans, true)?;
+ parse_iact(self.src, data_start, &mut arate, &mut abits, &mut chans, true)?;
}
if chans == 2 {
for (samp, pts) in self.samples.iter_mut().zip(self.pts.iter_mut()) {