switch NACodecInfo to Arc

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

diff --git a/nihav-game/src/codecs/vmd.rs b/nihav-game/src/codecs/vmd.rs
index c6d98aa2d52dcfc1b26967883372e971426f8005..dc831c4fb8200834e1eb8e2af4fded93f25c6ebe 100644 (file)
--- a/nihav-game/src/codecs/vmd.rs
+++ b/nihav-game/src/codecs/vmd.rs
@@ -147,7 +147,7 @@ fn decode_frame_data(br: &mut ByteReader, dst: &mut [u8], mut dpos: usize, strid
 }
 
 struct VMDVideoDecoder {
-    info:       Rc<NACodecInfo>,
+    info:       NACodecInfoRef,
     pal:        [u8; 768],
     buf:        Vec<u8>,
     width:      usize,
@@ -158,7 +158,7 @@ struct VMDVideoDecoder {
 impl VMDVideoDecoder {
     fn new() -> Self {
         Self {
-            info:       Rc::new(NACodecInfo::default()),
+            info:       NACodecInfoRef::default(),
             pal:        [0; 768],
             buf:        Vec::new(),
             width:      0,
@@ -169,7 +169,7 @@ impl VMDVideoDecoder {
     fn decode_frame(&mut self, br: &mut ByteReader, buf: &mut NAVideoBuffer<u8>) -> DecoderResult<bool> {
         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 frame_x                             = br.read_u16le()? as usize;
@@ -215,12 +215,12 @@ impl VMDVideoDecoder {
 }
 
 impl NADecoder for VMDVideoDecoder {
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+    fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
             self.width  = vinfo.get_width();
             self.height = vinfo.get_height();
             let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(self.width, self.height, false, PAL8_FORMAT));
-            self.info = Rc::new(NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()));
+            self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
             validate!(info.get_extradata().is_some());
 
             if let Some(ref edata) = info.get_extradata() {
@@ -330,7 +330,7 @@ impl VMDAudioDecoder {
                 }
                 let mut ch = 0;
                 let flip_ch = if channels == 2 { 1 } else { 0 };
-                for _ in 1..self.blk_align {
+                for _ in channels..self.blk_align*channels {
                     let b                           = br.read_byte()? as usize;
                     if (b & 0x80) != 0 {
                         pred[ch] -= SOL_AUD_STEPS16[b & 0x7F] as i32;
@@ -351,19 +351,20 @@ impl VMDAudioDecoder {
 }
 
 impl NADecoder for VMDAudioDecoder {
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+    fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
             let fmt;
             if ainfo.get_format().get_bits() == 8 {
                 fmt = SND_U8_FORMAT;
                 self.is16bit = false;
                 self.blk_size = ainfo.get_block_len();
+                self.blk_align = ainfo.get_block_len() / (ainfo.get_channels() as usize);
             } else {
                 fmt = SND_S16P_FORMAT;
                 self.is16bit = true;
                 self.blk_size = (ainfo.get_block_len() + 1) * (ainfo.get_channels() as usize);
+                self.blk_align = ainfo.get_block_len();
             };
-            self.blk_align = ainfo.get_block_len() / (ainfo.get_channels() as usize);
             self.ainfo = NAAudioInfo::new(ainfo.get_sample_rate(), ainfo.get_channels(), fmt, ainfo.get_block_len());
             self.chmap = NAChannelMap::from_str(if ainfo.get_channels() == 1 { "C" } else { "L,R" }).unwrap();
             Ok(())
@@ -397,11 +398,11 @@ impl NADecoder for VMDAudioDecoder {
             if self.is16bit {
                 let mut adata = abuf.get_abuf_i16().unwrap();
                 let off1 = adata.get_offset(1);
-                let mut dst = adata.get_data_mut();
+                let mut dst = adata.get_data_mut().unwrap();
                 self.decode_16bit(&mut dst, off1, &mut br, nblocks, mask)?;
             } else {
                 let mut adata = abuf.get_abuf_u8().unwrap();
-                let mut dst = adata.get_data_mut();
+                let dst = adata.get_data_mut().unwrap();
                 let mut doff = 0;
                 let mut mask = mask;
                 let channels = self.chmap.num_channels();
@@ -410,12 +411,21 @@ impl NADecoder for VMDAudioDecoder {
                         for i in 0..self.blk_align * channels {
                             dst[doff + i] = 0;
                         }
-                    } else {
-                        for i in 0..self.blk_align * channels {
+                    } else if channels == 1 {
+                        for i in 0..self.blk_size {
                             dst[doff + i]       = br.read_byte()?;
                         }
+                    } else {
+                        for i in 0..self.blk_size {
+                            let val             = br.read_byte()?;
+                            if val < 128 {
+                                dst[doff + i] = 127 - val;
+                            } else {
+                                dst[doff + i] = val;
+                            }
+                        }
                     }
-                    doff += self.blk_align;
+                    doff += self.blk_align * channels;
                     mask >>= 1;
                 }
             }
@@ -448,8 +458,8 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         game_register_all_codecs(&mut dec_reg);
 
-//        let file = "assets/1491.VMD";
-        let file = "assets/128.vmd";
+//        let file = "assets/Game/1491.VMD";
+        let file = "assets/Game/128.vmd";
         test_file_decoding("vmd", file, Some(10), true, false, None/*Some("vmd")*/, &dmx_reg, &dec_reg);
     }
     #[test]
@@ -459,8 +469,10 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         game_register_all_codecs(&mut dec_reg);
 
-//        let file = "assets/1491.VMD";
-        let file = "assets/128.vmd";
+//        let file = "assets/Game/1491.VMD";
+        let file = "assets/Game/128.vmd";
+//        let file = "assets/Game/1000.VMD";
+//        let file = "assets/Game/235.VMD";
         test_decode_audio("vmd", file, None, "vmd", &dmx_reg, &dec_reg);
     }
 }