-use std::rc::Rc;
-use std::cell::RefCell;
use nihav_core::formats::*;
use nihav_core::frame::*;
use nihav_core::codecs::*;
-use nihav_core::dsp::fft::FFTMode;
use nihav_core::dsp::mdct::IMDCT;
use nihav_core::dsp::window::*;
use nihav_core::io::bitreader::*;
}
fn synth_audio(&mut self, dsp: &mut DSP, abuf: &mut NABufferType, srate_idx: usize) {
let mut adata = abuf.get_abuf_f32().unwrap();
- let mut output = adata.get_data_mut();
+ let output = adata.get_data_mut().unwrap();
let off0 = abuf.get_offset(self.channel);
let off1 = abuf.get_offset(self.channel + 1);
self.ics[0].synth_channel(dsp, &mut output[off0..], srate_idx);
Self {
kbd_long_win, kbd_short_win,
sine_long_win, sine_short_win,
- imdct_long: IMDCT::new(FFTMode::SplitRadix, 1024 * 2, true),
- imdct_short: IMDCT::new(FFTMode::SplitRadix, 128 * 2, true),
+ imdct_long: IMDCT::new(1024 * 2, true),
+ imdct_short: IMDCT::new(128 * 2, true),
tmp: [0.0; 2048], ew_buf: [0.0; 1152],
}
}
}
struct AACDecoder {
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
chmap: NAChannelMap,
m4ainfo: M4AInfo,
pairs: Vec<ChannelPair>,
}
impl NADecoder for AACDecoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Audio(_) = info.get_properties() {
let edata = info.get_extradata().unwrap();
validate!(edata.len() >= 2);
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();
validate!(info.get_properties().is_audio());
let pktbuf = pkt.get_buffer();
let mut frm = NAFrame::new_from_pkt(pkt, self.info.replace_info(NACodecTypeInfo::Audio(ainfo)), abuf);
frm.set_keyframe(true);
- Ok(Rc::new(RefCell::new(frm)))
+ Ok(frm.into_ref())
}
}
#[cfg(test)]
mod test {
- use crate::test::dec_video::*;
+ use nihav_core::codecs::RegisteredDecoders;
+ use nihav_core::demuxers::RegisteredDemuxers;
+ use nihav_core::test::dec_video::test_decode_audio;
+ use crate::codecs::generic_register_all_codecs;
+ use nihav_realmedia::demuxers::realmedia_register_all_demuxers;
#[test]
fn test_aac() {
+ let mut dmx_reg = RegisteredDemuxers::new();
+ realmedia_register_all_demuxers(&mut dmx_reg);
+ let mut dec_reg = RegisteredDecoders::new();
+ generic_register_all_codecs(&mut dec_reg);
+
// let file = "assets/RV/rv40_weighted_mc.rmvb";
let file = "assets/RV/rv40_weighted_mc_2.rmvb";
- test_decode_audio("realmedia", file, Some(12000), "aac");
+ test_decode_audio("realmedia", file, Some(12000), "aac", &dmx_reg, &dec_reg);
}
}