From 58d0b93808dd3798382ece9717a91fb1543bfc34 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Mon, 16 Nov 2026 21:31:56 +0100 Subject: [PATCH] use static codebook arrays instead of vectors where applicable --- nihav-qt/src/codecs/svq1.rs | 22 +++++-------- nihav-realmedia/src/codecs/cook.rs | 8 ++--- nihav-realmedia/src/codecs/ralf.rs | 35 ++++++++------------- nihav-realmedia/src/codecs/rv34codes.rs | 12 ++++---- nihav-realmedia/src/codecs/rv40.rs | 41 +++++++++---------------- nihav-vivo/src/codecs/siren.rs | 9 ++---- 6 files changed, 47 insertions(+), 80 deletions(-) diff --git a/nihav-qt/src/codecs/svq1.rs b/nihav-qt/src/codecs/svq1.rs index 431a049..63d5fe7 100644 --- a/nihav-qt/src/codecs/svq1.rs +++ b/nihav-qt/src/codecs/svq1.rs @@ -120,8 +120,8 @@ struct SVQ1Decoder { height: usize, ref_frm: Option>, mvs: Vec, - intra_stages_cb: Vec>, - inter_stages_cb: Vec>, + intra_stages_cb: [Codebook; 6], + inter_stages_cb: [Codebook; 6], intra_mean_cb: Codebook, inter_mean_cb: Codebook, mv_cb: Codebook, @@ -131,18 +131,12 @@ struct SVQ1Decoder { impl SVQ1Decoder { fn new() -> Self { - let mut intra_stages_cb = Vec::with_capacity(6); - for table in SVQ_INTRA_STAGE_CODES.iter() { - let mut cbd = SVQ1DescReader { table, bias: -1 }; - let cb = Codebook::new(&mut cbd, CodebookMode::MSB).unwrap(); - intra_stages_cb.push(cb); - } - let mut inter_stages_cb = Vec::with_capacity(6); - for table in SVQ_INTER_STAGE_CODES.iter() { - let mut cbd = SVQ1DescReader { table, bias: -1 }; - let cb = Codebook::new(&mut cbd, CodebookMode::MSB).unwrap(); - inter_stages_cb.push(cb); - } + let intra_stages_cb = std::array::from_fn(|i| { + let mut cbd = SVQ1DescReader { table: &SVQ_INTRA_STAGE_CODES[i], bias: -1 }; + Codebook::new(&mut cbd, CodebookMode::MSB).unwrap() }); + let inter_stages_cb = std::array::from_fn(|i| { + let mut cbd = SVQ1DescReader { table: &SVQ_INTER_STAGE_CODES[i], bias: -1 }; + Codebook::new(&mut cbd, CodebookMode::MSB).unwrap() }); let mut cbd = SVQ1DescReader { table: &SVQ_INTRA_MEAN_CODES, bias: 0 }; let intra_mean_cb = Codebook::new(&mut cbd, CodebookMode::MSB).unwrap(); let mut cbd = SVQ1InterMeanDescReader {}; diff --git a/nihav-realmedia/src/codecs/cook.rs b/nihav-realmedia/src/codecs/cook.rs index c360145..bc1610a 100644 --- a/nihav-realmedia/src/codecs/cook.rs +++ b/nihav-realmedia/src/codecs/cook.rs @@ -39,7 +39,7 @@ impl CodebookDescReader for CookBookReader { struct Codebooks { cpl_cb: [Codebook; 5], - quant_cb: Vec>, + quant_cb: [Codebook; COOK_QUANT_CODES.len()], vq_cb: [Codebook; 7], } @@ -55,11 +55,9 @@ impl Codebooks { Codebook::new(&mut cpl2, CodebookMode::MSB).unwrap(), Codebook::new(&mut cpl3, CodebookMode::MSB).unwrap(), Codebook::new(&mut cpl4, CodebookMode::MSB).unwrap()]; - let mut quant_cb: Vec> = Vec::with_capacity(COOK_QUANT_CODES.len()); - for i in 0..COOK_QUANT_CODES.len() { + let quant_cb = std::array::from_fn(|i| { let mut quant = CookBookReader { codes: COOK_QUANT_CODES[i], bits: COOK_QUANT_BITS[i] }; - quant_cb.push(Codebook::new(&mut quant, CodebookMode::MSB).unwrap()); - } + Codebook::new(&mut quant, CodebookMode::MSB).unwrap() }); let mut vq0 = CookBookReader { codes: COOK_VQ0_CODES, bits: COOK_VQ0_BITS }; let mut vq1 = CookBookReader { codes: COOK_VQ1_CODES, bits: COOK_VQ1_BITS }; let mut vq2 = CookBookReader { codes: COOK_VQ2_CODES, bits: COOK_VQ2_BITS }; diff --git a/nihav-realmedia/src/codecs/ralf.rs b/nihav-realmedia/src/codecs/ralf.rs index 1ebad04..28f3b5b 100644 --- a/nihav-realmedia/src/codecs/ralf.rs +++ b/nihav-realmedia/src/codecs/ralf.rs @@ -10,9 +10,9 @@ struct CodebookSet { filter_params_cb: Codebook, bias_cb: Codebook, coding_mode_cb: Codebook, - filter_coeffs_cb: Vec>>, - short_codes_cb: Vec>, - long_codes_cb: Vec>, + filter_coeffs_cb: [[Codebook; 11]; 10], + short_codes_cb: [Codebook; 15], + long_codes_cb: [Codebook; 125], } const MAX_ELEMS: usize = 644; @@ -64,26 +64,17 @@ impl CodebookSet { let mut cbr = RALFCodebookDescReader::new(&RALF_CODING_MODE_TAB[idx], RALF_CODING_MODE_LEN); let coding_mode_cb = Codebook::new(&mut cbr, CodebookMode::MSB).unwrap(); - let mut filter_coeffs_cb: Vec>> = Vec::with_capacity(10); - for cb_set in RALF_FILTER_COEFFS_TAB[idx].iter() { - let mut fcb: Vec> = Vec::with_capacity(11); - for cb in cb_set.iter() { - let mut cbr = RALFCodebookDescReader::new(cb, RALF_FILTER_COEFFS_LEN); - fcb.push(Codebook::new(&mut cbr, CodebookMode::MSB).unwrap()); - } - filter_coeffs_cb.push(fcb); - } + let filter_coeffs_cb = std::array::from_fn(|i| + std::array::from_fn(|j| { + let mut cbr = RALFCodebookDescReader::new(&RALF_FILTER_COEFFS_TAB[idx][i][j], RALF_FILTER_COEFFS_LEN); + Codebook::new(&mut cbr, CodebookMode::MSB).unwrap() })); - let mut short_codes_cb: Vec> = Vec::with_capacity(15); - for cb in RALF_SHORT_CODES_TAB[idx].iter() { - let mut cbr = RALFCodebookDescReader::new(cb, RALF_SHORT_CODES_LEN); - short_codes_cb.push(Codebook::new(&mut cbr, CodebookMode::MSB).unwrap()); - } - let mut long_codes_cb: Vec> = Vec::with_capacity(125); - for cb in RALF_LONG_CODES_TAB[idx].iter() { - let mut cbr = RALFCodebookDescReader::new(cb, RALF_LONG_CODES_LEN); - long_codes_cb.push(Codebook::new(&mut cbr, CodebookMode::MSB).unwrap()); - } + let short_codes_cb = std::array::from_fn(|i| { + let mut cbr = RALFCodebookDescReader::new(&RALF_SHORT_CODES_TAB[idx][i], RALF_SHORT_CODES_LEN); + Codebook::new(&mut cbr, CodebookMode::MSB).unwrap() }); + let long_codes_cb = std::array::from_fn(|i| { + let mut cbr = RALFCodebookDescReader::new(&RALF_LONG_CODES_TAB[idx][i], RALF_LONG_CODES_LEN); + Codebook::new(&mut cbr, CodebookMode::MSB).unwrap() }); Self { filter_params_cb, bias_cb, coding_mode_cb, filter_coeffs_cb, short_codes_cb, long_codes_cb } } diff --git a/nihav-realmedia/src/codecs/rv34codes.rs b/nihav-realmedia/src/codecs/rv34codes.rs index 4c684b5..0dddfd2 100644 --- a/nihav-realmedia/src/codecs/rv34codes.rs +++ b/nihav-realmedia/src/codecs/rv34codes.rs @@ -9,8 +9,8 @@ struct CBPSet { struct CoefSet { blk_pattern0: Vec>, - blk_pattern1: Vec>, - blk_pattern2: Vec>, + blk_pattern1: [Codebook; 2], + blk_pattern2: [Codebook; 2], } struct FullSet { @@ -156,13 +156,13 @@ impl CoefSet { let second0 = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); let mut coderead = RV34CodeReader::new(&RV34_INTRA_SECONDPAT[set][1]); let second1 = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); - let seconds: Vec> = vec![second0, second1]; + let seconds = [second0, second1]; let mut coderead = RV34CodeReader::new(&RV34_INTRA_THIRDPAT[set][0]); let third0 = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); let mut coderead = RV34CodeReader::new(&RV34_INTRA_THIRDPAT[set][1]); let third1 = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); - let thirds: Vec> = vec![third0, third1]; + let thirds = [third0, third1]; CoefSet { blk_pattern0: firsts, blk_pattern1: seconds, blk_pattern2: thirds } } else { @@ -176,13 +176,13 @@ impl CoefSet { let second0 = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); let mut coderead = RV34CodeReader::new(&RV34_INTER_SECONDPAT[set][1]); let second1 = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); - let seconds: Vec> = vec![second0, second1]; + let seconds = [second0, second1]; let mut coderead = RV34CodeReader::new(&RV34_INTER_THIRDPAT[set][0]); let third0 = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); let mut coderead = RV34CodeReader::new(&RV34_INTER_THIRDPAT[set][1]); let third1 = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); - let thirds: Vec> = vec![third0, third1]; + let thirds = [third0, third1]; CoefSet { blk_pattern0: firsts, blk_pattern1: seconds, blk_pattern2: thirds } } diff --git a/nihav-realmedia/src/codecs/rv40.rs b/nihav-realmedia/src/codecs/rv40.rs index bca36ee..7595930 100644 --- a/nihav-realmedia/src/codecs/rv40.rs +++ b/nihav-realmedia/src/codecs/rv40.rs @@ -50,10 +50,10 @@ struct RealVideo40BR { width: usize, height: usize, aic_top_cb: Codebook, - aic_mode1_cb: Vec>, - aic_mode2_cb: Vec>, - ptype_cb: Vec>, - btype_cb: Vec>, + aic_mode1_cb: [Codebook; 90], + aic_mode2_cb: [Codebook; 20], + ptype_cb: [Codebook; 7], + btype_cb: [Codebook; 6], had_skip_run: bool, } @@ -62,39 +62,26 @@ impl RealVideo40BR { let mut coderead = AICCodeReader8{ lengths: &RV40_AIC_TOP_BITS, codes: &RV40_AIC_TOP_CODES }; let aic_top_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); - let mut aic_mode1_cb: Vec> = Vec::with_capacity(RV40_AIC_MODE1_BITS.len()); - for i in 0..RV40_AIC_MODE1_BITS.len() { + let aic_mode1_cb = std::array::from_fn(|i| if (i % 10) != 9 { let mut coderead = AICCodeReader8{ lengths: &RV40_AIC_MODE1_BITS[i], codes: &RV40_AIC_MODE1_CODES[i] }; - let cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); - aic_mode1_cb.push(cb); + Codebook::new(&mut coderead, CodebookMode::MSB).unwrap() } else { let mut coderead = AICCodeReader8{ lengths: &RV40_AIC_MODE1_BITS_DUMMY, codes: &RV40_AIC_MODE1_CODES_DUMMY }; - let cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); - aic_mode1_cb.push(cb); - } - } + Codebook::new(&mut coderead, CodebookMode::MSB).unwrap() + }); - let mut aic_mode2_cb: Vec> = Vec::with_capacity(RV40_AIC_MODE2_BITS.len()); - for i in 0..RV40_AIC_MODE2_BITS.len() { + let aic_mode2_cb = std::array::from_fn(|i| { let mut coderead = AICCodeReader16{ lengths: &RV40_AIC_MODE2_BITS[i], codes: &RV40_AIC_MODE2_CODES[i] }; - let cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); - aic_mode2_cb.push(cb); - } + Codebook::new(&mut coderead, CodebookMode::MSB).unwrap() }); - let mut ptype_cb: Vec> = Vec::with_capacity(RV40_PTYPE_BITS.len()); - for i in 0..RV40_PTYPE_BITS.len() { + let ptype_cb = std::array::from_fn(|i| { let mut coderead = TypeCodeReader{ lengths: &RV40_PTYPE_BITS[i], codes: &RV40_PTYPE_CODES[i], syms: RV40_PTYPE_SYMS }; - let cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); - ptype_cb.push(cb); - } + Codebook::new(&mut coderead, CodebookMode::MSB).unwrap() }); - let mut btype_cb: Vec> = Vec::with_capacity(RV40_BTYPE_BITS.len()); - for i in 0..RV40_BTYPE_BITS.len() { + let btype_cb = std::array::from_fn(|i| { let mut coderead = TypeCodeReader{ lengths: &RV40_BTYPE_BITS[i], codes: &RV40_BTYPE_CODES[i], syms: RV40_BTYPE_SYMS }; - let cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); - btype_cb.push(cb); - } + Codebook::new(&mut coderead, CodebookMode::MSB).unwrap() }); RealVideo40BR { width: 0, diff --git a/nihav-vivo/src/codecs/siren.rs b/nihav-vivo/src/codecs/siren.rs index 868b4d4..09a22bd 100644 --- a/nihav-vivo/src/codecs/siren.rs +++ b/nihav-vivo/src/codecs/siren.rs @@ -37,7 +37,7 @@ struct SirenDecoder { chmap: NAChannelMap, ainfo: NAAudioInfo, info: NACodecInfoRef, - diff_cb: Vec>, + diff_cb: [Codebook; NUM_DIFF_CB], vec_cb: [Codebook; 7], imdct: IMDCT, @@ -59,12 +59,9 @@ struct SirenDecoder { fn map_idx_diff(idx: usize) -> i8 { (idx as i8) - 12 } impl SirenDecoder { fn new() -> Self { - let mut diff_cb = Vec::with_capacity(NUM_DIFF_CB); - for i in 0..NUM_DIFF_CB { + let diff_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&DIFF_CODE_BITS[i], &DIFF_CODE_LENS[i], map_idx_diff); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - diff_cb.push(cb); - } + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); let mut cr = TableCodebookDescReader::new(&VEC_CB0_BITS, &VEC_CB0_LENS, |idx| VEC_CB0_SYMS[idx]); let vec_cb0 = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); let mut cr = TableCodebookDescReader::new(&VEC_CB1_BITS, &VEC_CB1_LENS, |idx| VEC_CB1_SYMS[idx]); -- 2.47.3