X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-game%2Fsrc%2Fcodecs%2Fvx.rs;h=185c9f4d434e915f8507dd3c4b095dc9a342f0f3;hb=016340a0e75cf93fa138a9b37fb5260d04eb3ee0;hp=584ed494fdf00207a7192e066ec7ded16f9b1cc6;hpb=2451e9532d1796640598e106ae2ecbcce38e2793;p=nihav.git

diff --git a/nihav-game/src/codecs/vx.rs b/nihav-game/src/codecs/vx.rs
index 584ed49..185c9f4 100644
--- a/nihav-game/src/codecs/vx.rs
+++ b/nihav-game/src/codecs/vx.rs
@@ -652,7 +652,7 @@ impl VXVideoDecoder {
         let mx = self.cur_mv.x as isize;
         let my = self.cur_mv.y as isize;
         mc!(self.buf, src, dst, mx, my, xpos, ypos, w, h, 0, 0, 0, self.width, self.height);
-        
+
         Ok(())
     }
     fn do_mc_bias(&mut self, br: &mut BitReader, xpos: usize, ypos: usize, w: usize, h: usize) -> DecoderResult<()> {
@@ -664,7 +664,7 @@ impl VXVideoDecoder {
         let udelta                      = br.read_gammap_s()? * 2;
         let vdelta                      = br.read_gammap_s()? * 2;
         mc!(self.buf, src, dst, mx, my, xpos, ypos, w, h, ydelta, udelta, vdelta, self.width, self.height);
-        
+
         Ok(())
     }
     fn pred_plane(&mut self, br: &mut BitReader, xpos: usize, ypos: usize, w: usize, h: usize) -> DecoderResult<()> {
@@ -1119,8 +1119,7 @@ impl AudioState {
 }
 
 fn apply_lpc(dst: &mut [i32], src: &[i32], hist: &mut [i32], filt: &[i32; 8]) {
-    let mut hidx = 0;
-    for (out, src) in dst.iter_mut().zip(src.iter()) {
+    for (hidx, (out, src)) in dst.iter_mut().zip(src.iter()).enumerate() {
         let mut sum = *src << 14;
         for i in 0..8 {
             sum += hist[(hidx + i) & 7] * filt[i];
@@ -1128,7 +1127,6 @@ fn apply_lpc(dst: &mut [i32], src: &[i32], hist: &mut [i32], filt: &[i32; 8]) {
         let samp = sum >> 14;
         *out = samp;
         hist[hidx & 7] = samp;
-        hidx += 1;
     }
 }