-use std::rc::Rc;
-use std::cell::RefCell;
use nihav_core::formats::*;
use nihav_core::frame::*;
use nihav_core::codecs::*;
xsincos[k].re = -factor.cos();
xsincos[k].im = -factor.sin();
}
- let fft = FFTBuilder::new_fft(FFTMode::SplitRadix, size/4);
+ let fft = FFTBuilder::new_fft(size/4, false);
IMDCTContext { xsincos: xsincos, size: size, fft: fft }
}
#[allow(non_snake_case)]
let c = FFTComplex { re: c0, im: c1 };
z[k] = c * xsc[k];
}
- fft.do_fft_inplace(z, false);
+ fft.do_ifft_inplace(z);
for k in 0..N4 {
y[k] = z[k] * xsc[k];
}
}
struct AudioDecoder {
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
ablk: AudioBlock,
imdct512: IMDCTContext,
imdct256: IMDCTContext,
}
impl NADecoder for AudioDecoder {
- 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() {
self.info = info.clone();
Ok(())
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())
}
}