X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fbinkaud.rs;h=b424c0ee479ef248c8689b51d82344504b6c6a15;hb=e9f61dd24a78c4a42537ab129a14a37107e8b5a0;hp=c09bcfb0774a77a2440c378220ac4ac2ba93129e;hpb=01613464323864a655c994820d3c43df1954e3b2;p=nihav.git diff --git a/nihav-rad/src/codecs/binkaud.rs b/nihav-rad/src/codecs/binkaud.rs index c09bcfb..b424c0e 100644 --- a/nihav-rad/src/codecs/binkaud.rs +++ b/nihav-rad/src/codecs/binkaud.rs @@ -1,18 +1,17 @@ use nihav_core::codecs::*; -use nihav_core::dsp::dct::*; -use nihav_core::dsp::fft::*; +use nihav_codec_support::dsp::dct::*; +use nihav_codec_support::dsp::fft::*; use nihav_core::io::bitreader::*; -use std::f32::consts; use std::str::FromStr; +use super::binkauddata::*; + enum Transform { None, DCT(DCT), RDFT(RDFT), } -const MAX_BANDS: usize = 25; - struct BinkAudioDecoder { ainfo: NAAudioInfo, chmap: NAChannelMap, @@ -45,8 +44,8 @@ fn read_bink_float(br: &mut BitReader) -> DecoderResult { Ok(v) }*/ let exp = br.read(5)? as u8; - let mant = br.read(23)? as u32; - let sign = br.read(1)? as u32; + let mant = br.read(23)?; + let sign = br.read(1)?; let nexp = exp.wrapping_add(0x7E) as u32; let nmant = (mant << 1) & ((1 << 23) - 1); Ok(f32::from_bits((sign << 31) | (nexp << 23) | nmant)) @@ -60,10 +59,6 @@ fn overlap(a: &[f32], b: &[f32], dst: &mut [f32], len: usize, step: usize) { impl BinkAudioDecoder { fn new(use_dct: bool) -> Self { - let mut quants: [f32; 96] = [0.0; 96]; - for i in 0..quants.len() { - quants[i] = ((i as f32) * 0.0664 / consts::LOG10_E).exp(); - } Self { ainfo: NAAudioInfo::new(0, 1, SND_F32P_FORMAT, 0), chmap: NAChannelMap::new(), @@ -71,7 +66,7 @@ impl BinkAudioDecoder { transform: Transform::None, version_b: false, len: 0, - quants: quants, + quants: get_quants_table(), bands: [MAX_BANDS + 1; 26], num_bands: 0, duration: 0, @@ -130,6 +125,7 @@ impl BinkAudioDecoder { } Ok(()) } + #[allow(clippy::transmute_ptr_to_ptr)] fn output(&mut self, dst: &mut [f32], off0: usize, off1: usize, chno: usize) { match self.transform { Transform::DCT(ref mut dct) => { @@ -168,15 +164,6 @@ impl BinkAudioDecoder { } } -const CRITICAL_FREQS: [usize; MAX_BANDS] = [ - 100, 200, 300, 400, 510, 630, 770, 920, - 1080, 1270, 1480, 1720, 2000, 2320, 2700, 3150, - 3700, 4400, 5300, 6400, 7700, 9500, 12000, 15500, - 24500 -]; - -const RUN_TAB: [usize; 16] = [ 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 32, 64 ]; - impl NADecoder for BinkAudioDecoder { fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() { @@ -203,7 +190,7 @@ impl NADecoder for BinkAudioDecoder { self.duration >>= 1; } self.transform = if !self.use_dct { - Transform::RDFT(RDFTBuilder::new_rdft(FFTMode::SplitRadix, self.len >> 1, false, false)) + Transform::RDFT(RDFTBuilder::new_rdft(self.len >> 1, false, false)) } else { Transform::DCT(DCT::new(DCTMode::DCT_III, self.len)) }; @@ -213,15 +200,7 @@ impl NADecoder for BinkAudioDecoder { (2.0 / (self.len as f32)).sqrt() / 1024.0 }; let s_srate = if single { srate } else { srate >> 1 } as usize; - self.num_bands = 1; - while self.num_bands < CRITICAL_FREQS.len() && CRITICAL_FREQS[self.num_bands - 1] < s_srate { - self.num_bands += 1; - } - self.bands[0] = 2; - for i in 1..self.num_bands { - self.bands[i] = (CRITICAL_FREQS[i - 1] * self.len / s_srate) & !1; - } - self.bands[self.num_bands] = self.len; + init_bands(s_srate, self.len, &mut self.num_bands, &mut self.bands); self.first_frm = true; Ok(()) @@ -234,7 +213,7 @@ impl NADecoder for BinkAudioDecoder { if let NACodecTypeInfo::Audio(_) = info.get_properties() { let pktbuf = pkt.get_buffer(); validate!(pktbuf.len() > 1); - let mut br = BitReader::new(&pktbuf, pktbuf.len(), BitReaderMode::LE); + let mut br = BitReader::new(&pktbuf, BitReaderMode::LE); let nsamples = br.read(32)? as usize; // validate!(nsamples % self.duration == 0); @@ -273,13 +252,22 @@ impl NADecoder for BinkAudioDecoder { Err(DecoderError::InvalidData) } } + fn flush(&mut self) { + self.delay = [[0.0; 256]; 2]; + } } -pub fn get_decoder_dct() -> Box { +impl NAOptionHandler for BinkAudioDecoder { + 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_dct() -> Box { Box::new(BinkAudioDecoder::new(true)) } -pub fn get_decoder_rdft() -> Box { +pub fn get_decoder_rdft() -> Box { Box::new(BinkAudioDecoder::new(false)) } @@ -287,22 +275,30 @@ pub fn get_decoder_rdft() -> Box { mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; - use nihav_core::test::dec_video::*; - use crate::codecs::rad_register_all_codecs; - use crate::demuxers::rad_register_all_demuxers; + use nihav_codec_support::test::dec_video::*; + use crate::rad_register_all_decoders; + use crate::rad_register_all_demuxers; + + #[test] + fn test_bink_audio_dct() { + let mut dmx_reg = RegisteredDemuxers::new(); + rad_register_all_demuxers(&mut dmx_reg); + let mut dec_reg = RegisteredDecoders::new(); + rad_register_all_decoders(&mut dec_reg); + // sample: https://samples.mplayerhq.hu/game-formats/bink/ActivisionLogo.bik + let file = "assets/RAD/ActivisionLogo.bik"; + test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg); + } #[test] - fn test_bink_audio() { + fn test_bink_audio_rdft() { let mut dmx_reg = RegisteredDemuxers::new(); rad_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - rad_register_all_codecs(&mut dec_reg); + rad_register_all_decoders(&mut dec_reg); -// let file = "assets/RAD/ActivisionLogo.bik"; - let file = "assets/RAD/original.bik"; -// let file = "assets/RAD/Snd0a110c51.dee"; -// let file = "assets/RAD/NEW.BIK"; -// let file = "assets/RAD/ge_video_86l.bk2"; - test_decode_audio("bink", file, None, "bink", &dmx_reg, &dec_reg); + // sample from Heroes of Might and Magic 3 + let file = "assets/RAD/NWCLOGO.BIK"; + test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg); } }