let vinfo = NACodecInfo::new(if !self.is_indeo { "vmd-video" } else { "indeo3" }, vci, Some(edata));
self.vid_id = strmgr.add_stream(NAStream::new(StreamType::Video, 0, vinfo, 1, 12)).unwrap();
- let srate = read_u16le(&header[804..])? as u32;
+ let srate = u32::from(read_u16le(&header[804..])?);
+ let block_size;
if srate > 0 {
let bsize = read_u16le(&header[806..])? as usize;
- let channels = if (header[811] & 0x80) != 0 { 2 } else { 1 };
+ let channels = if (header[811] & 0x8F) != 0 { 2 } else { 1 };
let is16bit;
- let block_size;
if (bsize & 0x8000) != 0 {
is16bit = true;
block_size = 0x10000 - bsize;
let ahdr = NAAudioInfo::new(srate, channels, if is16bit { SND_S16P_FORMAT } else { SND_U8_FORMAT }, block_size);
let ainfo = NACodecInfo::new("vmd-audio", NACodecTypeInfo::Audio(ahdr), None);
self.aud_id = strmgr.add_stream(NAStream::new(StreamType::Audio, 1, ainfo, 1, srate)).unwrap();
+ } else {
+ block_size = 0;
}
- let adelay = read_u16le(&header[808..])? as u32;
- let idx_off = read_u32le(&header[812..])? as u64;
+ let adelay = u32::from(read_u16le(&header[808..])?);
+ let idx_off = u64::from(read_u32le(&header[812..])?);
src.seek(SeekFrom::Start(idx_off))?;
let mut offs: Vec<u32> = Vec::with_capacity(nframes);
for i in 0..nframes {
for _ in 0..fpb {
let chtype = src.read_byte()?;
src.read_skip(1)?;
- let size = src.read_u32le()?;
+ let mut size = src.read_u32le()?;
let mut hdr: [u8; FRAME_HDR_SIZE] = [0; FRAME_HDR_SIZE];
src.read_buf(&mut hdr)?;
+ if (i == 0) && (chtype == CHTYPE_AUDIO) && (size > 4) && ((size as usize) < block_size/2) {
+ size += 0x10000;
+ }
if (chtype == CHTYPE_VIDEO || chtype == CHTYPE_AUDIO) && (size > 0) {
let ts = if (i == 0) || (chtype != CHTYPE_AUDIO) {
i as u32
if self.fno >= self.frames.len() { return Err(DemuxerError::EOF); }
let cur_frame = &self.frames[self.fno];
//println!("fno {} -> type {} size {} @ {:X} ts {}", self.fno, cur_frame.chtype, cur_frame.size, cur_frame.off, cur_frame.ts);
- let next_pos = cur_frame.off as u64;
+ let next_pos = u64::from(cur_frame.off);
if self.src.tell() != next_pos {
self.src.seek(SeekFrom::Start(next_pos))?;
}
let str_id = if is_video { self.vid_id } else { self.aud_id };
let str = strmgr.get_stream(str_id).unwrap();
let (tb_num, tb_den) = str.get_timebase();
- let ts = NATimeInfo::new(Some(cur_frame.ts as u64), None, None, tb_num, tb_den);
+ let ts = NATimeInfo::new(Some(u64::from(cur_frame.ts)), None, None, tb_num, tb_den);
let pkt = NAPacket::new(str, ts, false, buf);
Ok(pkt)
pub struct VMDDemuxerCreator { }
impl DemuxerCreator for VMDDemuxerCreator {
- fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<DemuxCore<'a> + 'a> {
+ fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<dyn DemuxCore<'a> + 'a> {
Box::new(VMDDemuxer::new(br))
}
fn get_name(&self) -> &'static str { "vmd" }
#[test]
fn test_vmd_demux() {
- let mut file = File::open("assets/128.vmd").unwrap();
- //let mut file = File::open("assets/1491.VMD").unwrap();
+ let mut file = File::open("assets/Game/128.vmd").unwrap();
+ //let mut file = File::open("assets/Game/1491.VMD").unwrap();
let mut fr = FileReader::new_read(&mut file);
let mut br = ByteReader::new(&mut fr);
let mut dmx = VMDDemuxer::new(&mut br);