X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Frawvideo_ms.rs;h=8261e3e3a3b49ac655c5fb11cb4c5dc6ef2adec0;hb=ff7cb24a554c244c7494a981f4ad2c712804a271;hp=0b35881c1204a645a7576389ee5dea89b97a61cb;hpb=9a59c451c92ca4283fb6f2274e399393d9a5f972;p=nihav.git

diff --git a/nihav-commonfmt/src/codecs/rawvideo_ms.rs b/nihav-commonfmt/src/codecs/rawvideo_ms.rs
index 0b35881..8261e3e 100644
--- a/nihav-commonfmt/src/codecs/rawvideo_ms.rs
+++ b/nihav-commonfmt/src/codecs/rawvideo_ms.rs
@@ -50,7 +50,7 @@ impl NADecoder for RawDecoder {
 
                         let sstride = (vinfo.width + 3) & !3;
 
-                        let buf = alloc_video_buffer(vinfo.clone(), 0)?;
+                        let buf = alloc_video_buffer(*vinfo, 0)?;
 
                         let mut frm = buf.get_vbuf().unwrap();
                         let dstride = frm.get_stride(0);
@@ -66,7 +66,7 @@ impl NADecoder for RawDecoder {
                     15 | 16 => {
                         let sstride = (vinfo.width * 2 + 3) & !3;
 
-                        let buf = alloc_video_buffer(vinfo.clone(), 0)?;
+                        let buf = alloc_video_buffer(*vinfo, 0)?;
 
                         let mut frm = buf.get_vbuf16().unwrap();
                         let dstride = frm.get_stride(0);
@@ -86,7 +86,7 @@ impl NADecoder for RawDecoder {
                         let offs    = vec![0; ncomp];
                         let mut strides = vec![0; ncomp];
                         strides[0] = sstride;
-                         NABufferType::VideoPacked(NAVideoBuffer::from_raw_parts(vinfo.clone(), src.clone(), offs, strides).into_ref())
+                         NABufferType::VideoPacked(NAVideoBuffer::from_raw_parts(*vinfo, src, offs, strides).into_ref())
                     },
                     _ => return Err(DecoderError::NotImplemented),
                 };
@@ -126,6 +126,7 @@ mod test {
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
         generic_register_all_decoders(&mut dec_reg);
+        // sample: https://samples.mplayerhq.hu/V-codecs/Uncompressed/8bpp.avi
         test_decoding("avi", "rawvideo-ms", "assets/Misc/8bpp.avi", Some(0), &dmx_reg,
                      &dec_reg, ExpectedTestResult::MD5([0xb6629439, 0x6ea482e9, 0x42c84d7c, 0x46c94431]));
     }
@@ -135,6 +136,7 @@ mod test {
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
         generic_register_all_decoders(&mut dec_reg);
+        // sample: https://samples.mplayerhq.hu/V-codecs/Uncompressed/16bpp.avi
         test_decoding("avi", "rawvideo-ms", "assets/Misc/16bpp.avi", Some(0), &dmx_reg,
                      &dec_reg, ExpectedTestResult::MD5([0xe80e16a1, 0x2d50659e, 0x413d24af, 0xea3bee05]));
     }
@@ -144,6 +146,7 @@ mod test {
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
         generic_register_all_decoders(&mut dec_reg);
+        // sample:https://samples.mplayerhq.hu/V-codecs/Uncompressed/keve.avi
         test_decoding("avi", "rawvideo-ms", "assets/Misc/keve.avi", Some(0), &dmx_reg,
                      &dec_reg, ExpectedTestResult::MD5([0x9514ac1f, 0x4512cc62, 0x069485ba, 0x084a1e63]));
     }
@@ -153,6 +156,7 @@ mod test {
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
         generic_register_all_decoders(&mut dec_reg);
+        // sample: https://samples.mplayerhq.hu/V-codecs/Uncompressed/Logo-Uncompressed.zip
         test_decoding("avi", "rawvideo-ms", "assets/Misc/VRMLuncompressed.avi", Some(0), &dmx_reg,
                      &dec_reg, ExpectedTestResult::MD5([0xf4c9d468, 0x8f42c576, 0xc8eb522a, 0x75f654b1]));
     }