X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-itu%2Fsrc%2Fcodecs%2Fh264%2Fmod.rs;h=e8d46c60c982fc20b7fc4904a5b6fb63d83dcf11;hb=38df3d11b3686cbd6982cc073a7c55c6c1043461;hp=3034e0768608feb4fba3679de15d61ad97216bc6;hpb=886cde4847280b96e10d240c2f2d76abec121dc8;p=nihav.git diff --git a/nihav-itu/src/codecs/h264/mod.rs b/nihav-itu/src/codecs/h264/mod.rs index 3034e07..e8d46c6 100644 --- a/nihav-itu/src/codecs/h264/mod.rs +++ b/nihav-itu/src/codecs/h264/mod.rs @@ -1,6 +1,5 @@ /* known bugs and limitations: - * weighted motion compensation is not implemented * wrong slice boundary filtering * not fully correct deblock strength selection for P/B-macroblocks * scaling lists for 4x4 blocks @@ -29,6 +28,8 @@ mod cavlc; use cavlc::*; mod loopfilter; use loopfilter::*; +mod mb_recon; +use mb_recon::*; mod sets; use sets::*; mod slice; @@ -186,7 +187,7 @@ struct H264Decoder { ipcm_buf: [u8; 256 + 64 + 64], - avg_buf: NAVideoBufferRef, + mc_dsp: H264MC, transform_8x8_mode: bool, } @@ -253,7 +254,7 @@ impl H264Decoder { ipcm_buf: [0; 256 + 64 + 64], - avg_buf, + mc_dsp: H264MC::new(avg_buf), transform_8x8_mode: false, } @@ -314,6 +315,7 @@ println!(" chroma fmt {} bits {}/{}", sps.chroma_format_idc, sps.bit_depth_luma, self.width = sps.pic_width_in_mbs << 4; self.height = sps.pic_height_in_mbs << 4; self.num_mbs = sps.pic_width_in_mbs * sps.pic_height_in_mbs; + self.mc_dsp.set_dimensions(self.width, self.height); self.is_mbaff = sps.mb_adaptive_frame_field && !slice_hdr.field_pic; if self.is_mbaff { @@ -398,15 +400,6 @@ println!("PAFF?"); let mut cabac = CABAC::new(csrc, slice_hdr.slice_type, slice_hdr.slice_qp, slice_hdr.cabac_init_idc as usize)?; self.has_pic = self.decode_slice_cabac(&mut cabac, &slice_hdr)?; } - if !self.deblock_skip && self.deblock_mode != 1 { - if let Some(ref mut pic) = self.cur_pic { - let mut frm = NASimpleVideoFrame::from_video_buf(&mut pic.buf).unwrap(); - if self.sstate.mb_x != 0 { - loop_filter_row(&mut frm, &self.sstate, self.lf_alpha, self.lf_beta); - } - loop_filter_last(&mut frm, &self.sstate, self.lf_alpha, self.lf_beta); - } - } }, 2 => { // slice data partition A //slice header @@ -456,156 +449,14 @@ println!("PAFF?"); Ok(()) } - fn pred_intra(frm: &mut NASimpleVideoFrame, sstate: &SliceState, mb_info: &CurrentMBInfo) { - let yoff = frm.offset[0] + sstate.mb_x * 16 + sstate.mb_y * 16 * frm.stride[0]; - match mb_info.mb_type { - MBType::Intra16x16(imode, _, _) => { - let id = if imode != 2 || (sstate.has_top && sstate.has_left) { - imode as usize - } else if !sstate.has_top && !sstate.has_left { - IPRED8_DC128 - } else if !sstate.has_left { - IPRED8_DC_TOP - } else { - IPRED8_DC_LEFT - }; - IPRED_FUNCS16X16[id](frm.data, yoff, frm.stride[0]); - }, - MBType::Intra8x8 => { - let mut ictx = IPred8Context::new(); - for part in 0..4 { - let x = (part & 1) * 2; - let y = part & 2; - let blk4 = x + y * 4; - - let cur_yoff = yoff + x * 4 + y * 4 * frm.stride[0]; - let has_top = y > 0 || sstate.has_top; - let has_left = x > 0 || sstate.has_left; - let imode = mb_info.ipred[blk4]; - let id = if imode != IntraPredMode::DC || (has_top && has_left) { - let im_id: u8 = imode.into(); - im_id as usize - } else if !has_top && !has_left { - IPRED4_DC128 - } else if !has_left { - IPRED4_DC_TOP - } else { - IPRED4_DC_LEFT - }; - let mb_idx = sstate.mb_x + sstate.mb_y * sstate.mb_w; - let noright = (y == 2 || sstate.mb_x == sstate.mb_w - 1 || mb_idx < sstate.mb_start + sstate.mb_w) && (x == 2); - let has_tl = (has_top && x > 0) || (has_left && y > 0) || (x == 0 && y == 0 && sstate.mb_x > 0 && mb_idx > sstate.mb_start + sstate.mb_w); - if id != IPRED4_DC128 { - ictx.fill(frm.data, cur_yoff, frm.stride[0], has_top, has_top && !noright, has_left, has_tl); - } - IPRED_FUNCS8X8_LUMA[id](&mut frm.data[cur_yoff..], frm.stride[0], &ictx); - if mb_info.coded[blk4] { - add_coeffs8(frm.data, cur_yoff, frm.stride[0], &mb_info.coeffs8x8[part].coeffs); - } - } - }, - MBType::Intra4x4 => { - for &(x,y) in I4X4_SCAN.iter() { - let x = x as usize; - let y = y as usize; - let cur_yoff = yoff + x * 4 + y * 4 * frm.stride[0]; - let has_top = y > 0 || sstate.has_top; - let has_left = x > 0 || sstate.has_left; - let imode = mb_info.ipred[x + y * 4]; - let id = if imode != IntraPredMode::DC || (has_top && has_left) { - let im_id: u8 = imode.into(); - im_id as usize - } else if !has_top && !has_left { - IPRED4_DC128 - } else if !has_left { - IPRED4_DC_TOP - } else { - IPRED4_DC_LEFT - }; - let noright = (sstate.mb_x == sstate.mb_w - 1 || sstate.mb_x + sstate.mb_y * sstate.mb_w < sstate.mb_start + sstate.mb_w) && (x == 3); - let tr: [u8; 4] = if y == 0 { - if has_top && !noright { - let i = cur_yoff - frm.stride[0]; - [frm.data[i + 4], frm.data[i + 5], frm.data[i + 6], frm.data[i + 7]] - } else if has_top { - let i = cur_yoff - frm.stride[0]; - [frm.data[i + 3], frm.data[i + 3], frm.data[i + 3], frm.data[i + 3]] - } else { - [0; 4] - } - } else if (x & 1) == 0 || (x == 1 && y == 2) { - let i = cur_yoff - frm.stride[0]; - [frm.data[i + 4], frm.data[i + 5], frm.data[i + 6], frm.data[i + 7]] - } else { - let i = cur_yoff - frm.stride[0]; - [frm.data[i + 3], frm.data[i + 3], frm.data[i + 3], frm.data[i + 3]] - }; - IPRED_FUNCS4X4[id](frm.data, cur_yoff, frm.stride[0], &tr); - if mb_info.coded[x + y * 4] { - add_coeffs(frm.data, cur_yoff, frm.stride[0], &mb_info.coeffs[x + y * 4]); - } - } - }, - _ => unreachable!(), - }; - let id = if mb_info.chroma_ipred != 0 || (sstate.has_top && sstate.has_left) { - mb_info.chroma_ipred as usize - } else if !sstate.has_top && !sstate.has_left { - IPRED8_DC128 - } else if !sstate.has_left { - IPRED8_DC_TOP - } else { - IPRED8_DC_LEFT - }; - for chroma in 1..3 { - let off = frm.offset[chroma] + sstate.mb_x * 8 + sstate.mb_y * 8 * frm.stride[chroma]; - IPRED_FUNCS8X8_CHROMA[id](frm.data, off, frm.stride[chroma]); - } - } - fn add_luma(frm: &mut NASimpleVideoFrame, sstate: &SliceState, mb_info: &CurrentMBInfo) { - let mut yoff = frm.offset[0] + sstate.mb_x * 16 + sstate.mb_y * 16 * frm.stride[0]; - if !mb_info.transform_size_8x8 { - for y in 0..4 { - for x in 0..4 { - if mb_info.coded[x + y * 4] { - add_coeffs(frm.data, yoff + x * 4, frm.stride[0], &mb_info.coeffs[x + y * 4]); - } - } - yoff += frm.stride[0] * 4; - } - } else { - for y in 0..2 { - for x in 0..2 { - if mb_info.coded[x * 2 + y * 2 * 4] { - add_coeffs8(frm.data, yoff + x * 8, frm.stride[0], &mb_info.coeffs8x8[x + y * 2].coeffs); - } - } - yoff += frm.stride[0] * 8; - } - } - } - fn add_chroma(frm: &mut NASimpleVideoFrame, sstate: &SliceState, mb_info: &CurrentMBInfo) { - for chroma in 1..3 { - let mut off = frm.offset[chroma] + sstate.mb_x * 8 + sstate.mb_y * 8 * frm.stride[chroma]; - for y in 0..2 { - for x in 0..2 { - let blk_no = 16 + (chroma - 1) * 4 + x + y * 2; - if mb_info.coded[blk_no] || mb_info.coeffs[blk_no][0] != 0 { - add_coeffs(frm.data, off + x * 4, frm.stride[chroma], &mb_info.coeffs[blk_no]); - } - } - off += frm.stride[chroma] * 4; - } - } - } - fn pred_mv(sstate: &mut SliceState, frame_refs: &FrameRefs, mb_info: &mut CurrentMBInfo, cur_id: u16, temporal_mv: bool) { + fn pred_mv(sstate: &mut SliceState, frame_refs: &FrameRefs, mb_info: &mut CurrentMBInfo, cur_id: u16, temporal_mv: bool, direct_8x8: bool) { let mb_type = mb_info.mb_type; if !mb_type.is_4x4() { let (pw, ph) = mb_type.size(); let mut xoff = 0; let mut yoff = 0; if mb_type == MBType::Direct || mb_type == MBType::BSkip { - sstate.predict_direct_mb(frame_refs, temporal_mv, cur_id); + sstate.predict_direct_mb(frame_refs, temporal_mv, direct_8x8, cur_id); } for part in 0..mb_type.num_parts() { if !mb_type.is_l1(part) { @@ -645,7 +496,7 @@ println!("PAFF?"); } } else { for sblk in 0..4 { - sstate.predict_direct_sub(frame_refs, temporal_mv, cur_id, (xoff / 4) + (sblk & 1) + (yoff / 4) * 4 + (sblk & 2) * 2); + sstate.predict_direct_sub(frame_refs, temporal_mv, direct_8x8, cur_id, (xoff / 4) + (sblk & 1) + (yoff / 4) * 4 + (sblk & 2) * 2); } } xoff += pw; @@ -658,7 +509,7 @@ println!("PAFF?"); } } #[allow(clippy::cognitive_complexity)] - fn handle_macroblock(&mut self, mb_info: &mut CurrentMBInfo) { + fn handle_macroblock(&mut self, slice_hdr: &SliceHeader, mb_info: &mut CurrentMBInfo) { let pps = &self.pps[self.cur_pps]; let qp_y = mb_info.qp_y; @@ -725,7 +576,7 @@ println!("PAFF?"); self.sstate.reset_mb_mv(); } if !mb_info.mb_type.is_intra() { - Self::pred_mv(&mut self.sstate, &self.frame_refs, mb_info, self.cur_id, self.temporal_mv); + Self::pred_mv(&mut self.sstate, &self.frame_refs, mb_info, self.cur_id, self.temporal_mv, self.sps[self.cur_sps].direct_8x8_inference); } if !pps.constrained_intra_pred && mb_info.mb_type != MBType::Intra4x4 && mb_info.mb_type != MBType::Intra8x8 { self.sstate.fill_ipred(IntraPredMode::DC); @@ -735,172 +586,16 @@ println!("PAFF?"); let ypos = self.sstate.mb_y * 16; if let Some(ref mut pic) = self.cur_pic { let mut frm = NASimpleVideoFrame::from_video_buf(&mut pic.buf).unwrap(); - match mb_info.mb_type { - MBType::Intra16x16(_, _, _) => { - Self::pred_intra(&mut frm, &self.sstate, &mb_info); - }, - MBType::Intra4x4 | MBType::Intra8x8 => { - Self::pred_intra(&mut frm, &self.sstate, &mb_info); - }, - MBType::PCM => {}, - MBType::PSkip => { - let mv = self.sstate.get_cur_blk4(0).mv[0]; - let rpic = self.frame_refs.select_ref_pic(0, 0); - Self::do_p_mc(&mut frm, xpos, ypos, 16, 16, mv, rpic); - }, - MBType::P16x16 => { - let mv = self.sstate.get_cur_blk4(0).mv[0]; - let rpic = self.frame_refs.select_ref_pic(0, mb_info.ref_l0[0].index()); - Self::do_p_mc(&mut frm, xpos, ypos, 16, 16, mv, rpic); - }, - MBType::P16x8 | MBType::P8x16 => { - let (bw, bh, bx, by) = if mb_info.mb_type == MBType::P16x8 { - (16, 8, 0, 8) - } else { - (8, 16, 8, 0) - }; - let mv = self.sstate.get_cur_blk4(0).mv[0]; - let rpic = self.frame_refs.select_ref_pic(0, mb_info.ref_l0[0].index()); - Self::do_p_mc(&mut frm, xpos, ypos, bw, bh, mv, rpic); - let mv = self.sstate.get_cur_blk4(bx / 4 + by).mv[0]; - let rpic = self.frame_refs.select_ref_pic(0, mb_info.ref_l0[1].index()); - Self::do_p_mc(&mut frm, xpos + bx, ypos + by, bw, bh, mv, rpic); - }, - MBType::P8x8 | MBType::P8x8Ref0 => { - for part in 0..4 { - let bx = (part & 1) * 8; - let by = (part & 2) * 4; - if let Some(buf) = self.frame_refs.select_ref_pic(0, mb_info.ref_l0[part].index()) { - let mv = self.sstate.get_cur_blk4(bx / 4 + by).mv[0]; - - match mb_info.sub_mb_type[part] { - SubMBType::P8x8 => { - do_mc(&mut frm, buf, xpos + bx, ypos + by, 8, 8, mv); - }, - SubMBType::P8x4 => { - do_mc(&mut frm, buf.clone(), xpos + bx, ypos + by, 8, 4, mv); - let mv = self.sstate.get_cur_blk4(bx / 4 + by + 4).mv[0]; - do_mc(&mut frm, buf, xpos + bx, ypos + by + 4, 8, 4, mv); - }, - SubMBType::P4x8 => { - do_mc(&mut frm, buf.clone(), xpos + bx, ypos + by, 4, 8, mv); - let mv = self.sstate.get_cur_blk4(bx / 4 + by + 1).mv[0]; - do_mc(&mut frm, buf, xpos + bx + 4, ypos + by, 4, 8, mv); - }, - SubMBType::P4x4 => { - for sb_no in 0..4 { - let sxpos = xpos + bx + (sb_no & 1) * 4; - let sypos = ypos + by + (sb_no & 2) * 2; - let sblk_no = (bx / 4 + (sb_no & 1)) + ((by / 4) + (sb_no >> 1)) * 4; - let mv = self.sstate.get_cur_blk4(sblk_no).mv[0]; - do_mc(&mut frm, buf.clone(), sxpos, sypos, 4, 4, mv); - } - }, - _ => unreachable!(), - }; - } else { - gray_block(&mut frm, xpos + bx, ypos + by, 8, 8); - } - } - }, - MBType::B16x16(mode) => { - let mv0 = self.sstate.get_cur_blk4(0).mv[0]; - let rpic0 = self.frame_refs.select_ref_pic(0, mb_info.ref_l0[0].index()); - let mv1 = self.sstate.get_cur_blk4(0).mv[1]; - let rpic1 = self.frame_refs.select_ref_pic(1, mb_info.ref_l1[0].index()); - Self::do_b_mc(&mut frm, mode, xpos, ypos, 16, 16, mv0, rpic0, mv1, rpic1, &mut self.avg_buf); - }, - MBType::B16x8(mode0, mode1) | MBType::B8x16(mode0, mode1) => { - let (pw, ph) = mb_info.mb_type.size(); - let (px, py) = (pw & 8, ph & 8); - let modes = [mode0, mode1]; - let (mut bx, mut by) = (0, 0); - for part in 0..2 { - let blk = if part == 0 { 0 } else { (px / 4) + py }; - let mv0 = self.sstate.get_cur_blk4(blk).mv[0]; - let rpic0 = self.frame_refs.select_ref_pic(0, mb_info.ref_l0[part].index()); - let mv1 = self.sstate.get_cur_blk4(blk).mv[1]; - let rpic1 = self.frame_refs.select_ref_pic(1, mb_info.ref_l1[part].index()); - Self::do_b_mc(&mut frm, modes[part], xpos + bx, ypos + by, pw, ph, mv0, rpic0, mv1, rpic1, &mut self.avg_buf); - bx += px; - by += py; - } - }, - MBType::Direct | MBType::BSkip => { - let is_16x16 = self.frame_refs.get_colocated_info(self.sstate.mb_x, self.sstate.mb_y).0.mb_type.is_16x16(); - if is_16x16 || !self.temporal_mv { - let mv = self.sstate.get_cur_blk4(0).mv; - let ref_idx = self.sstate.get_cur_blk8(0).ref_idx; - let rpic0 = self.frame_refs.select_ref_pic(0, ref_idx[0].index()); - let rpic1 = self.frame_refs.select_ref_pic(1, ref_idx[1].index()); - Self::do_b_mc(&mut frm, BMode::Bi, xpos, ypos, 16, 16, mv[0], rpic0, mv[1], rpic1, &mut self.avg_buf); + if mb_info.mb_type != MBType::PCM { + let weight_mode = if self.pps[self.cur_pps].weighted_pred && slice_hdr.slice_type.is_p() { + 1 + } else if slice_hdr.slice_type.is_b() { + self.pps[self.cur_pps].weighted_bipred_idc } else { - for blk4 in 0..16 { - let mv = self.sstate.get_cur_blk4(blk4).mv; - let ref_idx = self.sstate.get_cur_blk8(blk4_to_blk8(blk4)).ref_idx; - let rpic0 = self.frame_refs.select_ref_pic(0, ref_idx[0].index()); - let rpic1 = self.frame_refs.select_ref_pic(1, ref_idx[1].index()); - Self::do_b_mc(&mut frm, BMode::Bi, xpos + (blk4 & 3) * 4, ypos + (blk4 >> 2) * 4, 4, 4, mv[0], rpic0, mv[1], rpic1, &mut self.avg_buf); - } - } - self.sstate.apply_to_blk8(|blk8| { blk8.ref_idx[0].set_direct(); blk8.ref_idx[1].set_direct(); }); - }, - MBType::B8x8 => { - for part in 0..4 { - let ridx = self.sstate.get_cur_blk8(part).ref_idx; - let rpic0 = self.frame_refs.select_ref_pic(0, ridx[0].index()); - let rpic1 = self.frame_refs.select_ref_pic(1, ridx[1].index()); - let subtype = mb_info.sub_mb_type[part]; - let blk8 = (part & 1) * 2 + (part & 2) * 4; - let mut bx = (part & 1) * 8; - let mut by = (part & 2) * 4; - match subtype { - SubMBType::Direct8x8 => { - for blk in 0..4 { - let mv = self.sstate.get_cur_blk4(bx / 4 + (by / 4) * 4).mv; - let ref_idx = self.sstate.get_cur_blk8(bx / 8 + (by / 8) * 2).ref_idx; - let rpic0 = self.frame_refs.select_ref_pic(0, ref_idx[0].index()); - let rpic1 = self.frame_refs.select_ref_pic(1, ref_idx[1].index()); - Self::do_b_mc(&mut frm, BMode::Bi, xpos + bx, ypos + by, 4, 4, mv[0], rpic0, mv[1], rpic1, &mut self.avg_buf); - bx += 4; - if blk == 1 { - bx -= 8; - by += 4; - } - } - self.sstate.get_cur_blk8(part).ref_idx[0].set_direct(); - self.sstate.get_cur_blk8(part).ref_idx[1].set_direct(); - }, - SubMBType::B8x8(mode) => { - let mv = self.sstate.get_cur_blk4(blk8).mv; - Self::do_b_mc(&mut frm, mode, xpos + bx, ypos + by, 8, 8, mv[0], rpic0, mv[1], rpic1, &mut self.avg_buf); - }, - SubMBType::B8x4(mode) | SubMBType::B4x8(mode) => { - let (pw, ph) = subtype.size(); - let mv = self.sstate.get_cur_blk4(blk8).mv; - Self::do_b_mc(&mut frm, mode, xpos + bx, ypos + by, pw, ph, mv[0], rpic0.clone(), mv[1], rpic1.clone(), &mut self.avg_buf); - let addr2 = blk8 + (pw & 4) / 4 + (ph & 4); - let mv = self.sstate.get_cur_blk4(addr2).mv; - Self::do_b_mc(&mut frm, mode, xpos + bx + (pw & 4), ypos + by + (ph & 4), pw, ph, mv[0], rpic0, mv[1], rpic1, &mut self.avg_buf); - }, - SubMBType::B4x4(mode) => { - for i in 0..4 { - let addr2 = blk8 + (i & 1) + (i & 2) * 2; - let mv = self.sstate.get_cur_blk4(addr2).mv; - Self::do_b_mc(&mut frm, mode, xpos + bx, ypos + by, 4, 4, mv[0], rpic0.clone(), mv[1], rpic1.clone(), &mut self.avg_buf); - bx += 4; - if i == 1 { - bx -= 8; - by += 4; - } - } - }, - _ => unreachable!(), - }; - } - }, - }; - if mb_info.mb_type == MBType::PCM { + 0 + }; + recon_mb(&mut frm, slice_hdr, mb_info, &mut self.sstate, &self.frame_refs, &mut self.mc_dsp, weight_mode); + } else { for (dline, src) in frm.data[frm.offset[0] + xpos + ypos * frm.stride[0]..].chunks_mut(frm.stride[0]).take(16).zip(self.ipcm_buf.chunks(16)) { dline[..16].copy_from_slice(src); } @@ -910,11 +605,6 @@ println!("PAFF?"); for (dline, src) in frm.data[frm.offset[2] + xpos/2 + ypos/2 * frm.stride[2]..].chunks_mut(frm.stride[2]).take(8).zip(self.ipcm_buf[256 + 64..].chunks(8)) { dline[..8].copy_from_slice(src); } - } else if !mb_info.mb_type.is_skip() { - if mb_info.mb_type != MBType::Intra4x4 && mb_info.mb_type != MBType::Intra8x8 { - Self::add_luma(&mut frm, &self.sstate, &mb_info); - } - Self::add_chroma(&mut frm, &self.sstate, &mb_info); } /*match mb_info.mb_type { MBType::BSkip | MBType::Direct | MBType::B16x16(_) | MBType::B16x8(_, _) | MBType::B8x16(_, _) | MBType::B8x8 => { @@ -927,6 +617,7 @@ MBType::BSkip | MBType::Direct | MBType::B16x16(_) | MBType::B16x8(_, _) | MBTyp }, _ => {}, };*/ + self.sstate.save_ipred_context(&frm); } if let Some(ref mut pic) = self.cur_pic { let mv_info = &mut pic.mv_info; @@ -942,57 +633,15 @@ _ => {}, } mv_info.mbs[mb_pos] = mb; } - self.sstate.fill_deblock(self.deblock_mode, self.is_s); - if !self.deblock_skip && self.sstate.mb_x + 1 == self.sstate.mb_w && self.deblock_mode != 1 { + if !self.deblock_skip && self.deblock_mode != 1 { + self.sstate.fill_deblock(&self.frame_refs, self.deblock_mode, self.is_s); if let Some(ref mut pic) = self.cur_pic { let mut frm = NASimpleVideoFrame::from_video_buf(&mut pic.buf).unwrap(); - loop_filter_row(&mut frm, &self.sstate, self.lf_alpha, self.lf_beta); + loop_filter_mb(&mut frm, &self.sstate, self.lf_alpha, self.lf_beta); } } self.sstate.next_mb(); } - fn do_p_mc(frm: &mut NASimpleVideoFrame, xpos: usize, ypos: usize, w: usize, h: usize, mv: MV, ref_pic: Option>) { - if let Some(buf) = ref_pic { - do_mc(frm, buf, xpos, ypos, w, h, mv); - } else { - gray_block(frm, xpos, ypos, w, h); - } - } - fn do_b_mc(frm: &mut NASimpleVideoFrame, mode: BMode, xpos: usize, ypos: usize, w: usize, h: usize, mv0: MV, ref_pic0: Option>, mv1: MV, ref_pic1: Option>, avg_buf: &mut NAVideoBufferRef) { - match mode { - BMode::L0 => { - if let Some(buf) = ref_pic0 { - do_mc(frm, buf, xpos, ypos, w, h, mv0); - } else { - gray_block(frm, xpos, ypos, w, h); - } - }, - BMode::L1 => { - if let Some(buf) = ref_pic1 { - do_mc(frm, buf, xpos, ypos, w, h, mv1); - } else { - gray_block(frm, xpos, ypos, w, h); - } - }, - BMode::Bi => { - match (ref_pic0, ref_pic1) { - (Some(buf0), Some(buf1)) => { - do_mc(frm, buf0, xpos, ypos, w, h, mv0); - do_mc_avg(frm, buf1, xpos, ypos, w, h, mv1, avg_buf); - }, - (Some(buf0), None) => { - do_mc(frm, buf0, xpos, ypos, w, h, mv0); - }, - (None, Some(buf1)) => { - do_mc(frm, buf1, xpos, ypos, w, h, mv1); - }, - (None, None) => { - gray_block(frm, xpos, ypos, w, h); - }, - }; - }, - }; - } fn decode_slice_cavlc(&mut self, br: &mut BitReader, slice_hdr: &SliceHeader, full_size: usize) -> DecoderResult { const INTRA_CBP: [u8; 48] = [ 47, 31, 15, 0, 23, 27, 29, 30, 7, 11, 13, 14, 39, 43, 45, 46, @@ -1006,8 +655,7 @@ _ => {}, ]; let mut mb_idx = slice_hdr.first_mb_in_slice as usize; - let mut mb_info = CurrentMBInfo::default(); - mb_info.qp_y = slice_hdr.slice_qp; + let mut mb_info = CurrentMBInfo { qp_y: slice_hdr.slice_qp, ..Default::default() }; let skip_type = if slice_hdr.slice_type.is_p() { MBType::PSkip } else { MBType::BSkip }; while br.tell() < full_size && mb_idx < self.num_mbs { mb_info.coded = [false; 25]; @@ -1024,7 +672,7 @@ _ => {}, validate!(mb_idx + mb_skip_run <= self.num_mbs); mb_info.mb_type = skip_type; for _ in 0..mb_skip_run { - self.handle_macroblock(&mut mb_info); + self.handle_macroblock(slice_hdr, &mut mb_info); mb_idx += 1; } if mb_idx == self.num_mbs || br.tell() >= full_size { @@ -1090,7 +738,7 @@ _ => {}, decode_residual_cavlc(br, &mut self.sstate, &mut mb_info, &self.cavlc_cb)?; } } - self.handle_macroblock(&mut mb_info); + self.handle_macroblock(slice_hdr, &mut mb_info); } mb_idx += 1; } @@ -1105,8 +753,7 @@ _ => {}, let skip_type = if slice_hdr.slice_type.is_p() { MBType::PSkip } else { MBType::BSkip }; let mut last_qp_diff = false; - let mut mb_info = CurrentMBInfo::default(); - mb_info.qp_y = slice_hdr.slice_qp; + let mut mb_info = CurrentMBInfo { qp_y: slice_hdr.slice_qp, ..Default::default() }; while mb_idx < self.num_mbs { mb_info.coded = [false; 25]; @@ -1122,7 +769,7 @@ _ => {}, if self.is_mbaff && (((mb_idx & 1) == 0) || (prev_mb_skipped && ((mb_idx & 1) == 1))) { let _mb_field_decoding = cabac.decode_bit(70); } - let mut mb_type = cabac_decode_mb_type(cabac, &slice_hdr, &self.sstate); + let mut mb_type = cabac_decode_mb_type(cabac, slice_hdr, &self.sstate); mb_info.mb_type = mb_type; mb_info.transform_size_8x8 = false; if mb_type == MBType::PCM { @@ -1196,7 +843,7 @@ _ => {}, mb_info.transform_size_8x8 = false; last_qp_diff = false; } - self.handle_macroblock(&mut mb_info); + self.handle_macroblock(slice_hdr, &mut mb_info); prev_mb_skipped = mb_skip; if !(self.is_mbaff && ((mb_idx & 1) == 0)) && cabac.decode_terminate() { if let Some(ref mut pic) = self.cur_pic { @@ -1297,7 +944,6 @@ impl NADecoder for H264Decoder { Ok(()) } else { -println!("???"); Err(DecoderError::InvalidData) } } @@ -1477,31 +1123,31 @@ mod test { test_decoding("rawh264", "h264", "assets/ITU/h264-conformance/CABAST3_Sony_E.jsv", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ - [0x85fc4b44, 0xc9aefdc9, 0x568d0592, 0x2eccf9a0], - [0xbd8d11bc, 0x97acf592, 0x45a3cdbb, 0xa254a882], - [0xbda0e0b9, 0x9fbe1974, 0x1540b244, 0x46a050ca], - [0x471f0057, 0x125ef3b4, 0x4a87515f, 0xba254bbb], - [0x466a7df2, 0xb392c2a4, 0xed66b68b, 0xfdaad2da], - [0x96334b41, 0x41bac7ef, 0xe87154f1, 0xa5fc3551], - [0x0fd4e9b8, 0x4269bbec, 0x00a1978f, 0xe6224851], - [0x68be82af, 0x856615a7, 0x387a253d, 0x8473e6b9], - [0xc4bed119, 0x14ba7fe0, 0x447cb680, 0x555da4c5], - [0x85d127d6, 0x04b85928, 0x26740281, 0x4d848db5], - [0xe44fe461, 0x0d0b64ce, 0xf191179b, 0xabdab686], - [0x347c8edb, 0x847ad11f, 0x8f16b84e, 0xdc915d75], - [0xeb1364a6, 0x91c9d99d, 0x324f5427, 0xcc9f11a2], - [0x7aeb5a3f, 0xebc9c4dd, 0x8f12c8e4, 0x37a2db97], - [0xa11e5c33, 0x656df4c0, 0x1e8b98d8, 0x1736722f], - [0x239f2ef2, 0xe32b0603, 0x448366bb, 0x9331051c], - [0x1815a1b1, 0xfb7e7cf0, 0xd5c7dd5b, 0x0135a8fb], - [0xea3b85dd, 0xa96e7015, 0xa91c576d, 0x5c127ca1], - [0x1c49148f, 0x6d9e7045, 0x093f0b7c, 0x42c2ebaa], - [0x4b4c2863, 0x95709d8c, 0xeb72e251, 0x096632dc], - [0x727418e5, 0x2c015383, 0x59580212, 0x0302dd99], - [0xbe57dfa4, 0xf2aa7d70, 0xa068ee62, 0x77372861], - [0x2faef43a, 0x73da6654, 0xb9d9c22e, 0xc59520bc], - [0x138cff40, 0x3e6c108a, 0xa981e654, 0x903da85b], - [0xa90454f5, 0x7875d5db, 0xbab234bd, 0xe6ce1193]])); + [0xb5e5e368, 0x6ac59bfc, 0x82e35b7b, 0xbed17b81], + [0x8343b34d, 0x0de80ae9, 0xe9c08cc9, 0x05161d82], + [0x26e08b9b, 0x84949759, 0x71622124, 0x9bfff254], + [0x940c38bc, 0x559fb990, 0x2b82a7ca, 0x3543188a], + [0x60d7544d, 0x2fc8cc23, 0x4acac90f, 0x44c2a91c], + [0x68d86265, 0x15fc15b9, 0xe4946d83, 0x39d9584d], + [0xaed8e194, 0xa24b3a8a, 0xbed9085d, 0x05d68293], + [0x1cddffac, 0x0ce9d209, 0xc4090b8a, 0xc3008856], + [0x42ee0e5e, 0x4c1c3b64, 0xd91cc00b, 0x88be4b15], + [0x19a70aa8, 0xd8bc987d, 0x51c04849, 0x71191523], + [0x74532da6, 0xecb92919, 0xd39cb150, 0x9ca9933d], + [0x0444b315, 0x2ddfb91a, 0x1e21ce06, 0x0c8613e6], + [0xce209363, 0xf8d8331f, 0x72e0102f, 0x88de3a97], + [0xdbcfa40a, 0x7eed5940, 0xa5c53a66, 0xdfcd3cea], + [0x00796b14, 0x58f16117, 0xb6a5efd1, 0xfb129acd], + [0x7673f569, 0xfccfb96a, 0x1f614c82, 0xf62ea376], + [0x8669d98b, 0x9fdf4e7d, 0xa4083a7f, 0x9b66d296], + [0xf0537976, 0x924229ab, 0xd0f4612f, 0xad4b614e], + [0xbde82067, 0x6cf23a0c, 0xdd29e64d, 0xcaa72ff3], + [0xcfcb544a, 0x1f1a81b0, 0x2217108c, 0x4888d5ef], + [0x3369f874, 0x6a6dde75, 0x46d64780, 0xbf6ced32], + [0x253a1f45, 0x85954311, 0x983dbabe, 0x658f4ce3], + [0xec97b332, 0xa17b26d0, 0xbead22af, 0xa6bd7d8e], + [0x5673d973, 0x78528036, 0xabfe5e13, 0xdcedfb26], + [0xd6110fa9, 0x532d6a30, 0xb7f0aa7c, 0xae7b544b]])); } // mostly static music video downloaded with youtube-dl @@ -1553,30 +1199,30 @@ mod test { [0x9dbac04a, 0xc49ca8c1, 0x09bb9182, 0xc7928970], [0x9dbac04a, 0xc49ca8c1, 0x09bb9182, 0xc7928970], [0x9dbac04a, 0xc49ca8c1, 0x09bb9182, 0xc7928970], - [0xf1c88c12, 0x7da871f5, 0xdaf3153f, 0x66e72d72], - [0x3d4765f1, 0x8ac472f6, 0x7ffd13a6, 0xc7a45dae], - [0x60e5e13a, 0xd2d7f239, 0x1a793d71, 0x19f8c190], - [0xdd80c3e4, 0xb1500149, 0x43925280, 0x9e5f3230], - [0x2adf6e64, 0x39012d45, 0x7a776cb5, 0x3df76e84], - [0x44319007, 0xbc837dd2, 0x486b2703, 0x451d0651], - [0x922386ef, 0xaf101e9b, 0xf2094a40, 0xc8c454c0], - [0x0d81e398, 0x04192a56, 0xa31f39d0, 0x5e0a2deb], - [0xcdd144b3, 0xd1c7743e, 0x5753b0f4, 0xc070efa9], - [0xe1c67e39, 0x6065ddaf, 0x576bf9f1, 0x8e6825aa], - [0xaf817b0d, 0xdc6c345a, 0xf7f289c7, 0x6cc482d8], - [0x81dc4bcb, 0xee4fc5e5, 0x9b87c7ef, 0xdd0fb034], - [0x8b07f523, 0x4168799f, 0x990cb270, 0x858b9f2c], - [0x31855a80, 0xadbcc562, 0xe60628be, 0x5f04be09], - [0x9c614acc, 0xbd08a3f4, 0x91b02c45, 0x41899a83], - [0x89d09064, 0xbff810a3, 0x9c674179, 0x305225a6], - [0xba1fc8d3, 0x15d34fae, 0x565d363b, 0x4f4d0604], - [0x1cb15a1b, 0xa0be111e, 0x45cc801f, 0x01a2c691], - [0xd898be48, 0xd19bf58d, 0xe22fe44f, 0x6a2914fb], - [0xec6712af, 0xa13b55c0, 0x2915a746, 0xb29a5c48], - [0x745798fa, 0x4ef0f882, 0x59335c08, 0xb1d9dbb4], - [0x4045b495, 0xdb3d969c, 0x1f0d9220, 0x5a34067b], - [0x94fee093, 0x78ad89b3, 0xf20e882b, 0x941425db], - [0xc3eb1a78, 0x4b4e098a, 0xcbcf9bb4, 0xfd5b5426]])); + [0xc54f1b6e, 0xaba56a71, 0x8b45132b, 0x3c8bde7f], + [0xe2742374, 0x7b9d6fa6, 0xd57eb3bb, 0x42986664], + [0xa5ebdc2e, 0x9753a46a, 0x631c6359, 0x861ae0e3], + [0x4d2c8769, 0xb9e15141, 0x03274d1f, 0xc15a3733], + [0x17ebec8f, 0xe417571e, 0x75eb2559, 0x2f9b882b], + [0x148e8c97, 0x778f92ba, 0x93646539, 0xeebe643a], + [0xc6770caa, 0x1ac11a57, 0x1388a550, 0x2347758e], + [0x91eb3ae4, 0xaf664462, 0x858d344a, 0xda3baa79], + [0x4de79514, 0x3597aff0, 0x53e1a22f, 0x7875aa4c], + [0xd5afcf7c, 0xa0f4ce82, 0x21a70eb2, 0x3911cde1], + [0x9efa2a08, 0x29019ca6, 0xaba90890, 0xfb982857], + [0xc5755e20, 0x4c66cb54, 0x1194812e, 0x11a9d940], + [0xfd131bbb, 0x0acefb02, 0x6c79b7ab, 0x35bcdd26], + [0xad159db0, 0xfa65ced2, 0xf77e2b22, 0x9e6283a8], + [0xba2059e3, 0xc9f1e5e7, 0x7ea5fbcb, 0xf48d4fc3], + [0xbe794078, 0x64d69f9b, 0x7b6355c5, 0x7dfb5b0f], + [0x6031b77b, 0x712f42fd, 0x30d423df, 0x740e488c], + [0xcc475484, 0x30a664fc, 0x227a9725, 0x4b2bfb18], + [0x44bef2ea, 0xaf1e69e8, 0x832d94a8, 0xffb22712], + [0xe9471e3d, 0x103de80f, 0xdc44136f, 0x67dacaa8], + [0x4df3823d, 0xf6486ca9, 0x016f3114, 0x1c2d0b42], + [0x1171666b, 0x08ca0ced, 0x98719757, 0xbd6b4a86], + [0x9d2fc556, 0x5569fbbd, 0x0ebf629f, 0xd4fdc3b5], + [0x27dbd3c3, 0x803f0230, 0x13f2ff1b, 0xb661b622]])); } // a sample downloaded from gfycat.com #[test] @@ -1589,17 +1235,17 @@ mod test { test_decoding("mov", "h264", "assets/ITU/DimpledSpanishCuckoo-mobile.mp4", Some(10), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ - [0x1addcb8e, 0xde58b857, 0x17222c32, 0x75455fa8], - [0xae63141a, 0x79435b2e, 0xfe606c48, 0xf676da66], - [0xfdb80404, 0x6a288e23, 0x45cc4106, 0xdd5eb57c], - [0xd603a3ff, 0x872dcb9b, 0x43f7a71c, 0x2ad4eecc], - [0x639ed6a5, 0xbb1cfec6, 0x0ee5443a, 0x1694772a], - [0xf8ef3f48, 0x152de238, 0xb1995f9a, 0xf82ad1d5], - [0x604f6265, 0xb9d82f56, 0x21f00cf4, 0xc69c18a7], - [0xd932c16e, 0x25cbf060, 0xcb66543b, 0xfe8a5019], - [0xf2a3dac0, 0x0f4678dd, 0xf64c8228, 0x47f14676], - [0x267041ee, 0x3b6b8b64, 0x8bfe1697, 0x1fba508b], - [0x9f917e72, 0x75d882a9, 0xa5e3e684, 0x4ed87eff]])); + [0x674c6d60, 0xc7ab918d, 0x9db1beaf, 0xda9f2456], + [0x6a935350, 0x3d463ab2, 0xa3ab3c53, 0x97eb896b], + [0xf6c60411, 0x19ea2c49, 0x3512371a, 0xce6cb26a], + [0xc87afeaa, 0x79899908, 0x152e6320, 0xe689827f], + [0xa3d829e3, 0xb404dd32, 0x11983613, 0xbdf10ee6], + [0x2440ea01, 0x5b9d7fc7, 0x4fa5632b, 0xd2d76090], + [0xd80e8bf9, 0xe9190ab7, 0x2be8fa38, 0xb94182e8], + [0x50b9fd9a, 0x64393126, 0xd03162ec, 0xfb54172a], + [0x80d1f58f, 0x12e454c0, 0x2140ca5c, 0xe19350ba], + [0x26078d38, 0xf6a59d57, 0xcd14eaf8, 0x8eb08259], + [0x31494337, 0x6f8d3f52, 0x4bc9ff92, 0x0c601b1c]])); } }