X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Fintel263.rs;h=62762bca63397784e42f17fcb84a2cef0b6ced64;hb=817e487223b28379176a533f09485c27a68443f8;hp=ff55e65ce8e07f0909a734ca118b9cc1c920d210;hpb=78fb6560c73965d834b215fb0b49505ae5443288;p=nihav.git

diff --git a/nihav-indeo/src/codecs/intel263.rs b/nihav-indeo/src/codecs/intel263.rs
index ff55e65..62762bc 100644
--- a/nihav-indeo/src/codecs/intel263.rs
+++ b/nihav-indeo/src/codecs/intel263.rs
@@ -205,7 +205,7 @@ impl BlockDSP for I263BlockDSP {
 
         blockdsp::copy_block(&mut dst, src.clone(), 0, xpos, ypos, mv.x >> 1, mv.y >> 1, 16, 16, 0, 1, mode, H263_INTERP_FUNCS);
         blockdsp::copy_block(&mut dst, src.clone(), 1, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_FUNCS);
-        blockdsp::copy_block(&mut dst, src.clone(), 2, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_FUNCS);
+        blockdsp::copy_block(&mut dst, src,         2, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_FUNCS);
     }
     fn copy_blocks8x8(&self, dst: &mut NAVideoBuffer<u8>, src: NAVideoBufferRef<u8>, xpos: usize, ypos: usize, mvs: &[MV; 4]) {
         let mut dst = NASimpleVideoFrame::from_video_buf(dst).unwrap();
@@ -234,7 +234,7 @@ impl BlockDSP for I263BlockDSP {
 
         blockdsp::copy_block(&mut dst, src.clone(), 0, xpos, ypos, mv.x >> 1, mv.y >> 1, 16, 16, 0, 1, mode, H263_INTERP_AVG_FUNCS);
         blockdsp::copy_block(&mut dst, src.clone(), 1, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_AVG_FUNCS);
-        blockdsp::copy_block(&mut dst, src.clone(), 2, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_AVG_FUNCS);
+        blockdsp::copy_block(&mut dst, src,         2, xpos >> 1, ypos >> 1, mv.x >> 2, mv.y >> 2, 8, 8, 0, 1, cmode, H263_INTERP_AVG_FUNCS);
     }
     fn avg_blocks8x8(&self, dst: &mut NAVideoBuffer<u8>, src: NAVideoBufferRef<u8>, xpos: usize, ypos: usize, mvs: &[MV; 4]) {
         let mut dst = NASimpleVideoFrame::from_video_buf(dst).unwrap();
@@ -263,10 +263,10 @@ impl BlockDSP for I263BlockDSP {
             let coded0 = cbpi.is_coded(mb_x, 0);
             let coded1 = cbpi.is_coded(mb_x, 1);
             let q = cbpi.get_q(mb_w + mb_x);
-            let str = if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
+            let strength = if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
             if mb_y != 0 {
-                if coded0 && cbpi.is_coded_top(mb_x, 0) { deblock_hor(buf, 0, str, coff); }
-                if coded1 && cbpi.is_coded_top(mb_x, 1) { deblock_hor(buf, 0, str, coff + 8); }
+                if coded0 && cbpi.is_coded_top(mb_x, 0) { deblock_hor(buf, 0, strength, coff); }
+                if coded1 && cbpi.is_coded_top(mb_x, 1) { deblock_hor(buf, 0, strength, coff + 8); }
             }
             let coff = off + 8 * stride;
             if cbpi.is_coded(mb_x, 2) && coded0 { deblock_hor(buf, 0, q, coff); }
@@ -282,7 +282,7 @@ impl BlockDSP for I263BlockDSP {
             let ccur0 = cbpi.is_coded(mb_x, 0);
             let ccur1 = cbpi.is_coded(mb_x, 1);
             let q = cbpi.get_q(mb_w + mb_x);
-            let str = if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
+            let strength = if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
             if mb_y != 0 {
                 let coff = off - 8 * stride;
                 let qtop = cbpi.get_q(mb_x);
@@ -290,8 +290,8 @@ impl BlockDSP for I263BlockDSP {
                 if leftt && ctop0 { deblock_ver(buf, 0, strtop, coff); }
                 if ctop0 && ctop1 { deblock_ver(buf, 0, strtop, coff + 8); }
             }
-            if leftc && ccur0 { deblock_ver(buf, 0, str, off); }
-            if ccur0 && ccur1 { deblock_ver(buf, 0, str, off + 8); }
+            if leftc && ccur0 { deblock_ver(buf, 0, strength, off); }
+            if ccur0 && ccur1 { deblock_ver(buf, 0, strength, off + 8); }
             leftt = ctop1;
             leftc = ccur1;
             off += 16;
@@ -307,9 +307,9 @@ impl BlockDSP for I263BlockDSP {
                 let ctv = cbpi.is_coded_top(mb_x, 5);
                 let ccv = cbpi.is_coded(mb_x, 5);
                 let q = cbpi.get_q(mb_w + mb_x);
-                let str = if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
-                if ctu && ccu { deblock_hor(buf, 1, str, offu + mb_x * 8); }
-                if ctv && ccv { deblock_hor(buf, 2, str, offv + mb_x * 8); }
+                let strength = if q < 32 { FILTER_STRENGTH[q as usize] } else { 0 };
+                if ctu && ccu { deblock_hor(buf, 1, strength, offu + mb_x * 8); }
+                if ctv && ccv { deblock_hor(buf, 2, strength, offv + mb_x * 8); }
             }
             let mut leftu = false;
             let mut leftv = false;
@@ -329,7 +329,7 @@ impl BlockDSP for I263BlockDSP {
     }
 }
 
-fn check_marker<'a>(br: &mut BitReader<'a>) -> DecoderResult<()> {
+fn check_marker(br: &mut BitReader) -> DecoderResult<()> {
     let mark = br.read(1)?;
     validate!(mark == 1);
     Ok(())
@@ -758,6 +758,7 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         indeo_register_all_decoders(&mut dec_reg);
 
+        // sample: https://samples.mplayerhq.hu/A-codecs/IMC/neal73_saber.avi
         test_decoding("avi", "intel263", "assets/Indeo/neal73_saber.avi", Some(16),
                       &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
                         [0x698c4f70, 0xf727bfc1, 0x96e687e9, 0xc9e37073],