X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Fintel263.rs;h=b2e58cbfdadf75df3eba76b091ae6a0584fe97e9;hb=1032dfe16237d2cefa04e616d8202222af790401;hp=3b95c5fa8e4f52466e84323a1a1a27051e77f09d;hpb=2422d9699cd56cbb86ac32b3e8dd026e20a89db5;p=nihav.git diff --git a/nihav-indeo/src/codecs/intel263.rs b/nihav-indeo/src/codecs/intel263.rs index 3b95c5f..b2e58cb 100644 --- a/nihav-indeo/src/codecs/intel263.rs +++ b/nihav-indeo/src/codecs/intel263.rs @@ -3,10 +3,11 @@ use nihav_core::io::codebook::*; use nihav_core::formats; use nihav_core::frame::*; use nihav_core::codecs::*; -use nihav_core::codecs::h263::*; -use nihav_core::codecs::h263::decoder::*; -use nihav_core::codecs::h263::data::*; -use nihav_core::codecs::h263::code::H263BlockDSP; +use nihav_codec_support::codecs::{MV, ZIGZAG}; +use nihav_codec_support::codecs::h263::*; +use nihav_codec_support::codecs::h263::decoder::*; +use nihav_codec_support::codecs::h263::data::*; +use nihav_codec_support::codecs::h263::code::H263BlockDSP; #[allow(dead_code)] struct Tables { @@ -23,6 +24,8 @@ struct Intel263Decoder { dec: H263BaseDecoder, tables: Tables, bdsp: H263BlockDSP, + lastframe: Option, + lastpts: Option, } struct Intel263BR<'a> { @@ -43,8 +46,8 @@ fn check_marker<'a>(br: &mut BitReader<'a>) -> DecoderResult<()> { impl<'a> Intel263BR<'a> { fn new(src: &'a [u8], tables: &'a Tables) -> Self { Intel263BR { - br: BitReader::new(src, src.len(), BitReaderMode::BE), - tables: tables, + br: BitReader::new(src, BitReaderMode::BE), + tables, gob_no: 0, mb_w: 0, is_pb: false, @@ -64,8 +67,8 @@ impl<'a> Intel263BR<'a> { if !coded { return Ok(()); } let rl_cb = &self.tables.rl_cb; // could be aic too - let q_add = if quant == 0 { 0i16 } else { ((quant - 1) | 1) as i16 }; - let q = (quant * 2) as i16; + let q_add = if quant == 0 { 0i16 } else { i16::from((quant - 1) | 1) }; + let q = i16::from(quant * 2); while idx < 64 { let code = br.read_cb(rl_cb)?; let run; @@ -76,7 +79,11 @@ impl<'a> Intel263BR<'a> { level = code.get_level(); last = code.is_last(); if br.read_bool()? { level = -level; } - level = (level * q) + q_add; + if level > 0 { + level = (level * q) + q_add; + } else { + level = (level * q) - q_add; + } } else { last = br.read_bool()?; run = br.read(6)? as u8; @@ -86,13 +93,17 @@ impl<'a> Intel263BR<'a> { let top = br.read_s(6)? as i16; level = (top << 5) | low; } - level = (level * q) + q_add; + if level > 0 { + level = (level * q) + q_add; + } else { + level = (level * q) - q_add; + } if level < -2048 { level = -2048; } if level > 2047 { level = 2047; } } idx += run; validate!(idx < 64); - let oidx = H263_ZIGZAG[idx as usize]; + let oidx = ZIGZAG[idx as usize]; blk[oidx] = level; idx += 1; if last { break; } @@ -102,7 +113,7 @@ impl<'a> Intel263BR<'a> { } fn decode_mv_component(br: &mut BitReader, mv_cb: &Codebook) -> DecoderResult { - let code = br.read_cb(mv_cb)? as i16; + let code = i16::from(br.read_cb(mv_cb)?); if code == 0 { return Ok(0) } if !br.read_bool()? { Ok(code) @@ -249,7 +260,7 @@ impl<'a> BlockDecoder for Intel263BR<'a> { let dquant = (cbpc & 4) != 0; if dquant { let idx = br.read(2)? as usize; - q = ((q as i16) + (H263_DQUANT_TAB[idx] as i16)) as u8; + q = (i16::from(q) + i16::from(H263_DQUANT_TAB[idx])) as u8; } Ok(BlockInfo::new(Type::I, cbp, q)) }, @@ -267,7 +278,7 @@ impl<'a> BlockDecoder for Intel263BR<'a> { let cbp = (cbpy << 2) | (cbpc & 3); if dquant { let idx = br.read(2)? as usize; - q = ((q as i16) + (H263_DQUANT_TAB[idx] as i16)) as u8; + q = (i16::from(q) + i16::from(H263_DQUANT_TAB[idx])) as u8; } let mut binfo = BlockInfo::new(Type::I, cbp, q); binfo.set_bpart(bbinfo); @@ -288,7 +299,7 @@ impl<'a> BlockDecoder for Intel263BR<'a> { let cbp = (cbpy << 2) | (cbpc & 3); if dquant { let idx = br.read(2)? as usize; - q = ((q as i16) + (H263_DQUANT_TAB[idx] as i16)) as u8; + q = (i16::from(q) + i16::from(H263_DQUANT_TAB[idx])) as u8; } let mut binfo = BlockInfo::new(Type::P, cbp, q); binfo.set_bpart(bbinfo); @@ -346,25 +357,27 @@ impl Intel263Decoder { let mut coderead = H263ShortCodeReader::new(H263_MV); let mv_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); let tables = Tables { - intra_mcbpc_cb: intra_mcbpc_cb, - inter_mcbpc_cb: inter_mcbpc_cb, - cbpy_cb: cbpy_cb, - rl_cb: rl_cb, - aic_rl_cb: aic_rl_cb, - mv_cb: mv_cb, + intra_mcbpc_cb, + inter_mcbpc_cb, + cbpy_cb, + rl_cb, + aic_rl_cb, + mv_cb, }; Intel263Decoder{ info: NACodecInfo::new_dummy(), dec: H263BaseDecoder::new(true), - tables: tables, + tables, bdsp: H263BlockDSP::new(), + lastframe: None, + lastpts: None, } } } impl NADecoder for Intel263Decoder { - fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> { + fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Video(vinfo) = info.get_properties() { let w = vinfo.get_width(); let h = vinfo.get_height(); @@ -376,38 +389,59 @@ impl NADecoder for Intel263Decoder { Err(DecoderError::InvalidData) } } - fn decode(&mut self, pkt: &NAPacket) -> DecoderResult { + fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let src = pkt.get_buffer(); if src.len() == 8 { - let bret = self.dec.get_bframe(&self.bdsp); let buftype; - let is_skip; - if let Ok(btype) = bret { - buftype = btype; - is_skip = false; - } else { + let ftype; + if self.lastframe.is_none() { buftype = NABufferType::None; - is_skip = true; + ftype = FrameType::Skip; + } else { + let mut buf = None; + std::mem::swap(&mut self.lastframe, &mut buf); + buftype = buf.unwrap(); + ftype = FrameType::B; } let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), buftype); frm.set_keyframe(false); - frm.set_frame_type(if is_skip { FrameType::Skip } else { FrameType::B }); - return Ok(Rc::new(RefCell::new(frm))); + frm.set_frame_type(ftype); + if self.lastpts.is_some() { + frm.set_pts(self.lastpts); + self.lastpts = None; + } + return Ok(frm.into_ref()); } let mut ibr = Intel263BR::new(&src, &self.tables); let bufinfo = self.dec.parse_frame(&mut ibr, &self.bdsp)?; + let mut cur_pts = pkt.get_pts(); + if !self.dec.is_intra() { + let bret = self.dec.get_bframe(&self.bdsp); + if let Ok(b_buf) = bret { + self.lastframe = Some(b_buf); + self.lastpts = pkt.get_pts(); + if let Some(pts) = pkt.get_pts() { + cur_pts = Some(pts + 1); + } + } + } + let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo); frm.set_keyframe(self.dec.is_intra()); frm.set_frame_type(if self.dec.is_intra() { FrameType::I } else { FrameType::P }); - Ok(Rc::new(RefCell::new(frm))) + frm.set_pts(cur_pts); + Ok(frm.into_ref()) + } + fn flush(&mut self) { + self.dec.flush(); } } -pub fn get_decoder() -> Box { +pub fn get_decoder() -> Box { Box::new(Intel263Decoder::new()) } @@ -415,9 +449,9 @@ pub fn get_decoder() -> Box { mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; - use nihav_core::test::dec_video::*; - use crate::codecs::indeo_register_all_codecs; - use nihav_commonfmt::demuxers::generic_register_all_demuxers; + use nihav_codec_support::test::dec_video::*; + use crate::indeo_register_all_codecs; + use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_intel263() { let mut dmx_reg = RegisteredDemuxers::new();