X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fdkadpcm.rs;h=399b4f79b006e923f60a9fdb1035c7cba7d63f44;hp=9ff5ed93cecb63987d5364de3b90a5d8697c2121;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=171860fcc4a4ba3ec28bc4b720b9f582377be4cf diff --git a/nihav-duck/src/codecs/dkadpcm.rs b/nihav-duck/src/codecs/dkadpcm.rs index 9ff5ed9..399b4f7 100644 --- a/nihav-duck/src/codecs/dkadpcm.rs +++ b/nihav-duck/src/codecs/dkadpcm.rs @@ -1,35 +1,8 @@ use nihav_core::codecs::*; use nihav_core::io::byteio::*; +use nihav_codec_support::codecs::imaadpcm::*; use std::str::FromStr; -const IMA_MAX_STEP: u8 = 88; -struct IMAState { - predictor: i32, - step: usize, -} - -impl IMAState { - fn new() -> Self { - Self { - predictor: 0, - step: 0, - } - } - fn reset(&mut self, predictor: i16, step: u8) { - self.predictor = predictor as i32; - 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 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.step = istep.max(0).min(IMA_MAX_STEP as isize) as usize; - self.predictor as i16 - } -} - struct DuckADPCMDecoder { ainfo: NAAudioInfo, chmap: NAChannelMap, @@ -51,7 +24,7 @@ impl DuckADPCMDecoder { } impl NADecoder for DuckADPCMDecoder { - fn init(&mut self, info: NACodecInfoRef) -> 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(); @@ -69,7 +42,7 @@ impl NADecoder for DuckADPCMDecoder { Err(DecoderError::InvalidData) } } - fn decode(&mut self, pkt: &NAPacket) -> DecoderResult { + fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let info = pkt.get_stream().get_info(); if let NACodecTypeInfo::Audio(_) = info.get_properties() { let pktbuf = pkt.get_buffer(); @@ -100,7 +73,7 @@ impl NADecoder for DuckADPCMDecoder { 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; @@ -118,9 +91,9 @@ impl NADecoder for DuckADPCMDecoder { 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; @@ -163,13 +136,21 @@ impl NADecoder for DuckADPCMDecoder { Err(DecoderError::InvalidData) } } + fn flush(&mut self) { + } } -pub fn get_decoder_dk3() -> Box { +impl NAOptionHandler for DuckADPCMDecoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } +} + +pub fn get_decoder_dk3() -> Box { Box::new(DuckADPCMDecoder::new(true)) } -pub fn get_decoder_dk4() -> Box { +pub fn get_decoder_dk4() -> Box { Box::new(DuckADPCMDecoder::new(false)) } @@ -177,46 +158,31 @@ pub fn get_decoder_dk4() -> Box { 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_decoders; + use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_dk3() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&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 dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&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])); } } - -const IMA_STEPS: [i8; 16] = [ - -1, -1, -1, -1, 2, 4, 6, 8, - -1, -1, -1, -1, 2, 4, 6, 8 -]; - -const IMA_STEP_TABLE: [i32; 89] = [ - 7, 8, 9, 10, 11, 12, 13, 14, - 16, 17, 19, 21, 23, 25, 28, 31, - 34, 37, 41, 45, 50, 55, 60, 66, - 73, 80, 88, 97, 107, 118, 130, 143, - 157, 173, 190, 209, 230, 253, 279, 307, - 337, 371, 408, 449, 494, 544, 598, 658, - 724, 796, 876, 963, 1060, 1166, 1282, 1411, - 1552, 1707, 1878, 2066, 2272, 2499, 2749, 3024, - 3327, 3660, 4026, 4428, 4871, 5358, 5894, 6484, - 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, - 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767 -];