transform: Transform::None,
version_b: false,
len: 0,
- quants: quants,
+ quants,
bands: [MAX_BANDS + 1; 26],
num_bands: 0,
duration: 0,
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: NACodecInfoRef) -> 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();
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();
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<NADecoder> {
+pub fn get_decoder_dct() -> Box<dyn NADecoder> {
Box::new(BinkAudioDecoder::new(true))
}
-pub fn get_decoder_rdft() -> Box<NADecoder> {
+pub fn get_decoder_rdft() -> Box<dyn NADecoder> {
Box::new(BinkAudioDecoder::new(false))
}
// 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);
+ test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg);
}
}