X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fcook.rs;h=ba3b27689b25954cad634f998eda1cad4303590b;hb=01613464323864a655c994820d3c43df1954e3b2;hp=de7ac54069da3be4453318deddb5a0b1d60f9f5a;hpb=5641dccfbf2a70d589cf094a0d4ed5a10f919f00;p=nihav.git diff --git a/nihav-realmedia/src/codecs/cook.rs b/nihav-realmedia/src/codecs/cook.rs index de7ac54..ba3b276 100644 --- a/nihav-realmedia/src/codecs/cook.rs +++ b/nihav-realmedia/src/codecs/cook.rs @@ -1,5 +1,3 @@ -use std::rc::Rc; -use std::cell::RefCell; use nihav_core::formats::*; use nihav_core::frame::*; use nihav_core::codecs::*; @@ -433,7 +431,7 @@ impl CookChannelPair { for ch in 0..self.mode.get_channels() { let off = abuf.get_offset(ch + self.start_ch); let mut adata = abuf.get_abuf_f32().unwrap(); - let mut output = adata.get_data_mut(); + let output = adata.get_data_mut().unwrap(); let dst = &mut output[off..]; dsp.imdct.imdct(&self.block[ch], &mut dsp.out); @@ -523,7 +521,7 @@ impl RND { } struct CookDecoder { - info: Rc, + info: NACodecInfoRef, chmap: NAChannelMap, src: [u8; 65536], num_pairs: usize, @@ -553,7 +551,7 @@ impl CookDecoder { } impl NADecoder for CookDecoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() { let edata = info.get_extradata().unwrap(); validate!(edata.len() >= 4); @@ -634,7 +632,7 @@ impl NADecoder for CookDecoder { Err(DecoderError::InvalidData) } } - fn decode(&mut self, pkt: &NAPacket) -> DecoderResult { + fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let info = pkt.get_stream().get_info(); validate!(info.get_properties().is_audio()); let pktbuf = pkt.get_buffer(); @@ -670,7 +668,7 @@ impl NADecoder for CookDecoder { 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()) } } @@ -680,12 +678,21 @@ pub fn get_decoder() -> Box { #[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_cook() { + 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/rv30_weighted_mc.rm"; let file = "assets/RV/multichannel.rma"; - test_decode_audio("realmedia", file, Some(2000), "cook"); + test_decode_audio("realmedia", file, Some(2000), "cook", &dmx_reg, &dec_reg); } }