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;
transform: Transform::None,
version_b: false,
len: 0,
- quants: quants,
+ quants,
bands: [MAX_BANDS + 1; 26],
num_bands: 0,
duration: 0,
}
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) => {
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<NACodecInfo>) -> 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;
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))
};
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();
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;
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];
+ }
+}
+
+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<NAValue> { None }
}
-pub fn get_decoder_dct() -> Box<NADecoder> {
+pub fn get_decoder_dct() -> Box<dyn NADecoder + Send> {
Box::new(BinkAudioDecoder::new(true))
}
-pub fn get_decoder_rdft() -> Box<NADecoder> {
+pub fn get_decoder_rdft() -> Box<dyn NADecoder + Send> {
Box::new(BinkAudioDecoder::new(false))
}
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);
}
}