}
}
fn reset(&mut self, predictor: i16, step: u8) {
- self.predictor = predictor as i32;
+ self.predictor = i32::from(predictor);
self.step = step.min(IMA_MAX_STEP) as usize;
}
fn expand_sample(&mut self, nibble: u8) -> i16 {
let istep = (self.step as isize) + (IMA_STEPS[nibble as usize] as isize);
let sign = (nibble & 8) != 0;
- let diff = (((2 * (nibble & 7) + 1) as i32) * IMA_STEP_TABLE[self.step]) >> 3;
+ let diff = (i32::from(2 * (nibble & 7) + 1) * IMA_STEP_TABLE[self.step]) >> 3;
let sample = if !sign { self.predictor + diff } else { self.predictor - diff };
- self.predictor = sample.max(std::i16::MIN as i32).min(std::i16::MAX as i32);
+ self.predictor = sample.max(i32::from(std::i16::MIN)).min(i32::from(std::i16::MAX));
self.step = istep.max(0).min(IMA_MAX_STEP as isize) as usize;
self.predictor as i16
}
}
impl NADecoder for DuckADPCMDecoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
validate!(ainfo.get_block_len() > 16);
self.block_len = ainfo.get_block_len();
Err(DecoderError::InvalidData)
}
}
- fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+ 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 pktbuf = pkt.get_buffer();
let nblocks = pktbuf.len() / self.block_len;
let out_block_len = self.ainfo.get_block_len();
let duration = out_block_len * nblocks;
- let mut abuf = alloc_audio_buffer(self.ainfo, duration, self.chmap.clone())?;
+ let abuf = alloc_audio_buffer(self.ainfo, duration, self.chmap.clone())?;
let mut adata = abuf.get_abuf_i16().unwrap();
let mut off0 = adata.get_offset(0);
let mut off1 = adata.get_offset(1);
- let mut dst = adata.get_data_mut();
+ let dst = adata.get_data_mut().unwrap();
for blk in pktbuf.chunks_exact(self.block_len) {
let mut mr = MemoryReader::new_read(blk);
self.ch_state[0].reset(sumpred, sumstep);
self.ch_state[1].reset(diffpred, diffstep);
let mut last_nib = 0;
- let mut diff_val: i32 = diffpred as i32;
+ let mut diff_val: i32 = i32::from(diffpred);
for x in (0..out_block_len).step_by(2) {
let nib0;
let nib1;
nib1 = b0 & 0xF;
nib2 = b0 >> 4;
}
- let sum0 = self.ch_state[0].expand_sample(nib0) as i32;
- let diff = self.ch_state[1].expand_sample(nib1) as i32;
- let sum1 = self.ch_state[0].expand_sample(nib2) as i32;
+ let sum0 = i32::from(self.ch_state[0].expand_sample(nib0));
+ let diff = i32::from(self.ch_state[1].expand_sample(nib1));
+ let sum1 = i32::from(self.ch_state[0].expand_sample(nib2));
diff_val = (diff_val + diff) >> 1;
dst[off0 + x + 0] = (sum0 + diff_val) as i16;
dst[off1 + x + 0] = (sum0 - diff_val) as i16;
let mut frm = NAFrame::new_from_pkt(pkt, info, abuf);
frm.set_duration(Some(duration as u64));
frm.set_keyframe(false);
- Ok(Rc::new(RefCell::new(frm)))
+ Ok(frm.into_ref())
} else {
Err(DecoderError::InvalidData)
}
}
+ fn flush(&mut self) {
+ }
}
-pub fn get_decoder_dk3() -> Box<NADecoder> {
+pub fn get_decoder_dk3() -> Box<dyn NADecoder + Send> {
Box::new(DuckADPCMDecoder::new(true))
}
-pub fn get_decoder_dk4() -> Box<NADecoder> {
+pub fn get_decoder_dk4() -> Box<dyn NADecoder + Send> {
Box::new(DuckADPCMDecoder::new(false))
}
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
- use nihav_core::test::dec_video::*;
- use crate::codecs::duck_register_all_codecs;
- use nihav_commonfmt::demuxers::generic_register_all_demuxers;
+ use nihav_codec_support::test::dec_video::*;
+ use crate::duck_register_all_codecs;
+ use nihav_commonfmt::generic_register_all_demuxers;
#[test]
fn test_dk3() {
let mut dmx_reg = RegisteredDemuxers::new();
let mut dec_reg = RegisteredDecoders::new();
duck_register_all_codecs(&mut dec_reg);
- let file = "assets/Duck/AVI-DUCK-dk3.duk";
- test_decode_audio("avi", file, Some(100), "dk3", &dmx_reg, &dec_reg);
+ //let file = "assets/Duck/AVI-DUCK-dk3.duk";
+ //test_decode_audio("avi", file, Some(100), None/*Some("dk3")*/, &dmx_reg, &dec_reg);
+ test_decoding("avi", "adpcm-dk3", "assets/Duck/AVI-DUCK-dk3.duk", None, &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0xa48fae0a, 0xa536b27f, 0x169ecc19, 0x8436fade]));
}
#[test]
fn test_dk4() {
let mut dec_reg = RegisteredDecoders::new();
duck_register_all_codecs(&mut dec_reg);
- let file = "assets/Duck/virtuafighter2-opening1.avi";
- test_decode_audio("avi", file, Some(100), "dk4", &dmx_reg, &dec_reg);
+// let file = "assets/Duck/virtuafighter2-opening1.avi";
+// test_decode_audio("avi", file, Some(100), None/*Some("dk4")*/, &dmx_reg, &dec_reg);
+ test_decoding("avi", "adpcm-dk4", "assets/Duck/virtuafighter2-opening1.avi", None, &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0x04e40d15, 0xf65b3427, 0x1dd5181f, 0xf321b56f]));
}
}