X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fcodecs%2Fh263%2Fdecoder.rs;h=08b47516b901bc58df4a105c984f31c69a2aae06;hb=47add47cb6a02a68e6e94755ba24ff348ca2065b;hp=13e289b1fa6f0a2b5cc20798f0da9f145b48a1a0;hpb=2eb214772b1949ec50f3d35a81352ea61012698a;p=nihav.git diff --git a/src/codecs/h263/decoder.rs b/src/codecs/h263/decoder.rs index 13e289b..08b4751 100644 --- a/src/codecs/h263/decoder.rs +++ b/src/codecs/h263/decoder.rs @@ -1,9 +1,9 @@ -use std::mem; +//use std::mem; use frame::*; use super::super::*; use super::super::blockdsp; use super::*; -use super::code::*; +//use super::code::*; use formats; #[allow(dead_code)] @@ -22,7 +22,6 @@ impl MVInfo { 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.mvmode = mvmode; } @@ -34,7 +33,7 @@ impl MVInfo { } } #[allow(non_snake_case)] - fn predict(&mut self, mb_x: usize, blk_no: usize, use4: bool, diff: MV) -> MV { + fn predict(&mut self, mb_x: usize, blk_no: usize, use4: bool, diff: MV, first_line: bool, first_mb: bool) -> MV { let A; let B; let C; @@ -42,17 +41,17 @@ impl MVInfo { match blk_no { 0 => { if mb_x != self.mb_start { - A = if mb_x != 0 { self.mv[self.mb_stride + mb_x * 2 - 1] } else { ZERO_MV }; - B = if !self.top { self.mv[ mb_x * 2] } else { A }; - C = if !self.top && !last { self.mv[mb_x * 2 + 2] } else { ZERO_MV }; + A = if !first_mb { self.mv[self.mb_stride + mb_x * 2 - 1] } else { ZERO_MV }; + B = if !first_line { self.mv[ mb_x * 2] } else { A }; + C = if !first_line && !last { self.mv[mb_x * 2 + 2] } else { ZERO_MV }; } else { A = ZERO_MV; B = ZERO_MV; C = ZERO_MV; } }, 1 => { A = self.mv[self.mb_stride + mb_x * 2]; - B = if !self.top { self.mv[mb_x * 2 + 1] } else { A }; - C = if !self.top && !last { self.mv[mb_x * 2 + 2] } else { A }; + B = if !first_line { self.mv[mb_x * 2 + 1] } 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 }; @@ -82,7 +81,7 @@ impl MVInfo { _ => {}, }; } - + new_mv } fn set_zero_mv(&mut self, mb_x: usize) { @@ -91,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)] @@ -123,13 +125,17 @@ pub struct H263BaseDecoder { mb_h: usize, num_mb: usize, ftype: Type, - prev_frm: Option>, - cur_frm: Option>, - last_ts: u8, + ipbs: IPBShuffler, + next_ts: u16, + last_ts: u16, + tsdiff: u16, has_b: bool, b_data: Vec, pred_coeffs: Vec, is_gob: bool, + slice_reset: bool, + may_have_b_frames: bool, + mv_data: Vec, } #[inline] @@ -148,17 +154,25 @@ fn clip_ac(ac: i16) -> i16 { #[allow(dead_code)] impl H263BaseDecoder { - pub fn new(is_gob: 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, - prev_frm: None, cur_frm: None, - last_ts: 0, + ipbs: IPBShuffler::new(), + 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, true, false) + } + pub fn new_b_frames(is_gob: bool) -> Self { + Self::new_with_opts(is_gob, true, true) + } pub fn is_intra(&self) -> bool { self.ftype == Type::I } pub fn get_frame_type(&self) -> FrameType { @@ -176,6 +190,7 @@ impl H263BaseDecoder { pub fn parse_frame(&mut self, bd: &mut BlockDecoder, bdsp: &BlockDSP) -> DecoderResult { let pinfo = bd.decode_pichdr()?; let mut mvi = MVInfo::new(); + let mut mvi2 = MVInfo::new(); let mut cbpi = CBPInfo::new(); //todo handle res change @@ -188,13 +203,19 @@ impl H263BaseDecoder { self.has_b = pinfo.is_pb(); if self.has_b { - self.b_data.truncate(0); + self.mv_data.truncate(0); } - mem::swap(&mut self.cur_frm, &mut self.prev_frm); + let save_b_data = pinfo.mode.is_ref() && self.may_have_b_frames; + if save_b_data { + self.mv_data.truncate(0); + } + let is_b = pinfo.mode == Type::B; - let tsdiff = pinfo.ts.wrapping_sub(self.last_ts); - let bsdiff = if pinfo.is_pb() { pinfo.get_pbinfo().get_trb() } else { 0 }; + 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 }; let fmt = formats::YUV420_FORMAT; let vinfo = NAVideoInfo::new(self.w, self.h, false, fmt); @@ -209,6 +230,9 @@ impl H263BaseDecoder { bd.decode_slice_header(&pinfo)? }; mvi.reset(self.mb_w, 0, pinfo.get_mvmode()); + if is_b || pinfo.is_pb() { + mvi2.reset(self.mb_w, 0, pinfo.get_mvmode()); + } cbpi.reset(self.mb_w); let mut blk: [[i16; 64]; 6] = [[0; 64]; 6]; @@ -219,17 +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 || pinfo.is_pb() { + mvi2.reset(self.mb_w, mb_x, pinfo.get_mvmode()); + } cbpi.reset(self.mb_w); - sstate.first_line = true; - sstate.first_mb = true; + sstate.reset_slice(mb_x, mb_y); + sstate.quant = slice.quant; } } @@ -237,7 +265,11 @@ 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); + } for i in 0..6 { 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) { @@ -306,45 +338,126 @@ 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 { - let mv = mvi.predict(mb_x, 0, false, binfo.get_mv(0)); - if let Some(ref srcbuf) = self.prev_frm { + let mv = mvi.predict(mb_x, 0, false, binfo.get_mv(0), sstate.first_line, sstate.first_mb); + if save_b_data { + self.mv_data.push(BlockMVInfo::Inter_1MV(mv)); + } + 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 { - let mv = mvi.predict(mb_x, blk_no, true, binfo.get_mv(blk_no)); - if let Some(ref srcbuf) = self.prev_frm { + mv[blk_no] = mvi.predict(mb_x, blk_no, true, binfo.get_mv(blk_no), sstate.first_line, sstate.first_mb); + if let Some(ref srcbuf) = self.ipbs.get_lastref() { bdsp.copy_blocks(&mut buf, srcbuf, mb_x * 16 + (blk_no & 1) * 8, - mb_y * 16 + (blk_no & 2) * 4, 8, 8, mv); + 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 let Some(ref srcbuf) = self.prev_frm { + 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); } } else { -//todo + let ref_mv_info = self.mv_data[mb_pos]; + let has_fwd = binfo.get_num_mvs() > 0; + let has_bwd = binfo.get_num_mvs2() > 0; +//todo refactor + if has_fwd || has_bwd { + let fwd_mv; + if has_fwd { + fwd_mv = mvi.predict(mb_x, 0, false, binfo.get_mv(0), sstate.first_line, sstate.first_mb); + } else { + fwd_mv = ZERO_MV; + mvi.set_zero_mv(mb_x); + } + let bwd_mv; + if has_bwd { + bwd_mv = mvi2.predict(mb_x, 0, false, binfo.get_mv2(0), sstate.first_line, sstate.first_mb); + } else { + bwd_mv = ZERO_MV; + mvi2.set_zero_mv(mb_x); + } + if let (Some(ref fwd_buf), Some(ref bck_buf)) = (self.ipbs.get_nextref(), self.ipbs.get_lastref()) { + if has_fwd && has_bwd { + bdsp.copy_blocks(&mut buf, fwd_buf, mb_x * 16, mb_y * 16, 16, 16, fwd_mv); + bdsp.avg_blocks (&mut buf, bck_buf, mb_x * 16, mb_y * 16, 16, 16, bwd_mv); + } else if has_fwd { + bdsp.copy_blocks(&mut buf, fwd_buf, mb_x * 16, mb_y * 16, 16, 16, fwd_mv); + } else { + bdsp.copy_blocks(&mut buf, bck_buf, mb_x * 16, mb_y * 16, 16, 16, bwd_mv); + } + } + } else { + if let BlockMVInfo::Inter_4MV(mvs) = ref_mv_info { + for blk_no in 0..4 { + let ref_mv = mvs[blk_no]; + let ref_mv_fwd = ref_mv.scale(bsdiff, tsdiff); + let ref_mv_bwd = ref_mv - ref_mv_fwd; + let xoff = mb_x * 16 + (blk_no & 1) * 8; + let yoff = mb_y * 16 + (blk_no & 2) * 4; + if let (Some(ref fwd_buf), Some(ref bck_buf)) = (self.ipbs.get_nextref(), self.ipbs.get_lastref()) { + bdsp.copy_blocks(&mut buf, fwd_buf, xoff, yoff, 8, 8, ref_mv_fwd); + bdsp.avg_blocks (&mut buf, bck_buf, xoff, yoff, 8, 8, ref_mv_bwd); + } + } + } else { + let ref_mv = if let BlockMVInfo::Inter_1MV(mv_) = ref_mv_info { mv_ } else { ZERO_MV }; + let ref_mv_fwd = ref_mv.scale(bsdiff, tsdiff); + let ref_mv_bwd = MV::b_sub(ref_mv, ref_mv_fwd, ZERO_MV, bsdiff, tsdiff); + + if let (Some(ref fwd_buf), Some(ref bck_buf)) = (self.ipbs.get_nextref(), self.ipbs.get_lastref()) { + bdsp.copy_blocks(&mut buf, fwd_buf, mb_x * 16, mb_y * 16, 16, 16, ref_mv_fwd); + bdsp.avg_blocks (&mut buf, bck_buf, mb_x * 16, mb_y * 16, 16, 16, ref_mv_bwd); + } + } + mvi.set_zero_mv(mb_x); + mvi2.set_zero_mv(mb_x); + } 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); } - blockdsp::add_blocks(&mut buf, mb_x, mb_y, &blk); } if pinfo.is_pb() { let mut b_mb = BMB::new(); @@ -358,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); } @@ -394,17 +506,25 @@ impl H263BaseDecoder { } } mvi.update_row(); + if is_b || pinfo.is_pb() { + mvi2.update_row(); + } cbpi.update_row(); sstate.new_row(); } - - self.cur_frm = Some(buf); - self.last_ts = pinfo.ts; + + if pinfo.mode.is_ref() { + self.ipbs.add_frame(buf); + self.next_ts = self.last_ts; + self.last_ts = pinfo.ts; + self.tsdiff = tsdiff; + } + Ok(bufinfo) } pub fn get_bframe(&mut self, bdsp: &BlockDSP) -> DecoderResult { - if !self.has_b || !self.cur_frm.is_some() || !self.prev_frm.is_some() { + if !self.has_b || !self.ipbs.get_lastref().is_some() || !self.ipbs.get_nextref().is_some() { return Err(DecoderError::MissingReference); } self.has_b = false; @@ -416,10 +536,8 @@ impl H263BaseDecoder { let mut bufinfo = bufret.unwrap(); let mut b_buf = bufinfo.get_vbuf().unwrap(); - 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, bdsp); - } + if let (Some(ref bck_buf), Some(ref fwd_buf)) = (self.ipbs.get_nextref(), self.ipbs.get_lastref()) { + 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);