X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fcodecs%2Fh263%2Fdecoder.rs;h=08b47516b901bc58df4a105c984f31c69a2aae06;hb=47add47cb6a02a68e6e94755ba24ff348ca2065b;hp=4f2dbe94479ebe49438d9aded9fa451b9f1d49e8;hpb=15facd16efa3d982dcab59ca8b20cdf577b8e3e0;p=nihav.git diff --git a/src/codecs/h263/decoder.rs b/src/codecs/h263/decoder.rs index 4f2dbe9..08b4751 100644 --- a/src/codecs/h263/decoder.rs +++ b/src/codecs/h263/decoder.rs @@ -3,7 +3,7 @@ use frame::*; use super::super::*; use super::super::blockdsp; use super::*; -use super::code::*; +//use super::code::*; use formats; #[allow(dead_code)] @@ -51,7 +51,7 @@ impl MVInfo { 1 => { A = self.mv[self.mb_stride + mb_x * 2]; B = if !first_line { self.mv[mb_x * 2 + 1] } else { A }; - C = if !first_line && !last { self.mv[mb_x * 2 + 2] } else { A }; + C = if !first_line && !last { self.mv[mb_x * 2 + 2] } else { ZERO_MV/*A*/ }; }, 2 => { A = if mb_x != self.mb_start { self.mv[self.mb_stride * 2 + mb_x * 2 - 1] } else { ZERO_MV }; @@ -81,7 +81,7 @@ impl MVInfo { _ => {}, }; } - + new_mv } fn set_zero_mv(&mut self, mb_x: usize) { @@ -90,6 +90,9 @@ impl MVInfo { self.mv[self.mb_stride * 2 + mb_x * 2 + 0] = ZERO_MV; self.mv[self.mb_stride * 2 + mb_x * 2 + 1] = ZERO_MV; } + fn get_mv(&self, mb_x: usize, blk_no: usize) -> MV { + self.mv[self.mb_stride + mb_x * 2 + (blk_no & 1) + (blk_no >> 1) * self.mb_stride] + } } #[allow(dead_code)] @@ -130,6 +133,7 @@ pub struct H263BaseDecoder { b_data: Vec, pred_coeffs: Vec, is_gob: bool, + slice_reset: bool, may_have_b_frames: bool, mv_data: Vec, } @@ -150,7 +154,7 @@ fn clip_ac(ac: i16) -> i16 { #[allow(dead_code)] impl H263BaseDecoder { - pub fn new_with_opts(is_gob: bool, may_have_b_frames: bool) -> Self { + pub fn new_with_opts(is_gob: bool, slice_reset: bool, may_have_b_frames: bool) -> Self { H263BaseDecoder{ w: 0, h: 0, mb_w: 0, mb_h: 0, num_mb: 0, ftype: Type::Special, @@ -158,16 +162,16 @@ impl H263BaseDecoder { last_ts: 0, next_ts: 0, tsdiff: 0, has_b: false, b_data: Vec::new(), pred_coeffs: Vec::new(), - is_gob: is_gob, + is_gob: is_gob, slice_reset: slice_reset, may_have_b_frames: may_have_b_frames, mv_data: Vec::new(), } } pub fn new(is_gob: bool) -> Self { - Self::new_with_opts(is_gob, false) + Self::new_with_opts(is_gob, true, false) } pub fn new_b_frames(is_gob: bool) -> Self { - Self::new_with_opts(is_gob, true) + Self::new_with_opts(is_gob, true, true) } pub fn is_intra(&self) -> bool { self.ftype == Type::I } @@ -208,7 +212,8 @@ impl H263BaseDecoder { } let is_b = pinfo.mode == Type::B; - let tsdiff = pinfo.ts.wrapping_sub(self.last_ts) >> 1; + let tsdiff = if pinfo.is_pb() { pinfo.ts.wrapping_sub(self.last_ts) >> 1 } + else { self.last_ts.wrapping_sub(self.next_ts) >> 1 }; let bsdiff = if pinfo.is_pb() { (pinfo.get_pbinfo().get_trb() as u16) << 7 } else { pinfo.ts.wrapping_sub(self.next_ts) >> 1 }; @@ -225,7 +230,7 @@ impl H263BaseDecoder { bd.decode_slice_header(&pinfo)? }; mvi.reset(self.mb_w, 0, pinfo.get_mvmode()); - if is_b { + if is_b || pinfo.is_pb() { mvi2.reset(self.mb_w, 0, pinfo.get_mvmode()); } cbpi.reset(self.mb_w); @@ -238,19 +243,21 @@ impl H263BaseDecoder { self.pred_coeffs.truncate(0); self.pred_coeffs.resize(self.mb_w * self.mb_h, ZERO_PRED_COEFFS); } + sstate.quant = slice.quant; 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 slice.is_at_end(mb_pos) || (slice.needs_check() && mb_pos > 0 && bd.is_slice_end()) { slice = bd.decode_slice_header(&pinfo)?; - if !self.is_gob { + if !self.is_gob && self.slice_reset { mvi.reset(self.mb_w, mb_x, pinfo.get_mvmode()); - if is_b { + if is_b || pinfo.is_pb() { mvi2.reset(self.mb_w, mb_x, pinfo.get_mvmode()); } cbpi.reset(self.mb_w); sstate.reset_slice(mb_x, mb_y); + sstate.quant = slice.quant; } } @@ -258,6 +265,7 @@ impl H263BaseDecoder { let cbp = binfo.get_cbp(); cbpi.set_cbp(mb_x, cbp); cbpi.set_q(mb_x, binfo.get_q()); + sstate.quant = binfo.get_q(); if binfo.is_intra() { if save_b_data { self.mv_data.push(BlockMVInfo::Intra); @@ -330,12 +338,14 @@ impl H263BaseDecoder { 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]); + bdsp.idct(&mut blk[i]); } blockdsp::put_blocks(&mut buf, mb_x, mb_y, &blk); mvi.set_zero_mv(mb_x); if is_b { mvi2.set_zero_mv(mb_x); + } else if pinfo.is_pb() { + mvi2.predict(mb_x, 0, false, binfo.get_mv2(0), sstate.first_line, sstate.first_mb); } } else if (binfo.mode != Type::B) && !binfo.is_skipped() { if binfo.get_num_mvs() == 1 { @@ -346,6 +356,9 @@ impl H263BaseDecoder { if let Some(ref srcbuf) = self.ipbs.get_lastref() { bdsp.copy_blocks(&mut buf, srcbuf, mb_x * 16, mb_y * 16, 16, 16, mv); } + if pinfo.is_pb() { + mvi2.predict(mb_x, 0, false, binfo.get_mv(0), sstate.first_line, sstate.first_mb); + } } else { let mut mv: [MV; 4] = [ZERO_MV, ZERO_MV, ZERO_MV, ZERO_MV]; for blk_no in 0..4 { @@ -356,18 +369,29 @@ impl H263BaseDecoder { mb_y * 16 + (blk_no & 2) * 4, 8, 8, mv[blk_no]); } } + if pinfo.is_pb() { + for blk_no in 0..4 { + mvi2.predict(mb_x, blk_no, true, binfo.get_mv(blk_no), sstate.first_line, sstate.first_mb); + } + } if save_b_data { self.mv_data.push(BlockMVInfo::Inter_4MV(mv)); } } for i in 0..6 { bd.decode_block_inter(&binfo, &sstate, binfo.get_q(), i, ((cbp >> (5 - i)) & 1) != 0, &mut blk[i])?; - h263_idct(&mut blk[i]); + bdsp.idct(&mut blk[i]); } blockdsp::add_blocks(&mut buf, mb_x, mb_y, &blk); + if is_b && !pinfo.is_pb() { + mvi2.set_zero_mv(mb_x); + } } else if binfo.mode != Type::B { self.mv_data.push(BlockMVInfo::Inter_1MV(ZERO_MV)); mvi.set_zero_mv(mb_x); + if is_b || pinfo.is_pb() { + mvi2.set_zero_mv(mb_x); + } if let Some(ref srcbuf) = self.ipbs.get_lastref() { bdsp.copy_blocks(&mut buf, srcbuf, mb_x * 16, mb_y * 16, 16, 16, ZERO_MV); } @@ -430,7 +454,7 @@ impl H263BaseDecoder { if cbp != 0 { for i in 0..6 { bd.decode_block_inter(&binfo, &sstate, binfo.get_q(), i, ((cbp >> (5 - i)) & 1) != 0, &mut blk[i])?; - h263_idct(&mut blk[i]); + bdsp.idct(&mut blk[i]); } blockdsp::add_blocks(&mut buf, mb_x, mb_y, &blk); } @@ -447,30 +471,29 @@ impl H263BaseDecoder { b_mb.cbp = cbp; for i in 0..6 { 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]); + bdsp.idct(&mut b_mb.blk[i]); } - let is_fwd = !binfo.is_b_fwd(); + let is_fwd = binfo.is_b_fwd(); b_mb.fwd = is_fwd; - b_mb.num_mv = binfo.get_num_mvs(); - if binfo.get_num_mvs() == 0 { - b_mb.num_mv = 1; - b_mb.mv_f[0] = binfo.get_mv2(1); - 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_mvmode()); - let mv_b = MV::b_sub(binfo.get_mv(0), mv_f, binfo.get_mv2(0), bsdiff, tsdiff); + if binfo.get_num_mvs() != 4 { + let ref_mv = mvi2.get_mv(mb_x, 0); + let b_mv = if binfo.is_intra() { binfo.get_mv2(1) } else { binfo.get_mv2(0) }; + let src_mv = if is_fwd { ZERO_MV } else { ref_mv.scale(bsdiff, tsdiff) }; + let mv_f = MV::add_umv(src_mv, b_mv, pinfo.get_mvmode()); + let mv_b = MV::b_sub(ref_mv, mv_f, b_mv, bsdiff, tsdiff); b_mb.mv_f[0] = mv_f; b_mb.mv_b[0] = mv_b; + b_mb.num_mv = 1; } else { for blk_no in 0..4 { - let src_mv = binfo.get_mv(blk_no).scale(bsdiff, tsdiff); + let src_mv = if is_fwd { ZERO_MV } else { mvi2.get_mv(mb_x, blk_no).scale(bsdiff, tsdiff) }; 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); + let mv_b = MV::b_sub(mvi2.get_mv(mb_x, 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; } + b_mb.num_mv = 4; } self.b_data.push(b_mb); } @@ -483,6 +506,9 @@ impl H263BaseDecoder { } } mvi.update_row(); + if is_b || pinfo.is_pb() { + mvi2.update_row(); + } cbpi.update_row(); sstate.new_row(); } @@ -511,7 +537,7 @@ impl H263BaseDecoder { let mut b_buf = bufinfo.get_vbuf().unwrap(); if let (Some(ref bck_buf), Some(ref fwd_buf)) = (self.ipbs.get_nextref(), self.ipbs.get_lastref()) { - recon_b_frame(&mut b_buf, bck_buf, fwd_buf, self.mb_w, self.mb_h, &self.b_data, bdsp); + recon_b_frame(&mut b_buf, fwd_buf, bck_buf, self.mb_w, self.mb_h, &self.b_data, bdsp); } self.b_data.truncate(0);