X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-vivo%2Fsrc%2Fcodecs%2Fvivo.rs;h=9501751a53438629d6a29dcd00c88ba2e806af23;hb=e6978c9cae732fbfc41e9f004d4263519b5fb47f;hp=9c5b5d1ed1d9f0600ff8adbda6c0fc3fe6c65cfd;hpb=7d57ae2f680d7a1eba7af2ee831f305b2f0f9324;p=nihav.git diff --git a/nihav-vivo/src/codecs/vivo.rs b/nihav-vivo/src/codecs/vivo.rs index 9c5b5d1..9501751 100644 --- a/nihav-vivo/src/codecs/vivo.rs +++ b/nihav-vivo/src/codecs/vivo.rs @@ -4,8 +4,9 @@ use nihav_core::formats; use nihav_core::frame::*; use nihav_core::codecs::*; use nihav_codec_support::codecs::{MV, ZIGZAG}; +use nihav_codec_support::codecs::blockdsp; use nihav_codec_support::codecs::h263::*; -use nihav_codec_support::codecs::h263::code::H263BlockDSP; +use nihav_codec_support::codecs::h263::code::*; use nihav_codec_support::codecs::h263::decoder::*; use nihav_codec_support::codecs::h263::data::*; @@ -19,11 +20,240 @@ struct Tables { mv_cb: Codebook, } +struct VivoBlockDSP { + dct_tab: [[f64; 64]; 64], +} + +fn gen_coef(i: usize, j: usize) -> f64 { + if i == 0 { + 1.0 / 8.0f64.sqrt() + } else { + (((j as f64) + 0.5) * (i as f64) * std::f64::consts::PI / 8.0).cos() * 0.5 + } +} + +impl VivoBlockDSP { + fn new() -> Self { + let mut dct_tab = [[0.0; 64]; 64]; + for i in 0..8 { + for j in 0..8 { + for k in 0..8 { + for l in 0..8 { + let c0 = gen_coef(i, k); + let c1 = gen_coef(j, l); + let c = c0 * c1 * 64.0; + dct_tab[i * 8 + j][k * 8 + l] = c; + } + } + } + } + Self { + dct_tab + } + } +} + +#[allow(clippy::erasing_op)] +#[allow(clippy::identity_op)] +fn deblock_hor(buf: &mut [u8], stride: usize, off: usize, clip_tab: &[i16; 64]) { + for x in 0..8 { + let p1 = i16::from(buf[off - 2 * stride + x]); + let p0 = i16::from(buf[off - 1 * stride + x]); + let q0 = i16::from(buf[off + 0 * stride + x]); + let q1 = i16::from(buf[off + 1 * stride + x]); + let diff = (3 * (p1 - q1) + 8 * (q0 - p0)) >> 4; + if (diff != 0) && (diff > -32) && (diff < 32) { + let delta = clip_tab[(diff + 32) as usize]; + buf[off - 1 * stride + x] = (p0 + delta).max(0).min(255) as u8; + buf[off + 0 * stride + x] = (q0 - delta).max(0).min(255) as u8; + } + } +} + +#[allow(clippy::identity_op)] +fn deblock_ver(buf: &mut [u8], stride: usize, off: usize, clip_tab: &[i16; 64]) { + for y in 0..8 { + let p1 = i16::from(buf[off - 2 + y * stride]); + let p0 = i16::from(buf[off - 1 + y * stride]); + let q0 = i16::from(buf[off + 0 + y * stride]); + let q1 = i16::from(buf[off + 1 + y * stride]); + let diff = (3 * (p1 - q1) + 8 * (q0 - p0)) >> 4; + if (diff != 0) && (diff > -32) && (diff < 32) { + let delta = clip_tab[(diff + 32) as usize]; + buf[off - 1 + y * stride] = (p0 + delta).max(0).min(255) as u8; + buf[off + y * stride] = (q0 - delta).max(0).min(255) as u8; + } + } +} + +fn gen_clip_tab(clip_tab: &mut [i16; 64], q: u8) { + let q = i16::from(q); + *clip_tab = [0; 64]; + let lim = (q + 2) >> 1; + for i in 0..lim { + clip_tab[(32 - i) as usize] = -i; + clip_tab[(32 + i) as usize] = i; + } + for i in lim..q { + let val = q - i; + clip_tab[(32 - i) as usize] = -val; + clip_tab[(32 + i) as usize] = val; + } +} + +impl BlockDSP for VivoBlockDSP { + fn idct(&self, blk: &mut [i16; 64]) { + let mut tmp = [0i32; 64]; + for (i, &el) in blk.iter().enumerate() { + if el != 0 { + let cmat = self.dct_tab[i]; + for (dst, &src) in tmp.iter_mut().zip(cmat.iter()) { + *dst += (src * (el as f64)) as i32; + } + } + } + for (dst, &src) in blk.iter_mut().zip(tmp.iter()) { + *dst = ((src + 0x20) >> 6) as i16; + } + } + fn copy_blocks(&self, dst: &mut NAVideoBuffer, src: NAVideoBufferRef, xpos: usize, ypos: usize, mv: MV) { + let mode = ((mv.x & 1) + (mv.y & 1) * 2) as usize; + let cmode = (if (mv.x & 3) != 0 { 1 } else { 0 }) + (if (mv.y & 3) != 0 { 2 } else { 0 }); + + let mut dst = NASimpleVideoFrame::from_video_buf(dst).unwrap(); + + blockdsp::copy_block(&mut dst, src.clone(), 0, xpos, ypos, mv.x >> 1, mv.y >> 1, 16, 16, 0, 1, mode, H263_INTERP_FUNCS); + blockdsp::copy_block(&mut dst, src.clone(), 1, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_FUNCS); + blockdsp::copy_block(&mut dst, src.clone(), 2, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_FUNCS); + } + fn copy_blocks8x8(&self, dst: &mut NAVideoBuffer, src: NAVideoBufferRef, xpos: usize, ypos: usize, mvs: &[MV; 4]) { + let mut dst = NASimpleVideoFrame::from_video_buf(dst).unwrap(); + + for i in 0..4 { + let xadd = (i & 1) * 8; + let yadd = (i & 2) * 4; + let mode = ((mvs[i].x & 1) + (mvs[i].y & 1) * 2) as usize; + + blockdsp::copy_block(&mut dst, src.clone(), 0, xpos + xadd, ypos + yadd, mvs[i].x >> 1, mvs[i].y >> 1, 8, 8, 0, 1, mode, H263_INTERP_FUNCS); + } + + let sum_mv = mvs[0] + mvs[1] + mvs[2] + mvs[3]; + let cmx = (sum_mv.x >> 3) + H263_CHROMA_ROUND[(sum_mv.x & 0xF) as usize]; + let cmy = (sum_mv.y >> 3) + H263_CHROMA_ROUND[(sum_mv.y & 0xF) as usize]; + let mode = ((cmx & 1) + (cmy & 1) * 2) as usize; + for plane in 1..3 { + blockdsp::copy_block(&mut dst, src.clone(), plane, xpos >> 1, ypos >> 1, cmx >> 1, cmy >> 1, 8, 8, 0, 1, mode, H263_INTERP_FUNCS); + } + } + fn avg_blocks(&self, dst: &mut NAVideoBuffer, src: NAVideoBufferRef, xpos: usize, ypos: usize, mv: MV) { + let mode = ((mv.x & 1) + (mv.y & 1) * 2) as usize; + let cmode = (if (mv.x & 3) != 0 { 1 } else { 0 }) + (if (mv.y & 3) != 0 { 2 } else { 0 }); + + let mut dst = NASimpleVideoFrame::from_video_buf(dst).unwrap(); + + blockdsp::copy_block(&mut dst, src.clone(), 0, xpos, ypos, mv.x >> 1, mv.y >> 1, 16, 16, 0, 1, mode, H263_INTERP_AVG_FUNCS); + blockdsp::copy_block(&mut dst, src.clone(), 1, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_AVG_FUNCS); + blockdsp::copy_block(&mut dst, src.clone(), 2, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_AVG_FUNCS); + } + fn avg_blocks8x8(&self, dst: &mut NAVideoBuffer, src: NAVideoBufferRef, xpos: usize, ypos: usize, mvs: &[MV; 4]) { + let mut dst = NASimpleVideoFrame::from_video_buf(dst).unwrap(); + + for i in 0..4 { + let xadd = (i & 1) * 8; + let yadd = (i & 2) * 4; + let mode = ((mvs[i].x & 1) + (mvs[i].y & 1) * 2) as usize; + + blockdsp::copy_block(&mut dst, src.clone(), 0, xpos + xadd, ypos + yadd, mvs[i].x >> 1, mvs[i].y >> 1, 8, 8, 0, 1, mode, H263_INTERP_AVG_FUNCS); + } + + let sum_mv = mvs[0] + mvs[1] + mvs[2] + mvs[3]; + let cmx = (sum_mv.x >> 3) + H263_CHROMA_ROUND[(sum_mv.x & 0xF) as usize]; + let cmy = (sum_mv.y >> 3) + H263_CHROMA_ROUND[(sum_mv.y & 0xF) as usize]; + let mode = ((cmx & 1) + (cmy & 1) * 2) as usize; + for plane in 1..3 { + blockdsp::copy_block(&mut dst, src.clone(), plane, xpos >> 1, ypos >> 1, cmx >> 1, cmy >> 1, 8, 8, 0, 1, mode, H263_INTERP_AVG_FUNCS); + } + } + fn filter_row(&self, buf: &mut NAVideoBuffer, mb_y: usize, mb_w: usize, cbpi: &CBPInfo) { + let ystride = buf.get_stride(0); + let ustride = buf.get_stride(1); + let vstride = buf.get_stride(2); + let yoff = buf.get_offset(0) + mb_y * 16 * ystride; + let uoff = buf.get_offset(1) + mb_y * 8 * ustride; + let voff = buf.get_offset(2) + mb_y * 8 * vstride; + let buf = buf.get_data_mut().unwrap(); + + let mut clip_tab = [0i16; 64]; + let mut last_q = 0; + let mut off = yoff; + for mb_x in 0..mb_w { + let q = cbpi.get_q(mb_w + mb_x); + if q != last_q { + gen_clip_tab(&mut clip_tab, q); + last_q = q; + } + if mb_y != 0 { + deblock_hor(buf, ystride, off, &clip_tab); + deblock_hor(buf, ystride, off + 8, &clip_tab); + } + deblock_hor(buf, ystride, off + 8 * ystride, &clip_tab); + deblock_hor(buf, ystride, off + 8 * ystride + 8, &clip_tab); + off += 16; + } + let mut off = yoff; + for mb_x in 0..mb_w { + let q = cbpi.get_q(mb_w + mb_x); + if q != last_q { + gen_clip_tab(&mut clip_tab, q); + last_q = q; + } + if mb_y != 0 { + let qtop = cbpi.get_q(mb_x); + if qtop != last_q { + gen_clip_tab(&mut clip_tab, qtop); + last_q = qtop; + } + if mb_x != 0 { + deblock_ver(buf, ystride, off - 8 * ystride, &clip_tab); + } + deblock_ver(buf, ystride, off - 8 * ystride + 8, &clip_tab); + } + if mb_x != 0 { + deblock_ver(buf, ystride, off, &clip_tab); + deblock_ver(buf, ystride, off + 8, &clip_tab); + } + off += 16; + } + if mb_y != 0 { + for mb_x in 0..mb_w { + let q = cbpi.get_q(mb_w + mb_x); + if q != last_q { + gen_clip_tab(&mut clip_tab, q); + last_q = q; + } + deblock_hor(buf, ustride, uoff + mb_x * 8, &clip_tab); + deblock_hor(buf, vstride, voff + mb_x * 8, &clip_tab); + } + let offu = uoff - 8 * ustride; + let offv = voff - 8 * vstride; + for mb_x in 1..mb_w { + let qt = cbpi.get_q(mb_x); + if qt != last_q { + gen_clip_tab(&mut clip_tab, qt); + last_q = qt; + } + deblock_ver(buf, ustride, offu + mb_x * 8, &clip_tab); + deblock_ver(buf, vstride, offv + mb_x * 8, &clip_tab); + } + } + } +} + struct VivoDecoder { info: NACodecInfoRef, dec: H263BaseDecoder, tables: Tables, - bdsp: H263BlockDSP, + bdsp: VivoBlockDSP, lastframe: Option, lastpts: Option, width: usize, @@ -62,7 +292,7 @@ impl<'a> VivoBR<'a> { } } - fn decode_block(&mut self, quant: u8, intra: bool, coded: bool, blk: &mut [i16; 64], plane_no: usize, acpred: ACPredMode) -> DecoderResult<()> { + fn decode_block(&mut self, quant: u8, intra: bool, coded: bool, blk: &mut [i16; 64], _plane_no: usize, acpred: ACPredMode) -> DecoderResult<()> { let br = &mut self.br; let mut idx = 0; if !self.aic && intra { @@ -79,8 +309,8 @@ impl<'a> VivoBR<'a> { }; let rl_cb = if self.aic && intra { &self.tables.aic_rl_cb } else { &self.tables.rl_cb }; - let q = if plane_no == 0 { (quant * 2) as i16 } else { (H263_CHROMA_QUANT[quant as usize] * 2) as i16 }; - let q_add = if q == 0 || self.aic { 0i16 } else { (((q >> 1) - 1) | 1) as i16 }; + let q = i16::from(quant) * 2; + let q_add = q >> 1; while idx < 64 { let code = br.read_cb(rl_cb)?; let run; @@ -91,10 +321,12 @@ impl<'a> VivoBR<'a> { level = code.get_level(); last = code.is_last(); if br.read_bool()? { level = -level; } - if level >= 0 { - level = (level * q) + q_add; - } else { - level = (level * q) - q_add; + if !intra || !self.aic { + if level >= 0 { + level = (level * q) + q_add; + } else { + level = (level * q) - q_add; + } } } else { last = br.read_bool()?; @@ -105,13 +337,15 @@ impl<'a> VivoBR<'a> { let top = br.read_s(6)? as i16; level = (top << 5) | low; } - if level >= 0 { - level = (level * q) + q_add; - } else { - level = (level * q) - q_add; + if !intra || !self.aic { + if level >= 0 { + level = (level * q) + q_add; + } else { + level = (level * q) - q_add; + } + if level < -2048 { level = -2048; } + if level > 2047 { level = 2047; } } - if level < -2048 { level = -2048; } - if level > 2047 { level = 2047; } } idx += run; validate!(idx < 64); @@ -168,6 +402,7 @@ fn decode_b_info(br: &mut BitReader, is_pb: bool, is_ipb: bool, is_intra: bool) impl<'a> BlockDecoder for VivoBR<'a> { #[allow(unused_variables)] +#[allow(clippy::unreadable_literal)] fn decode_pichdr(&mut self) -> DecoderResult { let br = &mut self.br; let syncw = br.read(22)?; @@ -193,11 +428,12 @@ impl<'a> BlockDecoder for VivoBR<'a> { sfmt = br.read(3)?; validate!(sfmt != 0b000 && sfmt != 0b110); aic = br.read_bool()?; - br.read(1)?; // umv mode deblock = br.read_bool()?; - br.read(3)?; // unknown flags - pbplus = br.read_bool()?; br.read(4)?; // unknown flags + pbplus = br.read_bool()?; + br.read(1)?; // unknown flag + let _interlaced = br.read_bool()?; + br.read(2)?; // unknown flags } else { aic = false; deblock = false; @@ -398,9 +634,9 @@ impl VivoDecoder { VivoDecoder{ info: NACodecInfo::new_dummy(), - dec: H263BaseDecoder::new(true), + dec: H263BaseDecoder::new_with_opts(H263DEC_OPT_SLICE_RESET | H263DEC_OPT_USES_GOB | H263DEC_OPT_PRED_QUANT), tables, - bdsp: H263BlockDSP::new(), + bdsp: VivoBlockDSP::new(), lastframe: None, lastpts: None, width: 0, @@ -491,14 +727,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::vivo_register_all_codecs; + use crate::vivo_register_all_decoders; use crate::vivo_register_all_demuxers; #[test] fn test_vivo1() { let mut dmx_reg = RegisteredDemuxers::new(); vivo_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - vivo_register_all_codecs(&mut dec_reg); + vivo_register_all_decoders(&mut dec_reg); test_file_decoding("vivo", "assets/Misc/gr_al.viv", Some(16), true, false, Some("viv1"), &dmx_reg, &dec_reg); // test_decoding("vivo", "vivo1", "assets/Misc/gr_al.viv", Some(16), @@ -509,7 +745,7 @@ test_file_decoding("vivo", "assets/Misc/gr_al.viv", Some(16), true, false, Some( let mut dmx_reg = RegisteredDemuxers::new(); vivo_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - vivo_register_all_codecs(&mut dec_reg); + vivo_register_all_decoders(&mut dec_reg); test_file_decoding("vivo", "assets/Misc/02-KimagureOrangeRoad.viv", Some(50), true, false, Some("viv2"), &dmx_reg, &dec_reg); panic!("end");