X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp3.rs;h=08bfd1a97f58de69693c930025f6d7ac0ca307e6;hb=e6aaad5c5273cd814b5748b7faf3751835a37217;hp=ccb0262a38405d7c8585449451c30d1352ed6e94;hpb=b8f7343a54df054ed8a0f1d81500af81a404ea3b;p=nihav.git diff --git a/nihav-duck/src/codecs/vp3.rs b/nihav-duck/src/codecs/vp3.rs index ccb0262..08bfd1a 100644 --- a/nihav-duck/src/codecs/vp3.rs +++ b/nihav-duck/src/codecs/vp3.rs @@ -1,7 +1,8 @@ use std::mem; use std::ptr; use nihav_core::codecs::*; -use nihav_core::codecs::blockdsp::*; +use nihav_codec_support::codecs::{MV, ZERO_MV, ZIGZAG}; +use nihav_codec_support::codecs::blockdsp::*; use nihav_core::io::bitreader::*; use nihav_core::io::codebook::*; use nihav_core::io::intcode::*; @@ -31,26 +32,29 @@ fn map_mbt(idx: usize) -> VPMBType { impl VP30Codes { fn new() -> Self { - let mut dc_cb: [Codebook; 5]; - let mut ac_i_cb: [Codebook; 5]; - let mut ac_p_cb: [Codebook; 5]; + let dc_cb; + let ac_i_cb; + let ac_p_cb; let mut cr = TableCodebookDescReader::new(&VP30_MBTYPE_CODES, &VP30_MBTYPE_BITS, map_mbt); let mbtype_cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap(); unsafe { - dc_cb = mem::uninitialized(); - ac_i_cb = mem::uninitialized(); - ac_p_cb = mem::uninitialized(); + 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 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 dc_cb[i], cb); + ptr::write(&mut (*udc_cb.as_mut_ptr())[i], cb); 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 ac_i_cb[i], cb); + ptr::write(&mut (*uac_i_cb.as_mut_ptr())[i], cb); 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 ac_p_cb[i], cb); + 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(); } Self { dc_cb, ac_i_cb, ac_p_cb, mbtype_cb } } @@ -66,68 +70,78 @@ struct VP31Codes { impl VP31Codes { fn new() -> Self { - let mut dc_cb: [Codebook; 16]; - let mut ac0_cb: [Codebook; 16]; - let mut ac1_cb: [Codebook; 16]; - let mut ac2_cb: [Codebook; 16]; - let mut ac3_cb: [Codebook; 16]; + let dc_cb; + let ac0_cb; + let ac1_cb; + let ac2_cb; + let ac3_cb; unsafe { - dc_cb = mem::uninitialized(); - ac0_cb = mem::uninitialized(); - ac1_cb = mem::uninitialized(); - ac2_cb = mem::uninitialized(); - ac3_cb = mem::uninitialized(); + 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 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 dc_cb[i], cb); + ptr::write(&mut (*udc_cb.as_mut_ptr())[i], cb); 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 ac0_cb[i], cb); + ptr::write(&mut (*uac0_cb.as_mut_ptr())[i], cb); 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 ac1_cb[i], cb); + ptr::write(&mut (*uac1_cb.as_mut_ptr())[i], cb); 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 ac2_cb[i], cb); + ptr::write(&mut (*uac2_cb.as_mut_ptr())[i], cb); 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 ac3_cb[i], cb); + 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(); } Self { dc_cb, ac0_cb, ac1_cb, ac2_cb, ac3_cb } } fn new_vp4() -> VP31Codes { - let mut dc_cb: [Codebook; 16]; - let mut ac0_cb: [Codebook; 16]; - let mut ac1_cb: [Codebook; 16]; - let mut ac2_cb: [Codebook; 16]; - let mut ac3_cb: [Codebook; 16]; + let dc_cb; + let ac0_cb; + let ac1_cb; + let ac2_cb; + let ac3_cb; unsafe { - dc_cb = mem::uninitialized(); - ac0_cb = mem::uninitialized(); - ac1_cb = mem::uninitialized(); - ac2_cb = mem::uninitialized(); - ac3_cb = mem::uninitialized(); + 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 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 dc_cb[i], cb); + ptr::write(&mut (*udc_cb.as_mut_ptr())[i], cb); 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 ac0_cb[i], cb); + ptr::write(&mut (*uac0_cb.as_mut_ptr())[i], cb); 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 ac1_cb[i], cb); + ptr::write(&mut (*uac1_cb.as_mut_ptr())[i], cb); 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 ac2_cb[i], cb); + ptr::write(&mut (*uac2_cb.as_mut_ptr())[i], cb); 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 ac3_cb[i], cb); + 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(); } VP31Codes { dc_cb, ac0_cb, ac1_cb, ac2_cb, ac3_cb } } @@ -145,19 +159,21 @@ fn map_mv(idx: usize) -> i8 { impl VP40AuxCodes { fn new() -> Self { - let mut mv_x_cb: [Codebook; 7]; - let mut mv_y_cb: [Codebook; 7]; + let mv_x_cb; + let mv_y_cb; unsafe { - mv_x_cb = mem::uninitialized(); - mv_y_cb = mem::uninitialized(); + 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 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 mv_x_cb[i], cb); + ptr::write(&mut (*umv_x_cb.as_mut_ptr())[i], cb); 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 mv_y_cb[i], cb); + 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(); } 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); @@ -167,6 +183,7 @@ impl VP40AuxCodes { } } +#[allow(clippy::large_enum_variant)] enum Codes { None, VP30(VP30Codes), @@ -243,7 +260,7 @@ impl BitRunDecoder { self.run = (self.read_run)(br)?; } self.run -= 1; - Ok(self.value) + Ok(self.value) } } @@ -289,7 +306,7 @@ fn vp30_read_coded_run1(br: &mut BitReader) -> DecoderResult { let idx = br.peek(5) as usize; let sym = (VP30_CRUN1_LUT[idx] >> 4) as usize; let bits = VP30_CRUN1_LUT[idx] & 0xF; - br.skip(bits as u32)?; + br.skip(u32::from(bits))?; if sym < 7 { Ok(sym) } else if sym == 7 { @@ -545,7 +562,7 @@ fn expand_token(blk: &mut Block, br: &mut BitReader, eob_run: &mut usize, token: macro_rules! fill_dc_pred { ($self: expr, $ref_id: expr, $pred: expr, $pp: expr, $bit: expr, $idx: expr) => { if $self.blocks[$idx].coded && $self.blocks[$idx].btype.get_ref_id() == $ref_id { - $pred[$bit] = $self.blocks[$idx].coeffs[0] as i32; + $pred[$bit] = i32::from($self.blocks[$idx].coeffs[0]); $pp |= 1 << $bit; } }; @@ -1108,7 +1125,7 @@ impl VP34Decoder { cur_blk += 1; } } - } + } } Ok(()) } else { @@ -1124,19 +1141,19 @@ impl VP34Decoder { if let Some(ref codes) = self.aux_codes { for _ in 0..self.y_blocks/4 { if self.blocks[self.blk_addr[cur_blk] >> 2].btype == VPMBType::InterFourMV { - let x_cb = &codes.mv_x_cb[VP40_MV_LUT_INDEX[last_mv.x.abs() as usize]]; - let y_cb = &codes.mv_y_cb[VP40_MV_LUT_INDEX[last_mv.y.abs() as usize]]; + let x_cb = &codes.mv_x_cb[VP40_MV_LUT_INDEX[last_mv.x.unsigned_abs() as usize]]; + let y_cb = &codes.mv_y_cb[VP40_MV_LUT_INDEX[last_mv.y.unsigned_abs() as usize]]; let x_sign = last_mv.x < 0; let y_sign = last_mv.y < 0; last2_mv = last_mv; let saddr = (self.blk_addr[cur_blk] >> 2).min(self.blk_addr[cur_blk + 1] >> 2).min(self.blk_addr[cur_blk + 2] >> 2).min(self.blk_addr[cur_blk + 3] >> 2); for i in 0..4 { let blk = &mut self.blocks[saddr + (i & 1) + (i >> 1) * self.mb_w * 2]; - blk.mv.x = br.read_cb(x_cb)? as i16; + blk.mv.x = i16::from(br.read_cb(x_cb)?); if x_sign { blk.mv.x = -blk.mv.x; } - blk.mv.y = br.read_cb(y_cb)? as i16; + blk.mv.y = i16::from(br.read_cb(y_cb)?); if y_sign { blk.mv.y = -blk.mv.y; } @@ -1150,12 +1167,12 @@ impl VP34Decoder { cur_mv = ZERO_MV; }, VPMBType::InterMV => { - let x_cb = &codes.mv_x_cb[VP40_MV_LUT_INDEX[last_mv.x.abs() as usize]]; - let y_cb = &codes.mv_y_cb[VP40_MV_LUT_INDEX[last_mv.y.abs() as usize]]; + let x_cb = &codes.mv_x_cb[VP40_MV_LUT_INDEX[last_mv.x.unsigned_abs() as usize]]; + let y_cb = &codes.mv_y_cb[VP40_MV_LUT_INDEX[last_mv.y.unsigned_abs() as usize]]; let x_sign = last_mv.x < 0; let y_sign = last_mv.y < 0; - let x = br.read_cb(x_cb)? as i16; - let y = br.read_cb(y_cb)? as i16; + let x = i16::from(br.read_cb(x_cb)?); + let y = i16::from(br.read_cb(y_cb)?); cur_mv = MV { x: if !x_sign { x } else { -x }, y: if !y_sign { y } else { -y } }; last2_mv = last_mv; last_mv = cur_mv; @@ -1168,12 +1185,12 @@ impl VP34Decoder { std::mem::swap(&mut last_mv, &mut last2_mv); }, _ => { // GoldenMV - let x_cb = &codes.mv_x_cb[VP40_MV_LUT_INDEX[last_mv_g.x.abs() as usize]]; - let y_cb = &codes.mv_y_cb[VP40_MV_LUT_INDEX[last_mv_g.y.abs() as usize]]; + let x_cb = &codes.mv_x_cb[VP40_MV_LUT_INDEX[last_mv_g.x.unsigned_abs() as usize]]; + let y_cb = &codes.mv_y_cb[VP40_MV_LUT_INDEX[last_mv_g.y.unsigned_abs() as usize]]; let x_sign = last_mv_g.x < 0; let y_sign = last_mv_g.y < 0; - let x = br.read_cb(x_cb)? as i16; - let y = br.read_cb(y_cb)? as i16; + let x = i16::from(br.read_cb(x_cb)?); + let y = i16::from(br.read_cb(y_cb)?); cur_mv = MV { x: if !x_sign { x } else { -x }, y: if !y_sign { y } else { -y } }; last_mv_g = cur_mv; }, @@ -1449,10 +1466,10 @@ impl VP34Decoder { let mut pred = 0i32; for i in 0..4 { if (pp & (1 << i)) != 0 { - pred += (preds[i] as i32) * (VP31_DC_WEIGHTS[pp][i] as i32); + pred += preds[i] * i32::from(VP31_DC_WEIGHTS[pp][i]); } } - pred /= VP31_DC_WEIGHTS[pp][4] as i32; + pred /= i32::from(VP31_DC_WEIGHTS[pp][4]); if (pp & 7) == 7 { if (pred - preds[2]).abs() > 128 { return preds[2] as i16; } if (pred - preds[0]).abs() > 128 { return preds[0] as i16; } @@ -1484,7 +1501,7 @@ impl VP34Decoder { let mut npred = 0; for i in 0..4 { if (pp & (1 << i)) != 0 { - pred += preds[i] as i32; + pred += preds[i]; npred += 1; if npred == 2 { return (pred / 2) as i16; @@ -1551,6 +1568,7 @@ impl VP34Decoder { } } } + #[allow(clippy::cognitive_complexity)] fn output_blocks_inter(&mut self, frm: &mut NASimpleVideoFrame) { let mut blk_idx = 0; let bstride = self.mb_w * 2; @@ -1824,7 +1842,7 @@ impl NADecoder for VP34Decoder { fn decode(&mut self, supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let src = pkt.get_buffer(); validate!(src.len() > 0); - let mut br = BitReader::new(&src, src.len(), BitReaderMode::BE); + let mut br = BitReader::new(&src, BitReaderMode::BE); self.parse_header(&mut br)?; if self.is_intra { @@ -1863,11 +1881,17 @@ impl NADecoder for VP34Decoder { } } -pub fn get_decoder_vp3() -> Box { +impl NAOptionHandler for VP34Decoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } +} + +pub fn get_decoder_vp3() -> Box { Box::new(VP34Decoder::new(3)) } -pub fn get_decoder_vp4() -> Box { +pub fn get_decoder_vp4() -> Box { Box::new(VP34Decoder::new(4)) } @@ -1875,17 +1899,18 @@ pub fn get_decoder_vp4() -> Box { mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; - use nihav_core::test::dec_video::*; - use crate::codecs::duck_register_all_codecs; - use nihav_commonfmt::demuxers::generic_register_all_demuxers; + use nihav_codec_support::test::dec_video::*; + use crate::duck_register_all_decoders; + use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_vp30() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); + // sample: https://samples.mplayerhq.hu/V-codecs/VP3/vp30-logo.avi test_decoding("avi", "vp3", "assets/Duck/vp30-logo.avi", Some(23), &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x51aba7df, 0x6e42534d, 0xef6c5b13, 0x26c38d1f])); } @@ -1895,13 +1920,14 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); // let file = "assets/Duck/vp31.avi"; // let file = "assets/Duck/vp31_crash.avi"; // let file = "assets/Duck/01-vp31-0500.avi"; // test_file_decoding("avi", file, Some(3), true, false, None/*Some("vp31")*/, &dmx_reg, &dec_reg); //panic!("end"); + // sample: https://samples.mplayerhq.hu/V-codecs/VP3/01-vp31-0500.avi test_decoding("avi", "vp3", "assets/Duck/01-vp31-0500.avi", Some(16), &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x65112f7e, 0x2914f29b, 0x2908ed2f, 0xce5fc8c5])); } @@ -1911,8 +1937,9 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); + // sample: https://samples.mplayerhq.hu/V-codecs/VP4/ot171_vp40.avi test_decoding("avi", "vp3", "assets/Duck/ot171_vp40.avi", Some(86), &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xd41d8cd9, 0x8f00b204, 0xe9800998, 0xecf8427e])); }