X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp3.rs;h=d25d27f9480d2e2d626e1620ab7c2410167140c2;hb=3584b223ce417fe167dc90cb9a40e173f34823c0;hp=487c671dd00bfdab01867cccd644dfbab2f51dd6;hpb=64e8b9711a54641d4155d01f095053233c79a9bf;p=nihav.git diff --git a/nihav-duck/src/codecs/vp3.rs b/nihav-duck/src/codecs/vp3.rs index 487c671..d25d27f 100644 --- a/nihav-duck/src/codecs/vp3.rs +++ b/nihav-duck/src/codecs/vp3.rs @@ -542,55 +542,6 @@ macro_rules! fill_dc_pred { }; } -fn vp3_interp00(dst: &mut [u8], dstride: usize, src: &[u8], sstride: usize, bw: usize, bh: usize) -{ - let mut didx = 0; - let mut sidx = 0; - for _ in 0..bh { - for x in 0..bw { dst[didx + x] = src[sidx + x]; } - didx += dstride; - sidx += sstride; - } -} - -fn vp3_interp01(dst: &mut [u8], dstride: usize, src: &[u8], sstride: usize, bw: usize, bh: usize) -{ - let mut didx = 0; - let mut sidx = 0; - for _ in 0..bh { - for x in 0..bw { dst[didx + x] = (((src[sidx + x] as u16) + (src[sidx + x + 1] as u16)) >> 1) as u8; } - didx += dstride; - sidx += sstride; - } -} - -fn vp3_interp10(dst: &mut [u8], dstride: usize, src: &[u8], sstride: usize, bw: usize, bh: usize) -{ - let mut didx = 0; - let mut sidx = 0; - for _ in 0..bh { - for x in 0..bw { dst[didx + x] = (((src[sidx + x] as u16) + (src[sidx + x + sstride] as u16)) >> 1) as u8; } - didx += dstride; - sidx += sstride; - } -} - -fn vp3_interp11(dst: &mut [u8], dstride: usize, src: &[u8], sstride: usize, bw: usize, bh: usize) -{ - let mut didx = 0; - let mut sidx = 0; - for _ in 0..bh { - for x in 0..bw { - dst[didx + x] = (((src[sidx + x] as u16) + - (src[sidx + x + 1] as u16) + - (src[sidx + x + sstride] as u16) + - (src[sidx + x + sstride + 1] as u16)) >> 2) as u8; - } - didx += dstride; - sidx += sstride; - } -} - fn vp31_loop_filter_v(frm: &mut NASimpleVideoFrame, x: usize, y: usize, plane: usize, loop_str: i16) { let off = frm.offset[plane] + x + y * frm.stride[plane]; vp31_loop_filter(frm.data, off, 1, frm.stride[plane], 8, loop_str); @@ -601,8 +552,6 @@ fn vp31_loop_filter_h(frm: &mut NASimpleVideoFrame, x: usize, y: usize, plan vp31_loop_filter(frm.data, off, frm.stride[plane], 1, 8, loop_str); } -pub const VP3_INTERP_FUNCS: &[blockdsp::BlkInterpFunc] = &[ vp3_interp00, vp3_interp01, vp3_interp10, vp3_interp11 ]; - impl VP34Decoder { fn new(version: u8) -> Self { let vt = alloc_video_buffer(NAVideoInfo::new(24, 24, false, YUV420_FORMAT), 4).unwrap();