X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-itu%2Fsrc%2Fcodecs%2Fh264%2Fdecoder_st.rs;h=7e8b83a8187777cc0a62a1ce51e2aaf250d90fa0;hb=754ab49a62c862e8c6e66ec88bb7ad626247140e;hp=3cffc6a278c04f3dae0d6e27513b3e7d9f54d353;hpb=56a17e69f584e41c2bfd2cb808b812be6b8796e5;p=nihav.git diff --git a/nihav-itu/src/codecs/h264/decoder_st.rs b/nihav-itu/src/codecs/h264/decoder_st.rs index 3cffc6a..7e8b83a 100644 --- a/nihav-itu/src/codecs/h264/decoder_st.rs +++ b/nihav-itu/src/codecs/h264/decoder_st.rs @@ -1,3 +1,5 @@ +use std::sync::Arc; + use nihav_core::codecs::*; use nihav_core::io::bitreader::*; @@ -9,9 +11,9 @@ struct H264Decoder { height: usize, num_mbs: usize, nal_len: u8, - sps: Vec, + sps: Vec>, cur_sps: usize, - pps: Vec, + pps: Vec>, cur_pps: usize, skip_mode: FrameSkipMode, @@ -104,7 +106,7 @@ impl H264Decoder { let mut br = BitReader::new(&src[..(full_size + 7)/8], BitReaderMode::BE); br.skip(8)?; - let slice_hdr = parse_slice_header(&mut br, &self.sps, &self.pps, is_idr, nal_ref_idc)?; + let slice_hdr = parse_slice_header(&mut br, self.sps.as_slice(), self.pps.as_slice(), is_idr, nal_ref_idc)?; validate!(br.tell() < full_size); let full_id; if slice_hdr.first_mb_in_slice == 0 { @@ -201,12 +203,15 @@ println!("PAFF?"); self.cur_pic = Some(PictureInfo { id: slice_hdr.frame_num, full_id, + user_id: full_id, + time: NATimeInfo::new(None, None, None, 0, 0), pic_type: slice_hdr.slice_type.to_frame_type(), buf, cur_mb: 0, is_ref: nal_ref_idc != 0, + is_idr, long_term: get_long_term_id(is_idr, &slice_hdr), - mv_info: FrameMV::new(sps.pic_width_in_mbs, sps.pic_height_in_mbs), + mv_info: NABufferRef::new(FrameMV::new(sps.pic_width_in_mbs, sps.pic_height_in_mbs)), }); } @@ -217,7 +222,7 @@ println!("PAFF?"); self.has_pic = self.decode_slice_cavlc(&mut br, &slice_hdr, full_size)?; } else { br.align(); - let start = (br.tell() / 8) as usize; + let start = br.tell() / 8; let csrc = &src[start..]; validate!(csrc.len() >= 2); let mut cabac = CABAC::new(csrc, slice_hdr.slice_type, slice_hdr.slice_qp, slice_hdr.cabac_init_idc as usize)?; @@ -245,7 +250,7 @@ println!("PAFF?"); 6 => {}, //SEI 7 => { let sps = parse_sps(&src[1..])?; - self.sps.push(sps); + self.sps.push(Arc::new(sps)); }, 8 => { validate!(full_size >= 8 + 16); @@ -253,7 +258,7 @@ println!("PAFF?"); let mut found = false; for stored_pps in self.pps.iter_mut() { if stored_pps.pic_parameter_set_id == pps.pic_parameter_set_id { - *stored_pps = pps.clone(); + *stored_pps = Arc::clone(&pps); found = true; break; } @@ -357,25 +362,29 @@ println!("PAFF?"); mb_info.coeffs[i][0] = mb_info.coeffs[24][i]; } } - if !mb_info.transform_size_8x8 { - let quant_dc = !mb_info.mb_type.is_intra16x16(); - for i in 0..16 { - if mb_info.coded[i] { - if !tx_bypass { - idct(&mut mb_info.coeffs[i], qp_y, quant_dc); + if !tx_bypass { + if !mb_info.transform_size_8x8 { + let quant_dc = !mb_info.mb_type.is_intra16x16(); + for (coded, coeffs) in mb_info.coded[..16].iter_mut().zip(mb_info.coeffs[..16].iter_mut()) { + if *coded { + idct(coeffs, qp_y, quant_dc); + } else if has_dc { + idct_dc(coeffs, qp_y, quant_dc); + *coded = true; } - } else if has_dc { - if !tx_bypass { - idct_dc(&mut mb_info.coeffs[i], qp_y, quant_dc); + } + } else { + for i in 0..4 { + if mb_info.coded[(i & 1) * 2 + (i & 2) * 4] { + dequant8x8(&mut mb_info.coeffs8x8[i].coeffs, &pps.scaling_list_8x8[!mb_info.mb_type.is_intra() as usize]); + idct8x8(&mut mb_info.coeffs8x8[i].coeffs, qp_y); } - mb_info.coded[i] = true; } } - } else { - for i in 0..4 { - if mb_info.coded[(i & 1) * 2 + (i & 2) * 4] && !tx_bypass { - dequant8x8(&mut mb_info.coeffs8x8[i].coeffs, &pps.scaling_list_8x8[!mb_info.mb_type.is_intra() as usize]); - idct8x8(&mut mb_info.coeffs8x8[i].coeffs, qp_y); + } else if !mb_info.transform_size_8x8 { + for i in 0..16 { + if !mb_info.coded[i] && has_dc { + mb_info.coded[i] = true; } } } @@ -477,7 +486,7 @@ _ => {}, 17, 18, 20, 24, 19, 21, 26, 28, 23, 27, 29, 30, 22, 25, 38, 41 ]; - let mut mb_idx = slice_hdr.first_mb_in_slice as usize; + let mut mb_idx = slice_hdr.first_mb_in_slice; 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 { @@ -571,7 +580,7 @@ _ => {}, Ok(mb_idx == self.num_mbs) } fn decode_slice_cabac(&mut self, cabac: &mut CABAC, slice_hdr: &SliceHeader) -> DecoderResult { - let mut mb_idx = slice_hdr.first_mb_in_slice as usize; + let mut mb_idx = slice_hdr.first_mb_in_slice; let mut prev_mb_skipped = false; let skip_type = if slice_hdr.slice_type.is_p() { MBType::PSkip } else { MBType::BSkip }; let mut last_qp_diff = false; @@ -758,7 +767,7 @@ impl NADecoder for H264Decoder { } let num_bufs = if !self.sps.is_empty() { - self.sps[0].num_ref_frames as usize + 1 + self.sps[0].num_ref_frames + 1 } else { 3 }.max(16 + 1);