X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Fivibr.rs;h=e023bdb77e1a3f08edd1acc8845d11afde457bd1;hb=6f2630992fe340ad1a122ec10c649f756e478185;hp=c6609ccaf15c62a97cf76778566ec5b58629e711;hpb=ac818eac7671fa8ddfea5aa4fb86fc0b5ab82d2e;p=nihav.git

diff --git a/nihav-indeo/src/codecs/ivibr.rs b/nihav-indeo/src/codecs/ivibr.rs
index c6609cc..e023bdb 100644
--- a/nihav-indeo/src/codecs/ivibr.rs
+++ b/nihav-indeo/src/codecs/ivibr.rs
@@ -258,7 +258,7 @@ fn decode_block8x8(br: &mut BitReader, blk_cb: &IVICodebook, rvmap: &RVMap, tabl
             }
         }
         idx += run;
-        validate!((idx >= 0) && (idx < 64));
+        validate!((0..64).contains(&idx));
 
         let spos = tables.scan[idx as usize];
         let q = (u32::from(quant_mat[spos]) * u32::from(quant)) >> 9;
@@ -308,7 +308,7 @@ fn decode_block4x4(br: &mut BitReader, blk_cb: &IVICodebook, rvmap: &RVMap, tabl
             }
         }
         idx += run;
-        validate!((idx >= 0) && (idx < 16));
+        validate!((0..16).contains(&idx));
 
         let spos = tables.scan[idx as usize];
         let q = (u32::from(quant_mat[spos]) * u32::from(quant)) >> 9;
@@ -510,8 +510,8 @@ impl IVIDecoder {
     fn realloc(&mut self, pic_hdr: &PictureHeader) -> DecoderResult<()> {
         let planes = if pic_hdr.transparent { 4 } else { 3 };
 
-        //self.bands.truncate(0);
-        self.tiles.truncate(0);
+        //self.bands.clear();
+        self.tiles.clear();
         self.num_tiles  = [[0; 4]; 4];
         self.tile_start = [[0; 4]; 4];
         let mut tstart: usize = 0;
@@ -582,7 +582,7 @@ impl IVIDecoder {
                 let mb_h = (tile.h + mb_size - 1) / mb_size;
                 tile.mb_w = mb_w;
                 tile.mb_h = mb_h;
-                tile.mb.truncate(0);
+                tile.mb.clear();
                 tile.mb.resize(mb_w * mb_h, MB::new(0, 0));
             }
 
@@ -653,7 +653,7 @@ br.skip(skip_part as u32)?;
                             mb.mtype = MBType::Inter;
                             mb.cbp   = 0;
                             if band.inherit_mv {
-                                if let Some(ref tileref) = ref_tile {
+                                if let Some(tileref) = ref_tile {
                                     let mx = tileref.mb[mb_idx].mv_x;
                                     let my = tileref.mb[mb_idx].mv_y;
                                     mb.mv_x = scale_mv(mx, mv_scale);
@@ -680,7 +680,7 @@ br.skip(skip_part as u32)?;
 
         let stride = frame.plane_stride[band.plane_no];
         let mut dstidx = tile.pos_x + tile.pos_y * stride;
-        let mut dst = &mut frame.plane_buf[band.plane_no];
+        let dst = &mut frame.plane_buf[band.plane_no];
         let pos_x = tile.pos_x;
         let pos_y = tile.pos_y;
         let tile_w = (tile.w + 15) & !15;
@@ -728,23 +728,23 @@ br.skip(skip_part as u32)?;
                             if let TxType::Transform8(ref params) = band.ttype {
                                 decode_block8x8(br, &band.blk_cb, &band.rvmap, params, is_intra, band.tr.is_2d(), &mut prev_dc, mb.q, &mut blk, tr)?;
                                 if is_intra {
-                                    put_block(&mut dst, dstidx + boff, stride, &blk, 8);
+                                    put_block(dst, dstidx + boff, stride, &blk, 8);
                                 } else {
-                                    add_block(&mut dst, dstidx + boff, stride, &blk, 8);
+                                    add_block(dst, dstidx + boff, stride, &blk, 8);
                                 }
                             }
                             if let TxType::Transform4(ref params) = band.ttype {
                                 decode_block4x4(br, &band.blk_cb, &band.rvmap, params, is_intra, band.tr.is_2d(), &mut prev_dc, mb.q, &mut blk, tr)?;
                                 if is_intra {
-                                    put_block(&mut dst, dstidx + boff, stride, &blk, 4);
+                                    put_block(dst, dstidx + boff, stride, &blk, 4);
                                 } else {
-                                    add_block(&mut dst, dstidx + boff, stride, &blk, 4);
+                                    add_block(dst, dstidx + boff, stride, &blk, 4);
                                 }
                             }
                         } else {
                             if is_intra {
                                 (transform_dc)(&mut blk, prev_dc);
-                                put_block(&mut dst, dstidx + boff, stride, &blk, band.blk_size);
+                                put_block(dst, dstidx + boff, stride, &blk, band.blk_size);
                             }
                         }
                         cbp >>= 1;
@@ -788,24 +788,24 @@ br.skip(skip_part as u32)?;
                         }
                         if is_intra {
                             if band.blk_size == 8 {
-                                put_block(&mut dst, dstidx + mb_x * band.blk_size, stride, &blk, 8);
+                                put_block(dst, dstidx + mb_x * band.blk_size, stride, &blk, 8);
                             } else {
-                                put_block(&mut dst, dstidx + mb_x * band.blk_size, stride, &blk, 4);
+                                put_block(dst, dstidx + mb_x * band.blk_size, stride, &blk, 4);
                             }
                         } else {
                             if band.blk_size == 8 {
-                                add_block(&mut dst, dstidx + mb_x * band.blk_size, stride, &blk, 8);
+                                add_block(dst, dstidx + mb_x * band.blk_size, stride, &blk, 8);
                             } else {
-                                add_block(&mut dst, dstidx + mb_x * band.blk_size, stride, &blk, 4);
+                                add_block(dst, dstidx + mb_x * band.blk_size, stride, &blk, 4);
                             }
                         }
                     } else {
                         if is_intra {
                             (transform_dc)(&mut blk, prev_dc);
                             if band.blk_size == 8 {
-                                put_block(&mut dst, dstidx + mb_x * band.blk_size, stride, &blk, 8);
+                                put_block(dst, dstidx + mb_x * band.blk_size, stride, &blk, 8);
                             } else {
-                                put_block(&mut dst, dstidx + mb_x * band.blk_size, stride, &blk, 4);
+                                put_block(dst, dstidx + mb_x * band.blk_size, stride, &blk, 4);
                             }
                         }
                     }
@@ -931,8 +931,8 @@ br.skip(skip_part as u32)?;
                 let seq = br.peek(21);
                 if seq == 0xBFFF8 {
                     let res2 = self.decode_single_frame(dec, br);
-                    if res2.is_ok() {
-                        self.bref = Some(res2.unwrap());
+                    if let Ok(res) = res2 {
+                        self.bref = Some(res);
                     }
                 }
                 self.ftype = IVIFrameType::Intra;