X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Fintel263.rs;h=18c759dcc76a189be9e53023c02f77db287adec0;hb=e64739f87a35f29be0bbbce366876180ba3eb57e;hp=131f2f441083bb26e5b6e6eee871478b1e8f3397;hpb=6011e20199143f519881660144a4ca95ba77fd2d;p=nihav.git

diff --git a/nihav-indeo/src/codecs/intel263.rs b/nihav-indeo/src/codecs/intel263.rs
index 131f2f4..18c759d 100644
--- a/nihav-indeo/src/codecs/intel263.rs
+++ b/nihav-indeo/src/codecs/intel263.rs
@@ -43,8 +43,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 +64,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;
@@ -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; }
@@ -102,7 +102,7 @@ impl<'a> Intel263BR<'a> {
 }
 
 fn decode_mv_component(br: &mut BitReader, mv_cb: &Codebook<u8>) -> DecoderResult<i16> {
-    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 +249,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 +267,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 +288,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,18 +346,18 @@ 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(),
         }
     }
@@ -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<dyn NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
     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();