X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fcodecs%2Fh263%2Fdecoder.rs;h=db200e71769f06042501e4e4622c42b3a0a9daa4;hb=0c3b4923dbb4b965b9e759a40fbbe003323a259b;hp=11eb2be2fc3ede0ef874485b22b52c57adc1eea7;hpb=88c58b1b958a5478dca6595e2efc3a1a6b5f7e19;p=nihav.git diff --git a/src/codecs/h263/decoder.rs b/src/codecs/h263/decoder.rs index 11eb2be..db200e7 100644 --- a/src/codecs/h263/decoder.rs +++ b/src/codecs/h263/decoder.rs @@ -13,18 +13,18 @@ struct MVInfo { mb_stride: usize, mb_start: usize, top: bool, - umv: bool, + mvmode: MVMode, } impl MVInfo { - fn new() -> Self { MVInfo{ mv: Vec::new(), mb_w: 0, mb_stride: 0, mb_start: 0, top: true, umv: false } } - fn reset(&mut self, mb_w: usize, mb_start: usize, umv: bool) { + fn new() -> Self { MVInfo{ mv: Vec::new(), mb_w: 0, mb_stride: 0, mb_start: 0, top: true, mvmode: MVMode::Old } } + fn reset(&mut self, mb_w: usize, mb_start: usize, mvmode: MVMode) { self.mb_start = mb_start; self.mb_w = mb_w; self.mb_stride = mb_w * 2; self.top = true; self.mv.resize(self.mb_stride * 3, ZERO_MV); - self.umv = umv; + self.mvmode = mvmode; } fn update_row(&mut self) { self.mb_start = self.mb_w + 1; @@ -67,7 +67,7 @@ impl MVInfo { _ => { return ZERO_MV; } } let pred_mv = MV::pred(A, B, C); - let new_mv = MV::add_umv(pred_mv, diff, self.umv); + let new_mv = MV::add_umv(pred_mv, diff, self.mvmode); if !use4 { self.mv[self.mb_stride * 1 + mb_x * 2 + 0] = new_mv; self.mv[self.mb_stride * 1 + mb_x * 2 + 1] = new_mv; @@ -93,22 +93,6 @@ impl MVInfo { } } -fn copy_blocks(dst: &mut NAVideoBuffer, src: &NAVideoBuffer, xpos: usize, ypos: usize, w: usize, h: usize, mv: MV) { - let srcx = ((mv.x >> 1) as isize) + (xpos as isize); - let srcy = ((mv.y >> 1) as isize) + (ypos as isize); - let mode = ((mv.x & 1) + (mv.y & 1) * 2) as usize; - - blockdsp::copy_blocks(dst, src, xpos, ypos, srcx, srcy, w, h, 0, 1, mode, H263_INTERP_FUNCS); -} - -fn avg_blocks(dst: &mut NAVideoBuffer, src: &NAVideoBuffer, xpos: usize, ypos: usize, w: usize, h: usize, mv: MV) { - let srcx = ((mv.x >> 1) as isize) + (xpos as isize); - let srcy = ((mv.y >> 1) as isize) + (ypos as isize); - let mode = ((mv.x & 1) + (mv.y & 1) * 2) as usize; - - blockdsp::copy_blocks(dst, src, xpos, ypos, srcx, srcy, w, h, 0, 1, mode, H263_INTERP_AVG_FUNCS); -} - #[allow(dead_code)] #[derive(Clone,Copy)] struct BMB { @@ -124,6 +108,14 @@ impl BMB { fn new() -> Self { BMB {blk: [[0; 64]; 6], cbp: 0, fwd: false, mv_f: [ZERO_MV; 4], mv_b: [ZERO_MV; 4], num_mv: 0} } } +#[derive(Clone,Copy)] +struct PredCoeffs { + hor: [[i16; 8]; 6], + ver: [[i16; 8]; 6], +} + +const ZERO_PRED_COEFFS: PredCoeffs = PredCoeffs { hor: [[0; 8]; 6], ver: [[0; 8]; 6] }; + pub struct H263BaseDecoder { w: usize, h: usize, @@ -136,6 +128,21 @@ pub struct H263BaseDecoder { last_ts: u8, has_b: bool, b_data: Vec, + pred_coeffs: Vec, +} + +#[inline] +fn clip_dc(dc: i16) -> i16 { + if dc < 0 { 0 } + else if dc > 2046 { 2046 } + else { (dc + 1) & !1 } +} + +#[inline] +fn clip_ac(ac: i16) -> i16 { + if ac < -2048 { -2048 } + else if ac > 2047 { 2047 } + else { ac } } #[allow(dead_code)] @@ -147,13 +154,14 @@ impl H263BaseDecoder { prev_frm: None, cur_frm: None, last_ts: 0, has_b: false, b_data: Vec::new(), + pred_coeffs: Vec::new(), } } pub fn is_intra(&self) -> bool { self.ftype == Type::I } pub fn get_dimensions(&self) -> (usize, usize) { (self.w, self.h) } - pub fn parse_frame(&mut self, bd: &mut BlockDecoder) -> DecoderResult { + pub fn parse_frame(&mut self, bd: &mut BlockDecoder, bdsp: &BlockDSP) -> DecoderResult { let pinfo = bd.decode_pichdr()?; let mut mvi = MVInfo::new(); let mut cbpi = CBPInfo::new(); @@ -183,28 +191,105 @@ impl H263BaseDecoder { let mut bufinfo = bufret.unwrap(); let mut buf = bufinfo.get_vbuf().unwrap(); - let mut slice = Slice::get_default_slice(&pinfo); - mvi.reset(self.mb_w, 0, pinfo.get_umv()); + let mut slice = if bd.is_gob() { + SliceInfo::get_default_slice(&pinfo) + } else { + bd.decode_slice_header(&pinfo)? + }; + mvi.reset(self.mb_w, 0, pinfo.get_mvmode()); cbpi.reset(self.mb_w); let mut blk: [[i16; 64]; 6] = [[0; 64]; 6]; + let mut sstate = SliceState::new(pinfo.mode == Type::I); + let mut mb_pos = 0; + let apply_acpred = (pinfo.mode == Type::I) && pinfo.plusinfo.is_some() && pinfo.plusinfo.unwrap().aic; + if apply_acpred { + self.pred_coeffs.truncate(0); + self.pred_coeffs.resize(self.mb_w * self.mb_h, ZERO_PRED_COEFFS); + } for mb_y in 0..self.mb_h { for mb_x in 0..self.mb_w { for i in 0..6 { for j in 0..64 { blk[i][j] = 0; } } - if ((mb_x != 0) || (mb_y != 0)) && bd.is_slice_end() { + if slice.is_at_end(mb_pos) || (slice.needs_check() && mb_pos > 0 && bd.is_slice_end()) { slice = bd.decode_slice_header(&pinfo)?; - mvi.reset(self.mb_w, mb_x, pinfo.get_umv()); + //mvi.reset(self.mb_w, mb_x, pinfo.get_mvmode()); //cbpi.reset(self.mb_w); } - let binfo = bd.decode_block_header(&pinfo, &slice)?; + let binfo = bd.decode_block_header(&pinfo, &slice, &sstate)?; let cbp = binfo.get_cbp(); cbpi.set_cbp(mb_x, cbp); cbpi.set_q(mb_x, binfo.get_q()); if binfo.is_intra() { for i in 0..6 { - bd.decode_block_intra(&binfo, binfo.get_q(), i, (cbp & (1 << (5 - i))) != 0, &mut blk[i])?; + bd.decode_block_intra(&binfo, &sstate, binfo.get_q(), i, (cbp & (1 << (5 - i))) != 0, &mut blk[i])?; + if apply_acpred && (binfo.acpred != ACPredMode::None) { + let has_b = (i == 1) || (i == 3) || (mb_x > 0); + let has_a = (i == 2) || (i == 3) || (mb_y > 0); + let (b_mb, b_blk) = if has_b { + if (i == 1) || (i == 3) { + (mb_pos, i - 1) + } else if i < 4 { + (mb_pos - 1, i + 1) + } else { + (mb_pos - 1, i) + } + } else { (0, 0) }; + let (a_mb, a_blk) = if has_a { + if (i == 2) || (i == 3) { + (mb_pos, i - 2) + } else if i < 4 { + (mb_pos - self.mb_w, i + 2) + } else { + (mb_pos - self.mb_w, i) + } + } else { (0, 0) }; + match binfo.acpred { + ACPredMode::DC => { + let dc; + if has_a && has_b { + dc = (self.pred_coeffs[b_mb].hor[b_blk][0] + self.pred_coeffs[a_mb].ver[a_blk][0]) / 2; + } else if has_a { + dc = self.pred_coeffs[a_mb].ver[a_blk][0]; + } else if has_b { + dc = self.pred_coeffs[b_mb].hor[b_blk][0]; + } else { + dc = 1024; + } + blk[i][0] = clip_dc(blk[i][0] + dc); + }, + ACPredMode::Hor => { + if has_b { + for k in 0..8 { + blk[i][k * 8] += self.pred_coeffs[b_mb].hor[b_blk][k]; + } + for k in 1..8 { + blk[i][k * 8] = clip_ac(blk[i][k * 8]); + } + } else { + blk[i][0] += 1024; + } + blk[i][0] = clip_dc(blk[i][0]); + }, + ACPredMode::Ver => { + if has_a { + for k in 0..8 { + blk[i][k] += self.pred_coeffs[a_mb].ver[a_blk][k]; + } + for k in 1..8 { + blk[i][k] = clip_ac(blk[i][k]); + } + } else { + blk[i][0] += 1024; + } + blk[i][0] = clip_dc(blk[i][0]); + }, + ACPredMode::None => {}, + }; + for t in 0..8 { self.pred_coeffs[mb_pos].hor[i][t] = blk[i][t * 8]; } + for t in 0..8 { self.pred_coeffs[mb_pos].ver[i][t] = blk[i][t]; } + } h263_idct(&mut blk[i]); } blockdsp::put_blocks(&mut buf, mb_x, mb_y, &blk); @@ -213,27 +298,27 @@ impl H263BaseDecoder { if binfo.get_num_mvs() == 1 { let mv = mvi.predict(mb_x, 0, false, binfo.get_mv(0)); if let Some(ref srcbuf) = self.prev_frm { - copy_blocks(&mut buf, srcbuf, mb_x * 16, mb_y * 16, 16, 16, mv); + bdsp.copy_blocks(&mut buf, srcbuf, mb_x * 16, mb_y * 16, 16, 16, mv); } } else { for blk_no in 0..4 { let mv = mvi.predict(mb_x, blk_no, true, binfo.get_mv(blk_no)); if let Some(ref srcbuf) = self.prev_frm { - copy_blocks(&mut buf, srcbuf, - mb_x * 16 + (blk_no & 1) * 8, - mb_y * 16 + (blk_no & 2) * 4, 8, 8, mv); + bdsp.copy_blocks(&mut buf, srcbuf, + mb_x * 16 + (blk_no & 1) * 8, + mb_y * 16 + (blk_no & 2) * 4, 8, 8, mv); } } } for i in 0..6 { - bd.decode_block_inter(&binfo, binfo.get_q(), i, ((cbp >> (5 - i)) & 1) != 0, &mut blk[i])?; + bd.decode_block_inter(&binfo, &sstate, binfo.get_q(), i, ((cbp >> (5 - i)) & 1) != 0, &mut blk[i])?; h263_idct(&mut blk[i]); } blockdsp::add_blocks(&mut buf, mb_x, mb_y, &blk); } else { mvi.set_zero_mv(mb_x); if let Some(ref srcbuf) = self.prev_frm { - copy_blocks(&mut buf, srcbuf, mb_x * 16, mb_y * 16, 16, 16, ZERO_MV); + bdsp.copy_blocks(&mut buf, srcbuf, mb_x * 16, mb_y * 16, 16, 16, ZERO_MV); } } if pinfo.is_pb() { @@ -247,7 +332,7 @@ impl H263BaseDecoder { b_mb.cbp = cbp; for i in 0..6 { - bd.decode_block_inter(&binfo, bquant, i, (cbp & (1 << (5 - i))) != 0, &mut b_mb.blk[i])?; + bd.decode_block_inter(&binfo, &sstate, bquant, i, (cbp & (1 << (5 - i))) != 0, &mut b_mb.blk[i])?; h263_idct(&mut b_mb.blk[i]); } @@ -260,14 +345,14 @@ impl H263BaseDecoder { b_mb.mv_b[0] = binfo.get_mv2(0); } else if binfo.get_num_mvs() == 1 { let src_mv = binfo.get_mv(0).scale(bsdiff, tsdiff); - let mv_f = MV::add_umv(src_mv, binfo.get_mv2(0), pinfo.get_umv()); + let mv_f = MV::add_umv(src_mv, binfo.get_mv2(0), pinfo.get_mvmode()); let mv_b = MV::b_sub(binfo.get_mv(0), mv_f, binfo.get_mv2(0), bsdiff, tsdiff); b_mb.mv_f[0] = mv_f; b_mb.mv_b[0] = mv_b; } else { for blk_no in 0..4 { let src_mv = binfo.get_mv(blk_no).scale(bsdiff, tsdiff); - let mv_f = MV::add_umv(src_mv, binfo.get_mv2(0), pinfo.get_umv()); + let mv_f = MV::add_umv(src_mv, binfo.get_mv2(0), pinfo.get_mvmode()); let mv_b = MV::b_sub(binfo.get_mv(blk_no), mv_f, binfo.get_mv2(0), bsdiff, tsdiff); b_mb.mv_f[blk_no] = mv_f; b_mb.mv_b[blk_no] = mv_b; @@ -275,12 +360,17 @@ impl H263BaseDecoder { } self.b_data.push(b_mb); } + sstate.next_mb(); + mb_pos += 1; } - if pinfo.deblock { - bd.filter_row(&mut buf, mb_y, self.mb_w, &cbpi); + if let Some(plusinfo) = pinfo.plusinfo { + if plusinfo.deblock { + bdsp.filter_row(&mut buf, mb_y, self.mb_w, &cbpi); + } } mvi.update_row(); cbpi.update_row(); + sstate.new_row(); } self.cur_frm = Some(buf); @@ -288,7 +378,7 @@ impl H263BaseDecoder { Ok(bufinfo) } - pub fn get_bframe(&mut self) -> DecoderResult { + pub fn get_bframe(&mut self, bdsp: &BlockDSP) -> DecoderResult { if !self.has_b || !self.cur_frm.is_some() || !self.prev_frm.is_some() { return Err(DecoderError::MissingReference); } @@ -303,7 +393,7 @@ impl H263BaseDecoder { if let Some(ref bck_buf) = self.prev_frm { if let Some(ref fwd_buf) = self.cur_frm { - recon_b_frame(&mut b_buf, bck_buf, fwd_buf, self.mb_w, self.mb_h, &self.b_data); + recon_b_frame(&mut b_buf, bck_buf, fwd_buf, self.mb_w, self.mb_h, &self.b_data, bdsp); } } @@ -313,7 +403,7 @@ impl H263BaseDecoder { } fn recon_b_frame(b_buf: &mut NAVideoBuffer, bck_buf: &NAVideoBuffer, fwd_buf: &NAVideoBuffer, - mb_w: usize, mb_h: usize, b_data: &Vec) { + mb_w: usize, mb_h: usize, b_data: &Vec, bdsp: &BlockDSP) { let mut cbpi = CBPInfo::new(); let mut cur_mb = 0; cbpi.reset(mb_w); @@ -324,17 +414,17 @@ fn recon_b_frame(b_buf: &mut NAVideoBuffer, bck_buf: &NAVideoBuffer, fwd let cbp = b_data[cur_mb].cbp; cbpi.set_cbp(mb_x, cbp); if num_mv == 1 { - copy_blocks(b_buf, fwd_buf, mb_x * 16, mb_y * 16, 16, 16, b_data[cur_mb].mv_b[0]); + bdsp.copy_blocks(b_buf, fwd_buf, mb_x * 16, mb_y * 16, 16, 16, b_data[cur_mb].mv_b[0]); if !is_fwd { - avg_blocks(b_buf, bck_buf, mb_x * 16, mb_y * 16, 16, 16, b_data[cur_mb].mv_f[0]); + bdsp.avg_blocks(b_buf, bck_buf, mb_x * 16, mb_y * 16, 16, 16, b_data[cur_mb].mv_f[0]); } } else { for blk_no in 0..4 { let xpos = mb_x * 16 + (blk_no & 1) * 8; let ypos = mb_y * 16 + (blk_no & 2) * 4; - copy_blocks(b_buf, fwd_buf, xpos, ypos, 8, 8, b_data[cur_mb].mv_b[blk_no]); + bdsp.copy_blocks(b_buf, fwd_buf, xpos, ypos, 8, 8, b_data[cur_mb].mv_b[blk_no]); if !is_fwd { - avg_blocks(b_buf, bck_buf, xpos, ypos, 8, 8, b_data[cur_mb].mv_f[blk_no]); + bdsp.avg_blocks(b_buf, bck_buf, xpos, ypos, 8, 8, b_data[cur_mb].mv_f[blk_no]); } } }