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.mb_stride = mb_w * 2 + 2;
self.mv.resize(self.mb_stride * 3, ZERO_MV);
self.mvmode = mvmode;
}
const ZERO_PRED_COEFFS: PredCoeffs = PredCoeffs { hor: [[0; 8]; 6], ver: [[0; 8]; 6] };
+pub const H263DEC_OPT_USES_GOB: u32 = 0x0001;
+pub const H263DEC_OPT_SLICE_RESET: u32 = 0x0002;
+pub const H263DEC_OPT_HAS_B_FRAMES: u32 = 0x0004;
+
pub struct H263BaseDecoder {
w: usize,
h: usize,
slice_reset: bool,
may_have_b_frames: bool,
mv_data: Vec<BlockMVInfo>,
+ blk: [[i16; 64]; 6],
}
#[inline]
fn clip_dc(dc: i16) -> i16 {
- if dc < 0 { 0 }
- else if dc > 2046 { 2046 }
- else { (dc + 1) & !1 }
+ if dc <= 0 { 0 }
+ else if dc > 2046 { 2047 }
+ else { dc | 1 }
}
#[inline]
#[allow(dead_code)]
impl H263BaseDecoder {
- pub fn new_with_opts(is_gob: bool, slice_reset: bool, may_have_b_frames: bool) -> Self {
+ pub fn new_with_opts(options: u32) -> Self {
+ let is_gob = (options & H263DEC_OPT_USES_GOB) != 0;
+ let slice_reset = (options & H263DEC_OPT_SLICE_RESET) != 0;
+ let may_have_b_frames = (options & H263DEC_OPT_HAS_B_FRAMES) != 0;
H263BaseDecoder{
w: 0, h: 0, mb_w: 0, mb_h: 0, num_mb: 0,
ftype: Type::Special,
is_gob, slice_reset,
may_have_b_frames,
mv_data: Vec::new(),
+ blk: [[0; 64]; 6],
}
}
pub fn new(is_gob: bool) -> Self {
- Self::new_with_opts(is_gob, true, false)
+ Self::new_with_opts(H263DEC_OPT_SLICE_RESET | (if is_gob { H263DEC_OPT_USES_GOB } else { 0 }))
}
pub fn new_b_frames(is_gob: bool) -> Self {
- Self::new_with_opts(is_gob, true, true)
+ Self::new_with_opts(H263DEC_OPT_SLICE_RESET | H263DEC_OPT_HAS_B_FRAMES | (if is_gob { H263DEC_OPT_USES_GOB } else { 0 }))
}
pub fn is_intra(&self) -> bool { self.ftype == Type::I }
}
pub fn get_dimensions(&self) -> (usize, usize) { (self.w, self.h) }
+ fn decode_intra_mb(&mut self, bd: &mut BlockDecoder, bdsp: &BlockDSP, mb_pos: usize, binfo: &BlockInfo, sstate: &SliceState, apply_acpred: bool) -> DecoderResult<()> {
+ for i in 0..6 {
+ bd.decode_block_intra(&binfo, &sstate, binfo.get_q(), i, (binfo.cbp & (1 << (5 - i))) != 0, &mut self.blk[i])?;
+ if apply_acpred && (binfo.acpred != ACPredMode::None) {
+ let has_b = (i == 1) || (i == 3) || !sstate.first_mb;
+ let has_a = (i == 2) || (i == 3) || !sstate.first_line;
+ 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;
+ }
+ self.blk[i][0] = clip_dc(self.blk[i][0] + dc);
+ },
+ ACPredMode::Hor => {
+ if has_b {
+ for k in 0..8 {
+ self.blk[i][k * 8] += self.pred_coeffs[b_mb].hor[b_blk][k];
+ }
+ for k in 1..8 {
+ self.blk[i][k * 8] = clip_ac(self.blk[i][k * 8]);
+ }
+ } else {
+ self.blk[i][0] += 1024;
+ }
+ self.blk[i][0] = clip_dc(self.blk[i][0]);
+ },
+ ACPredMode::Ver => {
+ if has_a {
+ for k in 0..8 {
+ self.blk[i][k] += self.pred_coeffs[a_mb].ver[a_blk][k];
+ }
+ for k in 1..8 {
+ self.blk[i][k] = clip_ac(self.blk[i][k]);
+ }
+ } else {
+ self.blk[i][0] += 1024;
+ }
+ self.blk[i][0] = clip_dc(self.blk[i][0]);
+ },
+ ACPredMode::None => {},
+ };
+ for t in 0..8 { self.pred_coeffs[mb_pos].hor[i][t] = self.blk[i][t * 8]; }
+ for t in 0..8 { self.pred_coeffs[mb_pos].ver[i][t] = self.blk[i][t]; }
+ }
+ bdsp.idct(&mut self.blk[i]);
+ }
+ Ok(())
+ }
+ fn decode_inter_mb(&mut self, bd: &mut BlockDecoder, bdsp: &BlockDSP, binfo: &BlockInfo, sstate: &SliceState) -> DecoderResult<()> {
+ for i in 0..6 {
+ bd.decode_block_inter(&binfo, &sstate, binfo.get_q(), i, ((binfo.cbp >> (5 - i)) & 1) != 0, &mut self.blk[i])?;
+ bdsp.idct(&mut self.blk[i]);
+ }
+ Ok(())
+ }
pub fn parse_frame(&mut self, bd: &mut BlockDecoder, bdsp: &BlockDSP) -> DecoderResult<NABufferType> {
let pinfo = bd.decode_pichdr()?;
let mut mvi = MVInfo::new();
}
let is_b = pinfo.mode == Type::B;
+ if is_b && (self.mv_data.len() < self.mb_w * self.mb_h) {
+ return Err(DecoderError::MissingReference);
+ }
+
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 }
}
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;
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; } }
+ self.blk = [[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 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) {
- let has_b = (i == 1) || (i == 3) || !sstate.first_mb;
- let has_a = (i == 2) || (i == 3) || !sstate.first_line;
- 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]; }
- }
- bdsp.idct(&mut blk[i]);
- }
- blockdsp::put_blocks(&mut buf, mb_x, mb_y, &blk);
+ self.decode_intra_mb(bd, bdsp, mb_pos, &binfo, &sstate, apply_acpred)?;
+ blockdsp::put_blocks(&mut buf, mb_x, mb_y, &self.blk);
mvi.set_zero_mv(mb_x);
if is_b {
mvi2.set_zero_mv(mb_x);
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);
+ bdsp.copy_blocks(&mut buf, srcbuf.clone(), mb_x * 16, mb_y * 16, mv);
}
if pinfo.is_pb() {
mvi2.predict(mb_x, 0, false, binfo.get_mv(0), sstate.first_line, sstate.first_mb);
let mut mv: [MV; 4] = [ZERO_MV, ZERO_MV, ZERO_MV, ZERO_MV];
for blk_no in 0..4 {
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[blk_no]);
- }
+ }
+ if let Some(ref srcbuf) = self.ipbs.get_lastref() {
+ bdsp.copy_blocks8x8(&mut buf, srcbuf.clone(), mb_x * 16, mb_y * 16, &mv);
}
if pinfo.is_pb() {
for blk_no in 0..4 {
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])?;
- bdsp.idct(&mut blk[i]);
- }
- blockdsp::add_blocks(&mut buf, mb_x, mb_y, &blk);
+ self.decode_inter_mb(bd, bdsp, &binfo, &sstate)?;
+ blockdsp::add_blocks(&mut buf, mb_x, mb_y, &self.blk);
if is_b && !pinfo.is_pb() {
mvi2.set_zero_mv(mb_x);
}
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);
+ bdsp.copy_blocks(&mut buf, srcbuf.clone(), mb_x * 16, mb_y * 16, ZERO_MV);
}
} else {
- 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);
- }
+ recon_b_mb(&mut buf, &mut self.ipbs, bdsp, &mut mvi, &mut mvi2, mb_pos, self.mb_w, &sstate, &binfo, &self.mv_data, bsdiff, tsdiff);
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])?;
- bdsp.idct(&mut blk[i]);
- }
- blockdsp::add_blocks(&mut buf, mb_x, mb_y, &blk);
+ self.decode_inter_mb(bd, bdsp, &binfo, &sstate)?;
+ blockdsp::add_blocks(&mut buf, mb_x, mb_y, &self.blk);
}
}
if pinfo.is_pb() {
let fmt = formats::YUV420_FORMAT;
let vinfo = NAVideoInfo::new(self.w, self.h, false, fmt);
let bufinfo = alloc_video_buffer(vinfo, 4)?;
- let mut b_buf = bufinfo.get_vbuf().unwrap();
+ let 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, fwd_buf, bck_buf, self.mb_w, self.mb_h, self.b_data.as_slice(), bdsp);
+ recon_b_frame(b_buf, fwd_buf.clone(), bck_buf.clone(), self.mb_w, self.mb_h, self.b_data.as_slice(), bdsp);
}
self.b_data.truncate(0);
}
}
-fn recon_b_frame(b_buf: &mut NAVideoBuffer<u8>, bck_buf: &NAVideoBuffer<u8>, fwd_buf: &NAVideoBuffer<u8>,
+fn recon_b_mb(buf: &mut NAVideoBuffer<u8>, ipbs: &mut IPBShuffler, bdsp: &BlockDSP, mvi: &mut MVInfo, mvi2: &mut MVInfo, mb_pos: usize, mb_w: usize, sstate: &SliceState, binfo: &BlockInfo, mv_data: &[BlockMVInfo], bsdiff: u16, tsdiff: u16) {
+ let mb_x = mb_pos % mb_w;
+ let mb_y = mb_pos / mb_w;
+
+ let ref_mv_info = mv_data[mb_pos];
+ let has_fwd = binfo.get_num_mvs() > 0;
+ let has_bwd = binfo.get_num_mvs2() > 0;
+
+ 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)) = (ipbs.get_nextref(), ipbs.get_lastref()) {
+ if has_fwd && has_bwd {
+ bdsp.copy_blocks(buf, fwd_buf.clone(), mb_x * 16, mb_y * 16, fwd_mv);
+ bdsp.avg_blocks (buf, bck_buf.clone(), mb_x * 16, mb_y * 16, bwd_mv);
+ } else if has_fwd {
+ bdsp.copy_blocks(buf, fwd_buf.clone(), mb_x * 16, mb_y * 16, fwd_mv);
+ } else {
+ bdsp.copy_blocks(buf, bck_buf.clone(), mb_x * 16, mb_y * 16, bwd_mv);
+ }
+ }
+ } else {
+ if let BlockMVInfo::Inter_4MV(mvs) = ref_mv_info {
+ let mut mv_f = [ZERO_MV; 4];
+ let mut mv_b = [ZERO_MV; 4];
+ 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;
+ mv_f[blk_no] = ref_mv_fwd;
+ mv_b[blk_no] = ref_mv_bwd;
+ }
+ if let (Some(ref fwd_buf), Some(ref bck_buf)) = (ipbs.get_nextref(), ipbs.get_lastref()) {
+ bdsp.copy_blocks8x8(buf, fwd_buf.clone(), mb_x * 16, mb_y * 16, &mv_f);
+ bdsp.avg_blocks8x8 (buf, bck_buf.clone(), mb_x * 16, mb_y * 16, &mv_b);
+ }
+ } 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)) = (ipbs.get_nextref(), ipbs.get_lastref()) {
+ bdsp.copy_blocks(buf, fwd_buf.clone(), mb_x * 16, mb_y * 16, ref_mv_fwd);
+ bdsp.avg_blocks (buf, bck_buf.clone(), mb_x * 16, mb_y * 16, ref_mv_bwd);
+ }
+ }
+ mvi.set_zero_mv(mb_x);
+ mvi2.set_zero_mv(mb_x);
+ }
+}
+
+fn recon_b_frame(mut b_buf: NAVideoBufferRef<u8>, bck_buf: NAVideoBufferRef<u8>, fwd_buf: NAVideoBufferRef<u8>,
mb_w: usize, mb_h: usize, b_data: &[BMB], bdsp: &BlockDSP) {
let mut cbpi = CBPInfo::new();
let mut cur_mb = 0;
let cbp = b_data[cur_mb].cbp;
cbpi.set_cbp(mb_x, cbp);
if num_mv == 1 {
- bdsp.copy_blocks(b_buf, fwd_buf, mb_x * 16, mb_y * 16, 16, 16, b_data[cur_mb].mv_b[0]);
+ bdsp.copy_blocks(&mut b_buf, fwd_buf.clone(), mb_x * 16, mb_y * 16, b_data[cur_mb].mv_b[0]);
if !is_fwd {
- bdsp.avg_blocks(b_buf, bck_buf, mb_x * 16, mb_y * 16, 16, 16, b_data[cur_mb].mv_f[0]);
+ bdsp.avg_blocks(&mut b_buf, bck_buf.clone(), mb_x * 16, mb_y * 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;
- bdsp.copy_blocks(b_buf, fwd_buf, xpos, ypos, 8, 8, b_data[cur_mb].mv_b[blk_no]);
- if !is_fwd {
- bdsp.avg_blocks(b_buf, bck_buf, xpos, ypos, 8, 8, b_data[cur_mb].mv_f[blk_no]);
- }
+ bdsp.copy_blocks8x8(&mut b_buf, fwd_buf.clone(), mb_x * 16, mb_y * 16, &b_data[cur_mb].mv_b);
+ if !is_fwd {
+ bdsp.avg_blocks8x8(&mut b_buf, bck_buf.clone(), mb_x * 16, mb_y * 16, &b_data[cur_mb].mv_f);
}
}
if cbp != 0 {
- blockdsp::add_blocks(b_buf, mb_x, mb_y, &b_data[cur_mb].blk);
+ blockdsp::add_blocks(&mut b_buf, mb_x, mb_y, &b_data[cur_mb].blk);
}
cur_mb += 1;
}
projects / nihav.git / blobdiff