X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp3.rs;h=059ff9da7a6416686334ea7f4474d414138f863c;hb=503368d15e17aa865c8abc6ebcc2943ad822867b;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..059ff9d 100644 --- a/nihav-duck/src/codecs/vp3.rs +++ b/nihav-duck/src/codecs/vp3.rs @@ -425,7 +425,7 @@ fn rescale_qmat(dst_qmat: &mut [i16; 64], base_qmat: &[i16; 64], dc_quant: i16, dst_qmat[0] = (base_qmat[0] * dc_quant / 100).max(minval * 2) << 2; } -fn expand_token(blk: &mut Block, br: &mut BitReader, eob_run: &mut usize, coef_no: usize, token: u8) -> DecoderResult<()> { +fn expand_token(blk: &mut Block, br: &mut BitReader, eob_run: &mut usize, token: u8) -> DecoderResult<()> { match token { // EOBs 0 | 1 | 2 => { *eob_run = (token as usize) + 1; }, @@ -527,7 +527,7 @@ fn expand_token(blk: &mut Block, br: &mut BitReader, eob_run: &mut usize, coef_n if *eob_run > 0 { blk.idx = 64; *eob_run -= 1; - } else if coef_no > 0 { + } else if (token > 8) && (blk.idx > 1) { blk.has_ac = true; } Ok(()) @@ -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(); @@ -871,7 +820,7 @@ println!("intra, ver {} (self {})", version, self.version); &codes.ac_p_cb[table] }; let token = br.read_cb(cb)?; - expand_token(blk, br, &mut self.eob_run, coef_no, token)?; + expand_token(blk, br, &mut self.eob_run, token)?; } Ok(()) } else { @@ -1064,7 +1013,7 @@ println!("intra, ver {} (self {})", version, self.version); } let cb = if (blkaddr & 3) == 0 { cbs[0] } else { cbs[1] }; let token = br.read_cb(cb)?; - expand_token(blk, br, &mut self.eob_run, coef_no, token)?; + expand_token(blk, br, &mut self.eob_run, token)?; } Ok(()) } else { @@ -1263,7 +1212,7 @@ println!("intra, ver {} (self {})", version, self.version); }; let cb = if (blkaddr & 3) == 0 { cbs[0] } else { cbs[1] }; let token = br.read_cb(cb)?; - expand_token(blk, br, &mut coef_eob[blk.idx], blk.idx, token)?; + expand_token(blk, br, &mut coef_eob[blk.idx], token)?; if blk.idx == 64 { break; } } let idx = blkaddr >> 2; @@ -1845,7 +1794,7 @@ impl NADecoder for VP34Decoder { let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), true, fmt)); self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref(); supp.pool_u8.set_dec_bufs(3); - supp.pool_u8.prealloc_video(NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), false, fmt), 4)?; + supp.pool_u8.prealloc_video(NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), true, fmt), 4)?; self.generate_block_addr(); if self.version == 4 { @@ -1865,6 +1814,10 @@ impl NADecoder for VP34Decoder { self.parse_header(&mut br)?; if self.is_intra { self.shuf.clear(); + } else { + if !self.shuf.has_refs() { + return Err(DecoderError::MissingReference); + } } let ret = supp.pool_u8.get_free(); @@ -1890,13 +1843,16 @@ impl NADecoder for VP34Decoder { frm.set_frame_type(if self.is_intra { FrameType::I } else { FrameType::P }); Ok(frm.into_ref()) } + fn flush(&mut self) { + self.shuf.clear(); + } } -pub fn get_decoder_vp3() -> Box { +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)) }