X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Fintel263.rs;h=18c759dcc76a189be9e53023c02f77db287adec0;hb=e64739f87a35f29be0bbbce366876180ba3eb57e;hp=be286016232532aae67b7b600bd155e0d3f1f259;hpb=f2af8ecaeed8ec8c1fa6b3c2cfdb075d64994b7a;p=nihav.git diff --git a/nihav-indeo/src/codecs/intel263.rs b/nihav-indeo/src/codecs/intel263.rs index be28601..18c759d 100644 --- a/nihav-indeo/src/codecs/intel263.rs +++ b/nihav-indeo/src/codecs/intel263.rs @@ -43,7 +43,7 @@ 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), + br: BitReader::new(src, BitReaderMode::BE), tables, gob_no: 0, mb_w: 0, @@ -92,7 +92,7 @@ impl<'a> Intel263BR<'a> { } 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; } @@ -404,10 +404,13 @@ impl NADecoder for Intel263Decoder { frm.set_frame_type(if self.dec.is_intra() { FrameType::I } else { FrameType::P }); 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()) } @@ -416,8 +419,8 @@ 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 crate::indeo_register_all_codecs; + use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_intel263() { let mut dmx_reg = RegisteredDemuxers::new();