X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp6.rs;h=ca8946f5ad4d7032259c499c05dd875d3305b547;hp=9d72d1f21572984816dbb5d8755365d6433e3cda;hb=b7c882c1ce6f86c07c2340751200e3a060942826;hpb=adb9c3d423a15f4fad625f294b664b89100cd4b0 diff --git a/nihav-duck/src/codecs/vp6.rs b/nihav-duck/src/codecs/vp6.rs index 9d72d1f..ca8946f 100644 --- a/nihav-duck/src/codecs/vp6.rs +++ b/nihav-duck/src/codecs/vp6.rs @@ -1,6 +1,7 @@ use nihav_core::codecs::*; use nihav_core::io::bitreader::*; -use nihav_core::codecs::blockdsp::edge_emu; +use nihav_codec_support::codecs::{MV, ZIGZAG}; +use nihav_codec_support::codecs::blockdsp::edge_emu; use super::vpcommon::*; use super::vp56::*; @@ -36,7 +37,7 @@ impl VP56Parser for VP6BR { let mut hdr = VP56Header::default(); // horrible hack to match VP6 header parsing let src = bc.src; - let mut br = BitReader::new(src, src.len(), BitReaderMode::BE); + let mut br = BitReader::new(src, BitReaderMode::BE); hdr.is_intra = !br.read_bool()?; hdr.is_golden = hdr.is_intra; @@ -360,7 +361,7 @@ impl VP56Parser for VP6BR { (mv.x >> 3, mv.y >> 3, mv.x & 7, mv.y & 7, mv.x / 8, mv.y / 8) }; let tmp_blk = mc_buf.get_data_mut().unwrap(); - get_block(tmp_blk, 16, src.clone(), plane, x, y, sx, sy); + get_block(tmp_blk, 16, src, plane, x, y, sx, sy); if (msx & 7) != 0 { let foff = (8 - (sx & 7)) as usize; let off = 2 + foff; @@ -394,7 +395,7 @@ impl VP56Parser for VP6BR { if copy_mode { let src = &tmp_blk[2 * 16 + 2..]; for (dline, sline) in dbuf.chunks_mut(dst.stride[plane]).zip(src.chunks(16)).take(8) { - for i in 0..8 { dline[i] = sline[i]; } + dline[..8].copy_from_slice(&sline[..8]); } } else if bicubic { let coeff_h = &VP6_BICUBIC_COEFFS[self.filter_alpha][mx as usize]; @@ -498,9 +499,9 @@ fn decode_token_huff(br: &mut BitReader, huff: &VP6Huff) -> DecoderResult<(i16, 0 => Ok((0, false)), 1 | 2 | 3 | 4 => { if !br.read_bool()? { - Ok((tok as i16, false)) + Ok((i16::from(tok), false)) } else { - Ok((-(tok as i16), false)) + Ok((-i16::from(tok), false)) } }, 5 | 6 | 7 | 8 | 9 | 10 => { @@ -545,7 +546,7 @@ fn decode_zero_run_huff(br: &mut BitReader, huff: &VP6Huff) -> DecoderResult, comp: usize, dx: usize, dy: usize, mv_x: i16, mv_y: i16) { @@ -556,7 +557,7 @@ fn get_block(dst: &mut [u8], dstride: usize, src: NAVideoBufferRef, comp: us if (sx - 2 < 0) || (sx + 8 + 2 > (w as isize)) || (sy - 2 < 0) || (sy + 8 + 2 > (h as isize)) { edge_emu(&src, sx - 2, sy - 2, 8 + 2 + 2, 8 + 2 + 2, - dst, dstride, comp); + dst, dstride, comp, 0); } else { let sstride = src.get_stride(comp); let soff = src.get_offset(comp); @@ -565,9 +566,7 @@ fn get_block(dst: &mut [u8], dstride: usize, src: NAVideoBufferRef, comp: us let saddr = soff + ((sx - 2) as usize) + ((sy - 2) as usize) * sstride; let src = &sbuf[saddr..]; for (dline, sline) in dst.chunks_mut(dstride).zip(src.chunks(sstride)).take(12) { - for i in 0..12 { - dline[i] = sline[i]; - } + dline[..12].copy_from_slice(&sline[..12]); } } } @@ -577,7 +576,7 @@ fn calc_variance(src: &[u8], stride: usize) -> u16 { let mut ssum = 0; for line in src.chunks(stride * 2).take(4) { for el in line.iter().take(8).step_by(2) { - let pix = *el as u32; + let pix = u32::from(*el); sum += pix; ssum += pix * pix; } @@ -587,13 +586,13 @@ fn calc_variance(src: &[u8], stride: usize) -> u16 { macro_rules! mc_filter { (bilinear; $a: expr, $b: expr, $c: expr) => { - ((($a as u16) * (8 - $c) + ($b as u16) * $c + 4) >> 3) as u8 + ((u16::from($a) * (8 - $c) + u16::from($b) * $c + 4) >> 3) as u8 }; (bicubic; $src: expr, $off: expr, $step: expr, $coeffs: expr) => { - ((($src[$off - $step] as i32) * ($coeffs[0] as i32) + - ($src[$off] as i32) * ($coeffs[1] as i32) + - ($src[$off + $step] as i32) * ($coeffs[2] as i32) + - ($src[$off + $step * 2] as i32) * ($coeffs[3] as i32) + 64) >> 7).min(255).max(0) as u8 + ((i32::from($src[$off - $step] ) * i32::from($coeffs[0]) + + i32::from($src[$off] ) * i32::from($coeffs[1]) + + i32::from($src[$off + $step] ) * i32::from($coeffs[2]) + + i32::from($src[$off + $step * 2]) * i32::from($coeffs[3]) + 64) >> 7).min(255).max(0) as u8 } } @@ -630,6 +629,7 @@ fn mc_bilinear(dst: &mut [u8], dstride: usize, src: &[u8], mut soff: usize, sstr } } +#[allow(clippy::trivially_copy_pass_by_ref)] fn mc_bicubic(dst: &mut [u8], dstride: usize, src: &[u8], mut soff: usize, sstride: usize, coeffs_w: &[i16; 4], coeffs_h: &[i16; 4]) { if coeffs_h[1] == 128 { for dline in dst.chunks_mut(dstride).take(8) { @@ -688,16 +688,10 @@ impl NADecoder for VP6Decoder { let fmt = if !self.has_alpha { YUV420_FORMAT } else { - NAPixelFormaton::new(ColorModel::YUV(YUVSubmodel::YUVJ), - Some(NAPixelChromaton::new(0, 0, false, 8, 0, 0, 1)), - Some(NAPixelChromaton::new(1, 1, false, 8, 0, 1, 1)), - Some(NAPixelChromaton::new(1, 1, false, 8, 0, 2, 1)), - Some(NAPixelChromaton::new(0, 0, false, 8, 0, 3, 1)), - None, - 0, 4) + VP_YUVA420_FORMAT }; let myvinfo = NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), false, fmt); - let myinfo = NACodecTypeInfo::Video(myvinfo.clone()); + let myinfo = NACodecTypeInfo::Video(myvinfo); self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref(); self.dec.init(supp, myvinfo)?; Ok(()) @@ -720,11 +714,17 @@ impl NADecoder for VP6Decoder { } } -pub fn get_decoder_vp6() -> Box { +impl NAOptionHandler for VP6Decoder { + 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_vp6() -> Box { Box::new(VP6Decoder::new(false)) } -pub fn get_decoder_vp6_alpha() -> Box { +pub fn get_decoder_vp6_alpha() -> Box { Box::new(VP6Decoder::new(true)) } @@ -732,27 +732,37 @@ pub fn get_decoder_vp6_alpha() -> 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_vp6() { 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); - - //let file = "assets/Duck/predator2_vp60.avi"; - //let file = "assets/Duck/predator2_vp61.avi"; - //let file = "assets/Duck/vp6_crash.avi"; - let file = "assets/Duck/vp6_interlaced.avi"; - //let file = "assets/Duck/vp6_vid.avi"; - //let file = "assets/Duck/selection_720x576_300kBit_vp60i.avi"; - //let file = "assets/Duck/selection_720x576_300kBit_flipped_vp60i.avi"; - test_file_decoding("avi", file, Some(17), true, false, None/*Some("vp6")*/, &dmx_reg, &dec_reg); -//panic!("end"); + duck_register_all_decoders(&mut dec_reg); + + test_decoding("avi", "vp6", "assets/Duck/selection_720x576_300kBit_vp60i.avi", Some(16), + &dmx_reg, &dec_reg, + ExpectedTestResult::MD5([0x042c3e96, 0x8a9b26a2, 0x4dcbaf66, 0x1b788d03])); + } + #[test] + fn test_vp6_huff() { + let mut dmx_reg = RegisteredDemuxers::new(); + generic_register_all_demuxers(&mut dmx_reg); + let mut dec_reg = RegisteredDecoders::new(); + duck_register_all_decoders(&mut dec_reg); + + test_decoding("avi", "vp6", "assets/Duck/vp6_crash.avi", Some(4), + &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ + [0xdcd70fa0, 0x0d075ce2, 0xc9e65077, 0xb003a92e], + [0x334abf96, 0x3a004c7a, 0x5781cd5c, 0x25c3ae5c], + [0x6164b851, 0x528cd8de, 0xecab7328, 0x4b49708a], + [0x11b048ac, 0xedb3e471, 0xd04e9399, 0x64e623e3], + [0x182871b1, 0x2146893a, 0x2912210e, 0x6dd592e8]])); } + // todo find good sample for vp6a test } const VP6_AC_PROBS: [[[[u8; 11]; 6]; 2]; 3] = [