From: Kostya Shishkov Date: Mon, 16 Nov 2026 19:58:45 +0000 (+0100) Subject: use std::array::from_fn() instead of manual MaybeUninit-based code X-Git-Url: https://git.nihav.org/?a=commitdiff_plain;h=ecfae2a0b189243fab85697bae7d52ba47a4fdda;p=nihav.git use std::array::from_fn() instead of manual MaybeUninit-based code --- diff --git a/nihav-duck/src/codecs/vp3.rs b/nihav-duck/src/codecs/vp3.rs index 7eea073..40b7caa 100644 --- a/nihav-duck/src/codecs/vp3.rs +++ b/nihav-duck/src/codecs/vp3.rs @@ -1,5 +1,3 @@ -use std::mem; -use std::ptr; use nihav_core::codecs::*; use nihav_codec_support::codecs::{MV, ZERO_MV, ZIGZAG}; use nihav_codec_support::codecs::blockdsp::*; @@ -28,30 +26,17 @@ struct VP30Codes { impl VP30Codes { fn new() -> Self { - let dc_cb; - let ac_i_cb; - let ac_p_cb; - let mut cr = TableCodebookDescReader::new(&VP30_MBTYPE_CODES, &VP30_MBTYPE_BITS, |idx| VP30_MBTYPE_SYMS[idx]); - let mbtype_cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - unsafe { - let mut udc_cb: mem::MaybeUninit::<[Codebook; 5]> = mem::MaybeUninit::uninit(); - let mut uac_i_cb: mem::MaybeUninit::<[Codebook; 5]> = mem::MaybeUninit::uninit(); - let mut uac_p_cb: mem::MaybeUninit::<[Codebook; 5]> = mem::MaybeUninit::uninit(); - for i in 0..5 { + let dc_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP30_DC_CODES[i], &VP30_DC_BITS[i], map_idx); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*udc_cb.as_mut_ptr())[i], cb); + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); + let ac_i_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP30_AC_INTRA_CODES[i], &VP30_AC_INTRA_BITS[i], map_idx); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*uac_i_cb.as_mut_ptr())[i], cb); + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); + let ac_p_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP30_AC_INTER_CODES[i], &VP30_AC_INTER_BITS[i], map_idx); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*uac_p_cb.as_mut_ptr())[i], cb); - } - dc_cb = udc_cb.assume_init(); - ac_i_cb = uac_i_cb.assume_init(); - ac_p_cb = uac_p_cb.assume_init(); - } + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); + let mut cr = TableCodebookDescReader::new(&VP30_MBTYPE_CODES, &VP30_MBTYPE_BITS, |idx| VP30_MBTYPE_SYMS[idx]); + let mbtype_cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); Self { dc_cb, ac_i_cb, ac_p_cb, mbtype_cb } } } @@ -66,79 +51,39 @@ struct VP31Codes { impl VP31Codes { fn new() -> Self { - let dc_cb; - let ac0_cb; - let ac1_cb; - let ac2_cb; - let ac3_cb; - unsafe { - let mut udc_cb: mem::MaybeUninit::<[Codebook; 16]> = mem::MaybeUninit::uninit(); - let mut uac0_cb: mem::MaybeUninit::<[Codebook; 16]> = mem::MaybeUninit::uninit(); - let mut uac1_cb: mem::MaybeUninit::<[Codebook; 16]> = mem::MaybeUninit::uninit(); - let mut uac2_cb: mem::MaybeUninit::<[Codebook; 16]> = mem::MaybeUninit::uninit(); - let mut uac3_cb: mem::MaybeUninit::<[Codebook; 16]> = mem::MaybeUninit::uninit(); - for i in 0..16 { + let dc_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP31_DC_CODES[i], &VP31_DC_BITS[i], map_idx); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*udc_cb.as_mut_ptr())[i], cb); - + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); + let ac0_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP31_AC_CAT0_CODES[i], &VP31_AC_CAT0_BITS[i], map_idx); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*uac0_cb.as_mut_ptr())[i], cb); + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); + let ac1_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP31_AC_CAT1_CODES[i], &VP31_AC_CAT1_BITS[i], map_idx); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*uac1_cb.as_mut_ptr())[i], cb); + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); + let ac2_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP31_AC_CAT2_CODES[i], &VP31_AC_CAT2_BITS[i], map_idx); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*uac2_cb.as_mut_ptr())[i], cb); + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); + let ac3_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP31_AC_CAT3_CODES[i], &VP31_AC_CAT3_BITS[i], map_idx); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*uac3_cb.as_mut_ptr())[i], cb); - } - dc_cb = udc_cb.assume_init(); - ac0_cb = uac0_cb.assume_init(); - ac1_cb = uac1_cb.assume_init(); - ac2_cb = uac2_cb.assume_init(); - ac3_cb = uac3_cb.assume_init(); - } + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); Self { dc_cb, ac0_cb, ac1_cb, ac2_cb, ac3_cb } } fn new_vp4() -> VP31Codes { - let dc_cb; - let ac0_cb; - let ac1_cb; - let ac2_cb; - let ac3_cb; - unsafe { - let mut udc_cb: mem::MaybeUninit::<[Codebook; 16]> = mem::MaybeUninit::uninit(); - let mut uac0_cb: mem::MaybeUninit::<[Codebook; 16]> = mem::MaybeUninit::uninit(); - let mut uac1_cb: mem::MaybeUninit::<[Codebook; 16]> = mem::MaybeUninit::uninit(); - let mut uac2_cb: mem::MaybeUninit::<[Codebook; 16]> = mem::MaybeUninit::uninit(); - let mut uac3_cb: mem::MaybeUninit::<[Codebook; 16]> = mem::MaybeUninit::uninit(); - for i in 0..16 { + let dc_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP40_DC_CODES[i], &VP40_DC_BITS[i], map_idx); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*udc_cb.as_mut_ptr())[i], cb); - + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); + let ac0_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP40_AC_CAT0_CODES[i], &VP40_AC_CAT0_BITS[i], map_idx); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*uac0_cb.as_mut_ptr())[i], cb); + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); + let ac1_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP40_AC_CAT1_CODES[i], &VP40_AC_CAT1_BITS[i], map_idx); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*uac1_cb.as_mut_ptr())[i], cb); + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); + let ac2_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP40_AC_CAT2_CODES[i], &VP40_AC_CAT2_BITS[i], map_idx); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*uac2_cb.as_mut_ptr())[i], cb); + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); + let ac3_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP40_AC_CAT3_CODES[i], &VP40_AC_CAT3_BITS[i], map_idx); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*uac3_cb.as_mut_ptr())[i], cb); - } - dc_cb = udc_cb.assume_init(); - ac0_cb = uac0_cb.assume_init(); - ac1_cb = uac1_cb.assume_init(); - ac2_cb = uac2_cb.assume_init(); - ac3_cb = uac3_cb.assume_init(); - } + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); VP31Codes { dc_cb, ac0_cb, ac1_cb, ac2_cb, ac3_cb } } } @@ -155,22 +100,12 @@ fn map_mv(idx: usize) -> i8 { impl VP40AuxCodes { fn new() -> Self { - let mv_x_cb; - let mv_y_cb; - unsafe { - let mut umv_x_cb: mem::MaybeUninit::<[Codebook; 7]> = mem::MaybeUninit::uninit(); - let mut umv_y_cb: mem::MaybeUninit::<[Codebook; 7]> = mem::MaybeUninit::uninit(); - for i in 0..7 { + let mv_x_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP40_MV_X_CODES[i], &VP40_MV_X_BITS[i], map_mv); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*umv_x_cb.as_mut_ptr())[i], cb); + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); + let mv_y_cb = std::array::from_fn(|i| { let mut cr = TableCodebookDescReader::new(&VP40_MV_Y_CODES[i], &VP40_MV_Y_BITS[i], map_mv); - let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); - ptr::write(&mut (*umv_y_cb.as_mut_ptr())[i], cb); - } - mv_x_cb = umv_x_cb.assume_init(); - mv_y_cb = umv_y_cb.assume_init(); - } + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() }); let mut cr0 = TableCodebookDescReader::new(&VP40_MBPAT_CODES[0], &VP40_MBPAT_BITS[0], map_idx); let mut cr1 = TableCodebookDescReader::new(&VP40_MBPAT_CODES[1], &VP40_MBPAT_BITS[1], map_idx); let mbpat_cb = [Codebook::new(&mut cr0, CodebookMode::MSB).unwrap(), diff --git a/nihav-indeo/src/codecs/imc.rs b/nihav-indeo/src/codecs/imc.rs index d44cd27..3a9d6af 100644 --- a/nihav-indeo/src/codecs/imc.rs +++ b/nihav-indeo/src/codecs/imc.rs @@ -1,5 +1,3 @@ -use std::mem; -use std::ptr; use std::f32::consts; use nihav_core::formats::*; @@ -359,16 +357,11 @@ impl IMCDecoder { weights1.copy_from_slice(&IMC_WEIGHTS1); weights2.copy_from_slice(&IMC_WEIGHTS2); } - let codes = unsafe { - let mut ucodes: mem::MaybeUninit::<[[Codebook; 4]; 4]> = mem::MaybeUninit::uninit(); - for i in 0..4 { - for j in 0..4 { - let mut cr = IMCCodeReader::new(i, j); - ptr::write(&mut (*ucodes.as_mut_ptr())[i][j], Codebook::new(&mut cr, CodebookMode::MSB).unwrap()); - } - } - ucodes.assume_init() - }; + let codes = std::array::from_fn(|i| + std::array::from_fn(|j| { + let mut cr = IMCCodeReader::new(i, j); + Codebook::new(&mut cr, CodebookMode::MSB).unwrap() + })); IMCDecoder { is_imc, chmap: NAChannelMap::new(), diff --git a/nihav-mpeg/src/codecs/aac/coeff_read.rs b/nihav-mpeg/src/codecs/aac/coeff_read.rs index cbd2566..5fa058e 100644 --- a/nihav-mpeg/src/codecs/aac/coeff_read.rs +++ b/nihav-mpeg/src/codecs/aac/coeff_read.rs @@ -2,8 +2,6 @@ use nihav_core::codecs::{DecoderResult, DecoderError}; use nihav_core::io::bitreader::*; use nihav_core::io::codebook::*; use nihav_core::io::intcode::*; -use std::mem; -use std::ptr; use super::{INTENSITY_SCALE_MIN, MAX_WINDOWS, MAX_SFBS, GASubbandInfo, ICSInfo}; use super::tables::CBRT_TAB; @@ -26,14 +24,9 @@ impl Codebooks { pub fn new() -> Self { let mut coderead = TableCodebookDescReader::new(AAC_SCF_CODEBOOK_CODES, AAC_SCF_CODEBOOK_BITS, scale_map); let scale_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); - let spec_cb = unsafe { - let mut uspec_cb: mem::MaybeUninit::<[Codebook; 11]> = mem::MaybeUninit::uninit(); - for i in 0..AAC_SPEC_CODES.len() { - let mut coderead = TableCodebookDescReader::new(AAC_SPEC_CODES[i], AAC_SPEC_BITS[i], |idx| idx as u16); - ptr::write(&mut (*uspec_cb.as_mut_ptr())[i], Codebook::new(&mut coderead, CodebookMode::MSB).unwrap()); - } - uspec_cb.assume_init() - }; + let spec_cb = std::array::from_fn(|i| { + let mut coderead = TableCodebookDescReader::new(AAC_SPEC_CODES[i], AAC_SPEC_BITS[i], |idx| idx as u16); + Codebook::new(&mut coderead, CodebookMode::MSB).unwrap() }); Self { scale_cb, spec_cb } } } diff --git a/nihav-rad/src/codecs/binkvid.rs b/nihav-rad/src/codecs/binkvid.rs index eeeb517..bd2cfb5 100644 --- a/nihav-rad/src/codecs/binkvid.rs +++ b/nihav-rad/src/codecs/binkvid.rs @@ -385,14 +385,9 @@ struct BinkTrees { impl Default for BinkTrees { fn default() -> Self { - let cb = unsafe { - let mut ucb: std::mem::MaybeUninit::<[Codebook; 16]> = std::mem::MaybeUninit::uninit(); - for i in 0..16 { - let mut cr = TableCodebookDescReader::new(&BINK_TREE_CODES[i], &BINK_TREE_BITS[i], |idx| idx as u8); - std::ptr::write(&mut (*ucb.as_mut_ptr())[i], Codebook::new(&mut cr, CodebookMode::LSB).unwrap()); - } - ucb.assume_init() - }; + let cb = std::array::from_fn(|i| { + let mut cr = TableCodebookDescReader::new(&BINK_TREE_CODES[i], &BINK_TREE_BITS[i], |idx| idx as u8); + Codebook::new(&mut cr, CodebookMode::LSB).unwrap() }); Self { cb } } }