use super::super::*;
use super::super::blockdsp;
use super::*;
-use super::code::*;
+//use super::code::*;
use formats;
#[allow(dead_code)]
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 };
_ => {},
};
}
-
+
new_mv
}
fn set_zero_mv(&mut self, mb_x: usize) {
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)]
b_data: Vec<BMB>,
pred_coeffs: Vec<PredCoeffs>,
is_gob: bool,
+ slice_reset: bool,
may_have_b_frames: bool,
mv_data: Vec<BlockMVInfo>,
}
#[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,
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 }
pub fn parse_frame(&mut self, bd: &mut BlockDecoder, bdsp: &BlockDSP) -> DecoderResult<NABufferType> {
let pinfo = bd.decode_pichdr()?;
let mut mvi = MVInfo::new();
+ let mut mvi2 = MVInfo::new();
let mut cbpi = CBPInfo::new();
//todo handle res change
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) >> 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 };
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];
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.reset_slice(mb_x, mb_y);
}
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), sstate.first_line, sstate.first_mb);
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 {
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);
}
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;
- let is_direct = has_fwd && has_bwd;
//todo refactor
- if let BlockMVInfo::Inter_4MV(mvs) = ref_mv_info {
- for blk_no in 0..4 {
- let ref_mv = mvs[blk_no];
- let mut ref_mv_fwd = ref_mv.scale(bsdiff, tsdiff);
- let mut 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 has_fwd { ref_mv_fwd = MV::add_umv(ref_mv_fwd, binfo.get_mv(0), pinfo.get_mvmode()); }
- if has_bwd { ref_mv_bwd = MV::add_umv(ref_mv_bwd, binfo.get_mv2(0), pinfo.get_mvmode()); }
- if let (Some(ref bck_buf), Some(ref fwd_buf)) = (self.ipbs.get_nextref(), self.ipbs.get_lastref()) {
- if is_direct || (!has_fwd && !has_bwd) {
- 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 if has_fwd {
- bdsp.copy_blocks(&mut buf, fwd_buf, xoff, yoff, 8, 8, ref_mv_fwd);
- } else {
- bdsp.copy_blocks(&mut buf, bck_buf, xoff, yoff, 8, 8, ref_mv_bwd);
- }
+ 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 {
- let ref_mv = if let BlockMVInfo::Inter_1MV(mv_) = ref_mv_info { mv_ } else { ZERO_MV };
- let mut ref_mv_fwd = ref_mv.scale(bsdiff, tsdiff);
- let mut ref_mv_bwd = ref_mv - ref_mv_fwd;
- if has_fwd { ref_mv_fwd = MV::add_umv(ref_mv_fwd, binfo.get_mv(0), pinfo.get_mvmode()); }
- if has_bwd { ref_mv_bwd = MV::add_umv(ref_mv_bwd, binfo.get_mv2(0), pinfo.get_mvmode()); }
- if let (Some(ref bck_buf), Some(ref fwd_buf)) = (self.ipbs.get_nextref(), self.ipbs.get_lastref()) {
- if is_direct || (!has_fwd && !has_bwd) {
- 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);
- } else if has_fwd {
+ 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);
- } else {
- bdsp.copy_blocks(&mut buf, bck_buf, mb_x * 16, mb_y * 16, 16, 16, ref_mv_bwd);
+ 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);
}
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);
}
}
}
mvi.update_row();
+ if is_b || pinfo.is_pb() {
+ mvi2.update_row();
+ }
cbpi.update_row();
sstate.new_row();
}
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);
projects / nihav.git / blobdiff