From 482a1b65eccbb8855dba63e186c541cb268259b4 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Sat, 22 Aug 2026 19:21:12 +0200 Subject: [PATCH] janitorial: refactor some manual range loops --- nihav-duck/src/codecs/vp5.rs | 6 +++--- nihav-duck/src/codecs/vp8.rs | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nihav-duck/src/codecs/vp5.rs b/nihav-duck/src/codecs/vp5.rs index a58ce1b..cbb55e8 100644 --- a/nihav-duck/src/codecs/vp5.rs +++ b/nihav-duck/src/codecs/vp5.rs @@ -93,9 +93,9 @@ impl VP56Parser for VP5BR { models[comp].raw_probs[1] = bc.read_probability(); } } - for comp in 0..2 { - for i in 0..7 { - if bc.read_prob(HAS_TREE_PROB[comp][i]) { + for (comp, tree_probs) in HAS_TREE_PROB.iter().enumerate() { + for (i, &prob) in tree_probs.iter().enumerate() { + if bc.read_prob(prob) { models[comp].tree_probs[i] = bc.read_probability(); } } diff --git a/nihav-duck/src/codecs/vp8.rs b/nihav-duck/src/codecs/vp8.rs index 32682b9..ef3bfbd 100644 --- a/nihav-duck/src/codecs/vp8.rs +++ b/nihav-duck/src/codecs/vp8.rs @@ -517,16 +517,16 @@ impl VP8Decoder { fn set_single_qmat(qmat: &mut [[i16; 16]; 3], y_dc_q: usize, y_ac_q: usize, y2_dc_q: usize, y2_ac_q: usize, uv_dc_q: usize, uv_ac_q: usize) { qmat[0][0] = DC_QUANTS[y_dc_q]; - for i in 1..16 { - qmat[0][i] = AC_QUANTS[y_ac_q]; + for qm in qmat[0].iter_mut().skip(1) { + *qm = AC_QUANTS[y_ac_q]; } qmat[1][0] = DC_QUANTS[uv_dc_q].min(132); - for i in 1..16 { - qmat[1][i] = AC_QUANTS[uv_ac_q]; + for qm in qmat[1].iter_mut().skip(1) { + *qm = AC_QUANTS[uv_ac_q]; } qmat[2][0] = DC_QUANTS[y2_dc_q] * 2; - for i in 1..16 { - qmat[2][i] = (i32::from(AC_QUANTS[y2_ac_q]) * 155 / 100).max(8) as i16; + for qm in qmat[2].iter_mut().skip(1) { + *qm = (i32::from(AC_QUANTS[y2_ac_q]) * 155 / 100).max(8) as i16; } } fn set_qmat(&mut self, y_dc_q: usize, y_ac_q: usize, y2_dc_q: usize, y2_ac_q: usize, uv_dc_q: usize, uv_ac_q: usize) { -- 2.39.5