switch to refcounted buffers

[nihav.git] / nihav-game / src / codecs / bmv.rs

diff --git a/nihav-game/src/codecs/bmv.rs b/nihav-game/src/codecs/bmv.rs
index cea10eb272784e045b06d06dc447112678c44bb0..46e5f65226754aaf656ebbae459a474ea87ecadc 100644 (file)
--- a/nihav-game/src/codecs/bmv.rs
+++ b/nihav-game/src/codecs/bmv.rs
@@ -118,7 +118,7 @@ impl BMVVideoDecoder {
         let mut buf = bufo.unwrap();
         let paloff = buf.get_offset(1);
         let stride = buf.get_stride(0);
-        let mut data = buf.get_data_mut();
+        let data = buf.get_data_mut().unwrap();
         let dst = data.as_mut_slice();
 
         let fwd = (line <= -640) || (line >= 0);
@@ -275,10 +275,10 @@ impl NADecoder for BMVAudioDecoder {
             let nblocks = pktbuf[0] as usize;
             validate!(pktbuf.len() == 1 + 65 * nblocks);
             let samples = nblocks * 32;
-            let mut abuf = alloc_audio_buffer(self.ainfo, samples, self.chmap.clone())?;
+            let abuf = alloc_audio_buffer(self.ainfo, samples, self.chmap.clone())?;
             let mut adata = abuf.get_abuf_i16().unwrap();
             let off1 = adata.get_offset(1);
-            let mut dst = adata.get_data_mut();
+            let dst = adata.get_data_mut().unwrap();
             let psrc = &pktbuf[1..];
             for (n, src) in psrc.chunks_exact(65).enumerate() {
                 let code = src[0].rotate_right(1);
@@ -320,9 +320,9 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         game_register_all_codecs(&mut dec_reg);
 
-//        let file = "assets/PERFECT.BMV";
-//        let file = "assets/DW2-MOUSE.BMV";
-        let file = "assets/WILDCAT.BMV";
+//        let file = "assets/Game/PERFECT.BMV";
+//        let file = "assets/Game/DW2-MOUSE.BMV";
+        let file = "assets/Game/WILDCAT.BMV";
         test_file_decoding("bmv", file, Some(40), true, false, None, &dmx_reg, &dec_reg);
     }
     #[test]
@@ -332,9 +332,9 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         game_register_all_codecs(&mut dec_reg);
 
-        let file = "assets/PERFECT.BMV";
-//        let file = "assets/DW2-MOUSE.BMV";
-//        let file = "assets/WILDCAT.BMV";
+        let file = "assets/Game/PERFECT.BMV";
+//        let file = "assets/Game/DW2-MOUSE.BMV";
+//        let file = "assets/Game/WILDCAT.BMV";
         test_decode_audio("bmv", file, None, "bmv", &dmx_reg, &dec_reg);
     }
 }