}
impl NADecoder for DuckADPCMDecoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
validate!(ainfo.get_block_len() > 16);
self.block_len = ainfo.get_block_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 adata = abuf.get_abuf_i16().unwrap();
let mut off0 = adata.get_offset(0);
let mut off1 = adata.get_offset(1);
- let mut dst = adata.get_data_mut();
+ let dst = adata.get_data_mut().unwrap();
for blk in pktbuf.chunks_exact(self.block_len) {
let mut mr = MemoryReader::new_read(blk);
let mut frm = NAFrame::new_from_pkt(pkt, info, abuf);
frm.set_duration(Some(duration as u64));
frm.set_keyframe(false);
- Ok(Rc::new(RefCell::new(frm)))
+ Ok(frm.into_ref())
} else {
Err(DecoderError::InvalidData)
}
}
}
-pub fn get_decoder_dk3() -> Box<NADecoder> {
+pub fn get_decoder_dk3() -> Box<dyn NADecoder> {
Box::new(DuckADPCMDecoder::new(true))
}
-pub fn get_decoder_dk4() -> Box<NADecoder> {
+pub fn get_decoder_dk4() -> Box<dyn NADecoder> {
Box::new(DuckADPCMDecoder::new(false))
}