vmd: remove leftover unused code

[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 904fe1fc998a0a027c617a6b8a4fdaf3ae7bab1f..ce40b95796c14712fe9a9fd9bfbe648ee395f886 100644 (file)
--- a/nihav-game/src/codecs/vmd.rs
+++ b/nihav-game/src/codecs/vmd.rs
@@ -435,9 +435,6 @@ impl VMDAudioDecoder {
             pred + i32::from(SOL_AUD_STEPS16[(val & 0x7F) as usize])
         }
     }
-    fn cvt_u8(val: u8) -> u8 {
-        val ^ 0x80
-    }
 }
 
 impl NADecoder for VMDAudioDecoder {
@@ -471,7 +468,7 @@ impl NADecoder for VMDAudioDecoder {
                     self.blk_size = (ainfo.get_block_len() + 1) * channels;
                     self.mode = VMDAudioMode::DPCM;
                 } else {
-                    self.blk_size = ainfo.get_block_len() / 2 + 3;
+                    self.blk_size = (ainfo.get_block_len() + 1) / 2 + 3;
                     self.mode = VMDAudioMode::ADPCM;
                 }
             };
@@ -532,10 +529,7 @@ impl NADecoder for VMDAudioDecoder {
                                 dst[doff + i]       = br.read_byte()?;
                             }
                         } else {
-                            for i in 0..self.blk_size {
-                                let val             = Self::cvt_u8(br.read_byte()?);
-                                dst[doff + i] = val;
-                            }
+                            unreachable!();
                         }
                         doff += self.blk_align * channels;
                         mask >>= 1;
@@ -603,7 +597,7 @@ impl NADecoder for VMDAudioDecoder {
                         let mut ima = IMAState::new();
                         for _ in 0..nblocks {
                             if (mask & 1) != 0 {
-                                doff += (self.blk_size - 3) * 2;
+                                doff += self.blk_align;
                                 mask >>= 1;
                                 continue;
                             }
@@ -611,11 +605,14 @@ impl NADecoder for VMDAudioDecoder {
                             let step                        = br.read_byte()?;
                             validate!((step as usize) < IMA_STEP_TABLE.len());
                             ima.reset(pred, step);
-                            for _ in 3..self.blk_size {
-                                let b                       = br.read_byte()?;
-                                dst[doff] = ima.expand_sample(b >> 4);
-                                doff += 1;
-                                dst[doff] = ima.expand_sample(b & 0xF);
+                            let mut b = 0;
+                            for i in 0..self.blk_align {
+                                if (i & 1) == 0 {
+                                    b                       = br.read_byte()?;
+                                    dst[doff] = ima.expand_sample(b >> 4);
+                                } else {
+                                    dst[doff] = ima.expand_sample(b & 0xF);
+                                }
                                 doff += 1;
                             }
                             mask >>= 1;