X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fcodecs%2Fh263%2Fintel263.rs;h=9e36a49651991db54e016ed4c215da5893bb4bf2;hb=aca8904163fb0a2bed0f5939097ddec3654d0551;hp=7bc2844c044a79578ad53b00167c7db25bbf8653;hpb=2324f30bad4876e4235d54b98ceb57fc60939644;p=nihav.git diff --git a/src/codecs/h263/intel263.rs b/src/codecs/h263/intel263.rs index 7bc2844..9e36a49 100644 --- a/src/codecs/h263/intel263.rs +++ b/src/codecs/h263/intel263.rs @@ -1,10 +1,11 @@ -use io::bitreader::*; -use io::codebook::*; -use formats; +use crate::io::bitreader::*; +use crate::io::codebook::*; +use crate::formats; use super::super::*; use super::*; use super::decoder::*; use super::data::*; +use super::code::H263BlockDSP; #[allow(dead_code)] struct Tables { @@ -20,6 +21,7 @@ struct Intel263Decoder { info: Rc, dec: H263BaseDecoder, tables: Tables, + bdsp: H263BlockDSP, } struct Intel263BR<'a> { @@ -28,6 +30,7 @@ struct Intel263BR<'a> { gob_no: usize, mb_w: usize, is_pb: bool, + is_ipb: bool, } fn check_marker<'a>(br: &mut BitReader<'a>) -> DecoderResult<()> { @@ -44,11 +47,12 @@ impl<'a> Intel263BR<'a> { gob_no: 0, mb_w: 0, is_pb: false, + is_ipb: false, } } fn decode_block(&mut self, quant: u8, intra: bool, coded: bool, blk: &mut [i16; 64]) -> DecoderResult<()> { - let mut br = &mut self.br; + let br = &mut self.br; let mut idx = 0; if intra { let mut dc = br.read(8)?; @@ -112,19 +116,25 @@ fn decode_mv(br: &mut BitReader, mv_cb: &Codebook) -> DecoderResult { Ok(MV::new(xval, yval)) } -fn decode_b_info(br: &mut BitReader, is_pb: bool, is_intra: bool) -> DecoderResult { +fn decode_b_info(br: &mut BitReader, is_pb: bool, is_ipb: bool, is_intra: bool) -> DecoderResult { if is_pb { // as improved pb - let pb_mv_add = if is_intra { 1 } else { 0 }; - if br.read_bool()?{ - if br.read_bool()? { - let pb_mv_count = 1 - (br.read(1)? as usize); - let cbpb = br.read(6)? as u8; - Ok(BBlockInfo::new(true, cbpb, pb_mv_count + pb_mv_add, pb_mv_count == 1)) + if is_ipb { + let pb_mv_add = if is_intra { 1 } else { 0 }; + if br.read_bool()?{ + if br.read_bool()? { + let pb_mv_count = 1 - (br.read(1)? as usize); + let cbpb = br.read(6)? as u8; + Ok(BBlockInfo::new(true, cbpb, pb_mv_count + pb_mv_add, pb_mv_count == 1)) + } else { + Ok(BBlockInfo::new(true, 0, 1 + pb_mv_add, true)) + } } else { - Ok(BBlockInfo::new(true, 0, 1 + pb_mv_add, true)) + Ok(BBlockInfo::new(true, 0, pb_mv_add, false)) } } else { - Ok(BBlockInfo::new(true, 0, pb_mv_add, false)) + let mvdb = br.read_bool()?; + let cbpb = if mvdb && br.read_bool()? { br.read(6)? as u8 } else { 0 }; + Ok(BBlockInfo::new(true, cbpb, if mvdb { 1 } else { 0 }, false)) } } else { Ok(BBlockInfo::new(false, 0, 0, false)) @@ -135,10 +145,10 @@ impl<'a> BlockDecoder for Intel263BR<'a> { #[allow(unused_variables)] fn decode_pichdr(&mut self) -> DecoderResult { - let mut br = &mut self.br; + let br = &mut self.br; let syncw = br.read(22)?; validate!(syncw == 0x000020); - let tr = br.read(8)? as u8; + let tr = (br.read(8)? << 8) as u16; check_marker(br)?; let id = br.read(1)?; validate!(id == 0); @@ -153,19 +163,22 @@ impl<'a> BlockDecoder for Intel263BR<'a> { let apm = br.read_bool()?; self.is_pb = br.read_bool()?; let deblock; + let pbplus; if sfmt == 0b111 { sfmt = br.read(3)?; validate!((sfmt != 0b000) && (sfmt != 0b111)); br.read(2)?; // unknown flags deblock = br.read_bool()?; br.read(1)?; // unknown flag - let pbplus = br.read_bool()?; + pbplus = br.read_bool()?; br.read(5)?; // unknown flags let marker = br.read(5)?; validate!(marker == 1); } else { deblock = false; + pbplus = false; } + self.is_ipb = pbplus; let w; let h; if sfmt == 0b110 { let par = br.read(4)?; @@ -190,7 +203,7 @@ impl<'a> BlockDecoder for Intel263BR<'a> { if self.is_pb { let trb = br.read(3)?; let dbquant = br.read(2)?; - pbinfo = Some(PBInfo::new(trb as u8, dbquant as u8)); + pbinfo = Some(PBInfo::new(trb as u8, dbquant as u8, pbplus)); } else { pbinfo = None; } @@ -202,27 +215,29 @@ impl<'a> BlockDecoder for Intel263BR<'a> { self.mb_w = (w + 15) >> 4; let ftype = if is_intra { Type::I } else { Type::P }; - let mvmode = if umv { MVMode::UMV } else { MVMode::Long }; - let picinfo = PicInfo::new(w, h, ftype, quant as u8, apm, mvmode, tr, pbinfo, deblock); + let plusinfo = if deblock { Some(PlusInfo::new(false, deblock, false, false)) } else { None }; + let mvmode = if umv { MVMode::UMV } else { MVMode::Old }; + let picinfo = PicInfo::new(w, h, ftype, mvmode, umv, apm, quant as u8, tr, pbinfo, plusinfo); Ok(picinfo) } #[allow(unused_variables)] - fn decode_slice_header(&mut self, info: &PicInfo) -> DecoderResult { - let mut br = &mut self.br; + fn decode_slice_header(&mut self, info: &PicInfo) -> DecoderResult { + let br = &mut self.br; let gbsc = br.read(17)?; validate!(gbsc == 1); let gn = br.read(5)?; let gfid = br.read(2)?; let gquant = br.read(5)?; //println!("GOB gn {:X} id {} q {}", gn, gfid, gquant); - let ret = Slice::new(0, self.gob_no, gquant as u8); + let ret = SliceInfo::new_gob(0, self.gob_no, gquant as u8); self.gob_no += 1; Ok(ret) } - fn decode_block_header(&mut self, info: &PicInfo, slice: &Slice) -> DecoderResult { - let mut br = &mut self.br; + #[allow(unused_variables)] + fn decode_block_header(&mut self, info: &PicInfo, slice: &SliceInfo, sstate: &SliceState) -> DecoderResult { + let br = &mut self.br; let mut q = slice.get_quant(); match info.get_mode() { Type::I => { @@ -246,7 +261,7 @@ impl<'a> BlockDecoder for Intel263BR<'a> { let is_4x4 = (cbpc & 0x10) != 0; if is_intra { let mut mvec: Vec = Vec::new(); - let bbinfo = decode_b_info(br, self.is_pb, true)?; + let bbinfo = decode_b_info(br, self.is_pb, self.is_ipb, true)?; let cbpy = br.read_cb(&self.tables.cbpy_cb)?; let cbp = (cbpy << 2) | (cbpc & 3); if dquant { @@ -264,7 +279,7 @@ impl<'a> BlockDecoder for Intel263BR<'a> { return Ok(binfo); } - let bbinfo = decode_b_info(br, self.is_pb, false)?; + let bbinfo = decode_b_info(br, self.is_pb, self.is_ipb, false)?; let mut cbpy = br.read_cb(&self.tables.cbpy_cb)?; // if /* !aiv && */(cbpc & 3) != 3 { cbpy ^= 0xF; @@ -303,144 +318,16 @@ impl<'a> BlockDecoder for Intel263BR<'a> { } #[allow(unused_variables)] - fn decode_block_intra(&mut self, info: &BlockInfo, quant: u8, no: usize, coded: bool, blk: &mut [i16; 64]) -> DecoderResult<()> { + fn decode_block_intra(&mut self, info: &BlockInfo, sstate: &SliceState, quant: u8, no: usize, coded: bool, blk: &mut [i16; 64]) -> DecoderResult<()> { self.decode_block(quant, true, coded, blk) } #[allow(unused_variables)] - fn decode_block_inter(&mut self, info: &BlockInfo, quant: u8, no: usize, coded: bool, blk: &mut [i16; 64]) -> DecoderResult<()> { + fn decode_block_inter(&mut self, info: &BlockInfo, sstate: &SliceState, quant: u8, no: usize, coded: bool, blk: &mut [i16; 64]) -> DecoderResult<()> { self.decode_block(quant, false, coded, blk) } fn is_slice_end(&mut self) -> bool { self.br.peek(16) == 0 } - - fn filter_row(&mut self, buf: &mut NAVideoBuffer, mb_y: usize, mb_w: usize, cbpi: &CBPInfo) { - let stride = buf.get_stride(0); - let mut off = buf.get_offset(0) + mb_y * 16 * stride; - for mb_x in 0..mb_w { - let coff = off; - let coded0 = cbpi.is_coded(mb_x, 0); - let coded1 = cbpi.is_coded(mb_x, 1); - let q = cbpi.get_q(mb_w + mb_x); - if mb_y != 0 { - if coded0 && cbpi.is_coded_top(mb_x, 0) { deblock_hor(buf, 0, q, coff); } - if coded1 && cbpi.is_coded_top(mb_x, 1) { deblock_hor(buf, 0, q, coff + 8); } - } - let coff = off + 8 * stride; - if cbpi.is_coded(mb_x, 2) && coded0 { deblock_hor(buf, 0, q, coff); } - if cbpi.is_coded(mb_x, 3) && coded1 { deblock_hor(buf, 0, q, coff + 8); } - off += 16; - } - let mut leftt = false; - let mut leftc = false; - let mut off = buf.get_offset(0) + mb_y * 16 * stride; - for mb_x in 0..mb_w { - let ctop0 = cbpi.is_coded_top(mb_x, 0); - let ctop1 = cbpi.is_coded_top(mb_x, 0); - let ccur0 = cbpi.is_coded(mb_x, 0); - let ccur1 = cbpi.is_coded(mb_x, 1); - let q = cbpi.get_q(mb_w + mb_x); - if mb_y != 0 { - let coff = off - 8 * stride; - let qtop = cbpi.get_q(mb_x); - if leftt && ctop0 { deblock_ver(buf, 0, qtop, coff); } - if ctop0 && ctop1 { deblock_ver(buf, 0, qtop, coff + 8); } - } - if leftc && ccur0 { deblock_ver(buf, 0, q, off); } - if ccur0 && ccur1 { deblock_ver(buf, 0, q, off + 8); } - leftt = ctop1; - leftc = ccur1; - off += 16; - } - let strideu = buf.get_stride(1); - let stridev = buf.get_stride(2); - let offu = buf.get_offset(1) + mb_y * 8 * strideu; - let offv = buf.get_offset(2) + mb_y * 8 * stridev; - if mb_y != 0 { - for mb_x in 0..mb_w { - let ctu = cbpi.is_coded_top(mb_x, 4); - let ccu = cbpi.is_coded(mb_x, 4); - let ctv = cbpi.is_coded_top(mb_x, 5); - let ccv = cbpi.is_coded(mb_x, 5); - let q = cbpi.get_q(mb_w + mb_x); - if ctu && ccu { deblock_hor(buf, 1, q, offu + mb_x * 8); } - if ctv && ccv { deblock_hor(buf, 2, q, offv + mb_x * 8); } - } - let mut leftu = false; - let mut leftv = false; - let offu = buf.get_offset(1) + (mb_y - 1) * 8 * strideu; - let offv = buf.get_offset(2) + (mb_y - 1) * 8 * stridev; - for mb_x in 0..mb_w { - let ctu = cbpi.is_coded_top(mb_x, 4); - let ctv = cbpi.is_coded_top(mb_x, 5); - let qt = cbpi.get_q(mb_x); - if leftu && ctu { deblock_ver(buf, 1, qt, offu + mb_x * 8); } - if leftv && ctv { deblock_ver(buf, 2, qt, offv + mb_x * 8); } - leftu = ctu; - leftv = ctv; - } - } - } -} - -fn deblock_hor(buf: &mut NAVideoBuffer, comp: usize, q: u8, off: usize) { - let stride = buf.get_stride(comp); - let mut dptr = buf.get_data_mut(); - let mut buf = dptr.as_mut_slice(); - for x in 0..8 { - let a = buf[off - 2 * stride + x] as i16; - let b = buf[off - 1 * stride + x] as i16; - let c = buf[off + 0 * stride + x] as i16; - let d = buf[off + 1 * stride + x] as i16; - let diff = ((a - d) * 3 + (c - b) * 8) >> 4; - if (diff != 0) && (diff >= -32) && (diff < 32) { - let d0 = diff.abs() * 2 - (q as i16); - let d1 = if d0 < 0 { 0 } else { d0 }; - let d2 = diff.abs() - d1; - let d3 = if d2 < 0 { 0 } else { d2 }; - - let delta = if diff < 0 { -d3 } else { d3 }; - - let b1 = b + delta; - if b1 < 0 { buf[off - 1 * stride + x] = 0; } - else if b1 > 255 { buf[off - 1 * stride + x] = 0xFF; } - else { buf[off - 1 * stride + x] = b1 as u8; } - let c1 = c - delta; - if c1 < 0 { buf[off + x] = 0; } - else if c1 > 255 { buf[off + x] = 0xFF; } - else { buf[off + x] = c1 as u8; } - } - } -} - -fn deblock_ver(buf: &mut NAVideoBuffer, comp: usize, q: u8, off: usize) { - let stride = buf.get_stride(comp); - let mut dptr = buf.get_data_mut(); - let mut buf = dptr.as_mut_slice(); - for y in 0..8 { - let a = buf[off - 2 + y * stride] as i16; - let b = buf[off - 1 + y * stride] as i16; - let c = buf[off + 0 + y * stride] as i16; - let d = buf[off + 1 + y * stride] as i16; - let diff = ((a - d) * 3 + (c - b) * 8) >> 4; - if (diff != 0) && (diff >= -32) && (diff < 32) { - let d0 = diff.abs() * 2 - (q as i16); - let d1 = if d0 < 0 { 0 } else { d0 }; - let d2 = diff.abs() - d1; - let d3 = if d2 < 0 { 0 } else { d2 }; - - let delta = if diff < 0 { -d3 } else { d3 }; - - let b1 = b + delta; - if b1 < 0 { buf[off - 1 + y * stride] = 0; } - else if b1 > 255 { buf[off - 1 + y * stride] = 0xFF; } - else { buf[off - 1 + y * stride] = b1 as u8; } - let c1 = c - delta; - if c1 < 0 { buf[off + y * stride] = 0; } - else if c1 > 255 { buf[off + y * stride] = 0xFF; } - else { buf[off + y * stride] = c1 as u8; } - } - } } impl Intel263Decoder { @@ -468,8 +355,9 @@ impl Intel263Decoder { Intel263Decoder{ info: Rc::new(DUMMY_CODEC_INFO), - dec: H263BaseDecoder::new(), + dec: H263BaseDecoder::new(true), tables: tables, + bdsp: H263BlockDSP::new(), } } } @@ -491,7 +379,7 @@ impl NADecoder for Intel263Decoder { let src = pkt.get_buffer(); if src.len() == 8 { - let bret = self.dec.get_bframe(); + let bret = self.dec.get_bframe(&self.bdsp); let buftype; let is_skip; if let Ok(btype) = bret { @@ -508,7 +396,7 @@ impl NADecoder for Intel263Decoder { } let mut ibr = Intel263BR::new(&src, &self.tables); - let bufinfo = self.dec.parse_frame(&mut ibr)?; + let bufinfo = self.dec.parse_frame(&mut ibr, &self.bdsp)?; let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo); frm.set_keyframe(self.dec.is_intra()); @@ -524,9 +412,9 @@ pub fn get_decoder() -> Box { #[cfg(test)] mod test { - use test::dec_video::test_file_decoding; + use crate::test::dec_video::test_file_decoding; #[test] fn test_intel263() { - test_file_decoding("avi", "assets/neal73_saber.avi", Some(16), true, false, None); + test_file_decoding("avi", "assets/neal73_saber.avi", Some(16), true, false, None/*Some("i263")*/); } }