fn decode_frame(&mut self, br: &mut ByteReader) -> DecoderResult<bool> {
let frame_x = br.read_u16le()? as usize;
let frame_y = br.read_u16le()? as usize;
- let frame_l = br.read_u16le()? as usize;
+ let frame_r = br.read_u16le()? as usize;
let frame_d = br.read_u16le()? as usize;
br.read_skip(1)?;
let flags = br.read_byte()?;
let has_pal = (flags & 0x02) != 0 && !self.is_16bit && !self.is_24bit;
- if (frame_x == 0xFFFF) && (frame_y == 0xFFFF) && (frame_l == 0xFFFF) && (frame_d == 0xFFFF) {
+ if (frame_x == 0xFFFF) && (frame_y == 0xFFFF) && (frame_r == 0xFFFF) && (frame_d == 0xFFFF) {
return Ok(false);
}
validate!(frame_x >= self.xoff && frame_y >= self.yoff);
- validate!(frame_l >= frame_x && frame_d >= frame_y);
- validate!(frame_l - self.xoff < self.width && frame_d - self.yoff < self.height);
+ validate!(frame_r >= frame_x && frame_d >= frame_y);
+ validate!(frame_r - self.xoff < self.width && frame_d - self.yoff < self.height);
if has_pal {
br.read_skip(2)?;
} else {
3
};
- let w = (frame_l + 1 - frame_x) * bpp;
+ let w = (frame_r + 1 - frame_x) * bpp;
let h = frame_d + 1 - frame_y;
let stride = self.width;
let dpos = (frame_x - self.xoff) * bpp + (frame_y - self.yoff) * stride;
}
}
+impl NAOptionHandler for VMDVideoDecoder {
+ fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+ fn set_options(&mut self, _options: &[NAOption]) { }
+ fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
+}
+
pub fn get_decoder_video() -> Box<dyn NADecoder + Send> {
Box::new(VMDVideoDecoder::new())
pred + i32::from(SOL_AUD_STEPS16[(val & 0x7F) as usize])
}
}
- fn cvt_u8(val: u8) -> u8 {
- val ^ 0x80
- }
}
impl NADecoder for VMDAudioDecoder {
self.is_odd = (channels == 2) && ((self.blk_size & 1) != 0);
}
} else {
- fmt = SND_S16P_FORMAT;
self.blk_align = ainfo.get_block_len();
if (flags & 0x10) == 0 {
+ fmt = SND_S16P_FORMAT;
self.blk_size = (ainfo.get_block_len() + 1) * channels;
self.mode = VMDAudioMode::DPCM;
} else {
- self.blk_size = ainfo.get_block_len() / 2 + 3;
+ fmt = SND_S16_FORMAT;
+ self.blk_size = (ainfo.get_block_len() * channels + 1) / 2 + 3 * channels;
self.mode = VMDAudioMode::ADPCM;
}
};
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;
let mut ima = IMAState::new();
for _ in 0..nblocks {
if (mask & 1) != 0 {
- doff += (self.blk_size - 3) * 2;
+ for i in 0..self.blk_align {
+ dst[doff + i] = 0;
+ }
+ doff += self.blk_align;
mask >>= 1;
continue;
}
let step = br.read_byte()?;
validate!((step as usize) < IMA_STEP_TABLE.len());
ima.reset(pred, step);
- for _ in 3..self.blk_size {
+ 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;
+ }
+ } else {
+ let mut mask = mask;
+ let mut ima1 = IMAState::new();
+ let mut ima2 = IMAState::new();
+ for _ in 0..nblocks {
+ if (mask & 1) != 0 {
+ for i in 0..self.blk_align * 2 {
+ dst[doff + i] = 0;
+ }
+ doff += self.blk_align * 2;
+ mask >>= 1;
+ continue;
+ }
+ let pred1 = br.read_u16le()? as i16;
+ let pred2 = br.read_u16le()? as i16;
+ let step1 = br.read_byte()?;
+ let step2 = br.read_byte()?;
+ validate!((step1 as usize) < IMA_STEP_TABLE.len());
+ validate!((step2 as usize) < IMA_STEP_TABLE.len());
+ ima1.reset(pred1, step1);
+ ima2.reset(pred2, step2);
+ for _ in 0..self.blk_align {
let b = br.read_byte()?;
- dst[doff] = ima.expand_sample(b >> 4);
+ dst[doff] = ima1.expand_sample(b >> 4);
doff += 1;
- dst[doff] = ima.expand_sample(b & 0xF);
+ dst[doff] = ima2.expand_sample(b & 0xF);
doff += 1;
}
mask >>= 1;
}
- } else {
- return Err(DecoderError::InvalidData);
}
},
};
}
}
+impl NAOptionHandler for VMDAudioDecoder {
+ fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+ fn set_options(&mut self, _options: &[NAOption]) { }
+ fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
+}
+
pub fn get_decoder_audio() -> Box<dyn NADecoder + Send> {
Box::new(VMDAudioDecoder::new())
}
[0x72cce7e3, 0x98506d04, 0xd4d8bbaf, 0x3cc5e32d]]));
}
#[test]
+ fn test_vmd_video_16bpp() {
+ let mut dmx_reg = RegisteredDemuxers::new();
+ game_register_all_demuxers(&mut dmx_reg);
+ let mut dec_reg = RegisteredDecoders::new();
+ game_register_all_codecs(&mut dec_reg);
+
+ test_decoding("vmd", "vmd-video", "assets/Game/HLP1000.VMD", Some(10), &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5Frames(vec![
+ [0x03d77d51, 0x8670ae24, 0x86184cc8, 0x9c928700],
+ [0xf4796f1b, 0x0f75a120, 0x62056509, 0xc83f1a2c],
+ [0xd9e6db4d, 0x7af82082, 0xac6a335c, 0x19b8438f],
+ [0x03d77d51, 0x8670ae24, 0x86184cc8, 0x9c928700],
+ [0xd9e6db4d, 0x7af82082, 0xac6a335c, 0x19b8438f],
+ [0xf4796f1b, 0x0f75a120, 0x62056509, 0xc83f1a2c]]));
+ }
+ #[test]
+ fn test_vmd_video_24bpp() {
+ let mut dmx_reg = RegisteredDemuxers::new();
+ game_register_all_demuxers(&mut dmx_reg);
+ let mut dec_reg = RegisteredDecoders::new();
+ game_register_all_codecs(&mut dec_reg);
+
+ test_decoding("vmd", "vmd-video", "assets/Game/02C.VMD", None, &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0xb580782c, 0xd7fb98c0, 0xaf9b83cc, 0xaea0846b]));
+ }
+ #[test]
fn test_vmd_audio_u8() {
let mut dmx_reg = RegisteredDemuxers::new();
game_register_all_demuxers(&mut dmx_reg);
test_decoding("vmd", "vmd-audio", "assets/Game/1000.VMD", None, &dmx_reg, &dec_reg,
ExpectedTestResult::MD5([0xc36215d3, 0x96530a80, 0x89f1fa8e, 0x49da302b]));
}
+ #[test]
+ fn test_vmd_audio_ima_adpcm() {
+ let mut dmx_reg = RegisteredDemuxers::new();
+ game_register_all_demuxers(&mut dmx_reg);
+ let mut dec_reg = RegisteredDecoders::new();
+ game_register_all_codecs(&mut dec_reg);
+
+ test_decoding("vmd", "vmd-audio", "assets/Game/HLP1000.VMD", None, &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0x76a00405, 0xe4e5378d, 0x495b2a68, 0x4dffe042]));
+ }
}
projects / nihav.git / blobdiff