-use std::rc::Rc;
-use std::cell::RefCell;
use nihav_core::formats::*;
use nihav_core::frame::*;
use nihav_core::codecs::*;
struct RA288Decoder {
chmap: NAChannelMap,
ainfo: NAAudioInfo,
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
speech_lpc: [f32; SP_LPC_ORDER],
speech_hist: [f32; 111],
}
impl NADecoder for RA288Decoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
self.chmap.add_channels(&CHMAP_MONO);
self.ainfo = NAAudioInfo::new(ainfo.get_sample_rate(),
let nframes = pktbuf.len() / FRAME_SIZE;
let duration = NBLOCKS * BLOCKSIZE * nframes;
- let mut abuf = alloc_audio_buffer(self.ainfo, duration, self.chmap.clone())?;
+ let abuf = alloc_audio_buffer(self.ainfo, duration, self.chmap.clone())?;
let mut adata = abuf.get_abuf_f32().unwrap();
- let mut dst = adata.get_data_mut();
+ let dst = adata.get_data_mut().unwrap();
for (input, output) in pktbuf.chunks(FRAME_SIZE).zip(dst.chunks_mut(NBLOCKS * BLOCKSIZE)) {
let mut br = BitReader::new(input, input.len(), BitReaderMode::LE);
#[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::*;
+ use crate::codecs::realmedia_register_all_codecs;
+ use crate::demuxers::realmedia_register_all_demuxers;
#[test]
fn test_ra288() {
+ let mut dmx_reg = RegisteredDemuxers::new();
+ realmedia_register_all_demuxers(&mut dmx_reg);
+ let mut dec_reg = RegisteredDecoders::new();
+ realmedia_register_all_codecs(&mut dec_reg);
+
let file = "assets/RV/A0000044.rm";
- test_decode_audio("realmedia", file, Some(5000), "ra28.8");
+ test_decode_audio("realmedia", file, Some(5000), "ra28.8", &dmx_reg, &dec_reg);
}
}