X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fbinkaud.rs;h=1cdb0a1ddbf2c7d6334414786946f8577606cdbf;hp=a85a07ed00fd5ee2a3986dcb421d3b1863d9f5bc;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=e5ea652540a63efcd09af052d74d2c6bcaa0a65a diff --git a/nihav-rad/src/codecs/binkaud.rs b/nihav-rad/src/codecs/binkaud.rs index a85a07e..1cdb0a1 100644 --- a/nihav-rad/src/codecs/binkaud.rs +++ b/nihav-rad/src/codecs/binkaud.rs @@ -1,6 +1,6 @@ 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; @@ -71,7 +71,7 @@ impl BinkAudioDecoder { transform: Transform::None, version_b: false, len: 0, - quants: quants, + quants, bands: [MAX_BANDS + 1; 26], num_bands: 0, duration: 0, @@ -130,6 +130,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) => { @@ -152,15 +153,7 @@ impl BinkAudioDecoder { for i in 0..(self.len >> 4) { self.delay[chno][i] = self.coeffs[self.duration + i]; } - } else { // somehow it ends here in reverse order - for i in 0..self.len >> 2 { - let t0 = self.coeffs[self.len - 2 - i * 2]; - let t1 = self.coeffs[self.len - 1 - i * 2]; - self.coeffs[self.len - 2 - i * 2] = self.coeffs[i * 2]; - self.coeffs[self.len - 1 - i * 2] = self.coeffs[i * 2 + 1]; - self.coeffs[i * 2] = t0; - self.coeffs[i * 2 + 1] = t1; - } + } else { let overlap_len = if self.first_frm { 0 } else { self.len >> 8 }; overlap(&self.delay[0], &self.coeffs[0..], &mut dst[off0..], overlap_len, 2); overlap(&self.delay[1], &self.coeffs[1..], &mut dst[off1..], overlap_len, 2); @@ -186,13 +179,13 @@ const CRITICAL_FREQS: [usize; MAX_BANDS] = [ 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, info: Rc) -> DecoderResult<()> { + fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() { let srate = ainfo.get_sample_rate(); let channels = ainfo.get_channels(); validate!(channels <= 2); self.ainfo = NAAudioInfo::new(srate, channels, SND_F32P_FORMAT, 2); - self.chmap = NAChannelMap::from_str("L,R").unwrap(); + self.chmap = NAChannelMap::from_str(if channels == 2 {"L,R"} else {"C"}).unwrap(); if let Some(ref edata) = info.get_extradata() { if edata.as_slice() == b"BIKb" { self.version_b = true; @@ -211,7 +204,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)) + Transform::RDFT(RDFTBuilder::new_rdft(self.len >> 1, false, false)) } else { Transform::DCT(DCT::new(DCTMode::DCT_III, self.len)) }; @@ -237,20 +230,20 @@ impl NADecoder for BinkAudioDecoder { 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(); 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); - let mut abuf = alloc_audio_buffer(self.ainfo, nsamples / self.chmap.num_channels() / 2, self.chmap.clone())?; + let abuf = alloc_audio_buffer(self.ainfo, nsamples / self.chmap.num_channels() / 2, self.chmap.clone())?; let mut adata = abuf.get_abuf_f32().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(); let num_subframes = nsamples / self.duration / self.chmap.num_channels() / 2; @@ -276,18 +269,27 @@ impl NADecoder for BinkAudioDecoder { let mut frm = NAFrame::new_from_pkt(pkt, info, abuf); frm.set_duration(Some(self.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) { + 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)) } @@ -295,22 +297,28 @@ 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() { + 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); + + let file = "assets/RAD/ActivisionLogo.bik"; + test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg); + } + #[test] + 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); + let file = "assets/RAD/NWCLOGO.BIK"; + test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg); } }