}
}
+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())
let edata = info.get_extradata();
let flags = if let Some(ref buf) = edata {
validate!(buf.len() >= 2);
- (buf[0] as u16) | ((buf[1] as u16) << 8)
+ u16::from(buf[0]) | (u16::from(buf[1]) << 8)
} else {
0
};
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() + 1) / 2 + 3;
+ fmt = SND_S16_FORMAT;
+ self.blk_size = (ainfo.get_block_len() * channels + 1) / 2 + 3 * channels;
self.mode = VMDAudioMode::ADPCM;
}
};
self.ainfo = NAAudioInfo::new(ainfo.get_sample_rate(), ainfo.get_channels(), fmt, ainfo.get_block_len());
- self.info = info.replace_info(NACodecTypeInfo::Audio(self.ainfo.clone()));
+ self.info = info.replace_info(NACodecTypeInfo::Audio(self.ainfo));
self.chmap = NAChannelMap::from_str(if channels == 1 { "C" } else { "L,R" }).unwrap();
Ok(())
} else {
Err(DecoderError::InvalidData)
}
}
+ #[allow(clippy::identity_op)]
+ #[allow(clippy::cyclomatic_complexity)]
fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let info = pkt.get_stream().get_info();
if let NACodecTypeInfo::Audio(_) = info.get_properties() {
let mut ima = IMAState::new();
for _ in 0..nblocks {
if (mask & 1) != 0 {
+ for i in 0..self.blk_align {
+ dst[doff + i] = 0;
+ }
doff += self.blk_align;
mask >>= 1;
continue;
mask >>= 1;
}
} else {
- return Err(DecoderError::InvalidData);
+ 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] = ima1.expand_sample(b >> 4);
+ doff += 1;
+ dst[doff] = ima2.expand_sample(b & 0xF);
+ doff += 1;
+ }
+ mask >>= 1;
+ }
}
},
};
}
}
+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())
}