}
}
+impl<'a> NAOptionHandler for AVIDemuxer<'a> {
+ fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+ fn set_options(&mut self, _options: &[NAOption]) { }
+ fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
+}
+
impl<'a> AVIDemuxer<'a> {
fn new(io: &'a mut ByteReader<'a>) -> Self {
AVIDemuxer {
newpal[i * 4] = self.src.read_byte()?;
newpal[i * 4 + 1] = self.src.read_byte()?;
newpal[i * 4 + 2] = self.src.read_byte()?;
- newpal[i * 4 + 3] = self.src.read_byte()?;
+ newpal[i * 4 + 3] = 0;
+ self.src.read_byte()?; // flags
}
pe.pal = Arc::new(newpal);
pe.changed = true;
fn parse_strf_vids(dmx: &mut AVIDemuxer, strmgr: &mut StreamManager, size: usize) -> DemuxerResult<usize> {
if size < 40 { return Err(InvalidData); }
let bi_size = dmx.src.read_u32le()?;
- if (bi_size as usize) > size { return Err(InvalidData); }
+ if (bi_size as usize) < 40 { return Err(InvalidData); }
let width = dmx.src.read_u32le()?;
let height = dmx.src.read_u32le()? as i32;
let planes = dmx.src.read_u16le()?;
let flip = height < 0;
let format = if bitcount > 8 { RGB24_FORMAT } else { PAL8_FORMAT };
- let vhdr = NAVideoInfo::new(width as usize, if flip { -height as usize } else { height as usize}, flip, PAL8_FORMAT);
+ let mut vhdr = NAVideoInfo::new(width as usize, if flip { -height as usize } else { height as usize}, flip, format);
+ vhdr.bits = (planes as u8) * (bitcount as u8);
let vci = NACodecTypeInfo::Video(vhdr);
let edata = dmx.read_extradata(size - 40)?;
if colors > 0 {
if let Some(ref buf) = edata {
let mut pal = [0u8; 1024];
for (dpal, spal) in pal.chunks_mut(4).take(colors as usize).zip(buf.chunks(4)) {
- dpal[0] = spal[0];
+ dpal[0] = spal[2];
dpal[1] = spal[1];
- dpal[2] = spal[2];
- dpal[3] = spal[3];
+ dpal[2] = spal[0];
+ dpal[3] = 0;
}
let pal = PalInfo { pal: Arc::new(pal), changed: true, stream_no: strmgr.get_num_streams() };
dmx.pal.push(pal);
let soniton = NASoniton::new(bits_per_sample as u8, SONITON_FLAG_SIGNED);
let ahdr = NAAudioInfo::new(samplespersec, channels as u8, soniton, block_align as usize);
- let edata = dmx.read_extradata(size - 16)?;
+ let edata;
+ if size > 16 {
+ let edata_size = dmx.src.read_u16le()? as usize;
+ validate!(edata_size + 18 == size);
+ edata = dmx.read_extradata(size - 18)?;
+ } else {
+ edata = None;
+ }
let cname = match register::find_codec_from_wav_twocc(w_format_tag) {
None => "unknown",
Some(name) => name,
let (tb_num, tb_den) = str.get_timebase();
let pts = counter[stream_no];
let time = NATimeInfo::ts_to_time(pts, 1000, tb_num, tb_den);
- seek_idx.add_entry(stream_no as u32, SeekEntry { time, pts, pos: offset + movi_pos - 4 });
+ validate!(offset >= movi_pos);
+ seek_idx.add_entry(stream_no as u32, SeekEntry { time, pts, pos: offset });
}
key_offs.push(offset);
}