X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fon2avc.rs;h=8a346553e5f396b9857b0241d25ef4cf89d2f021;hb=ff6a914f5b07a9c62d7624fb6dd9f1fc093e82ca;hp=17f2d5ec75e760e1649628df9047fcefdbaff36b;hpb=f65c6fb45c243e937e06b17f2d22aadb61349bd7;p=nihav.git diff --git a/nihav-duck/src/codecs/on2avc.rs b/nihav-duck/src/codecs/on2avc.rs index 17f2d5e..8a34655 100644 --- a/nihav-duck/src/codecs/on2avc.rs +++ b/nihav-duck/src/codecs/on2avc.rs @@ -237,7 +237,7 @@ impl AVCDecoder { first = false; } else { scale += i16::from(br.read_cb(&self.codebooks.scale_cb)?); - validate!((scale >= 0) && (scale < 128)); + validate!((0..128).contains(&scale)); } self.scales[cur_band] = scale as u8; cur_band += 1; @@ -346,7 +346,7 @@ impl AVCDecoder { } Ok(()) } - #[allow(clippy::cyclomatic_complexity)] + #[allow(clippy::cognitive_complexity)] fn synth_channel(&mut self, chno: usize, dst: &mut [f32]) { let coeffs = &mut self.coeffs[chno]; let delay = &mut self.delay[chno]; @@ -1060,6 +1060,7 @@ mod test { //let file = "assets/Duck/Cell-140.vp5"; //let file = "assets/Duck/Chocolat-500.vp5"; + // sample: https://samples.mplayerhq.hu/V-codecs/VP7/potter-500.vp7 let file = "assets/Duck/potter-500.vp7"; test_decode_audio("avi", file, Some(1500), None/*Some("avc")*/, &dmx_reg, &dec_reg); }