-use std::rc::Rc;
-use std::cell::RefCell;
use nihav_core::formats::*;
use nihav_core::frame::*;
use nihav_core::codecs::*;
}
fn predict(&self, src: &[i32], bits: u8) -> i32 {
let mut acc: i32 = 0;
- for (f, s) in src.iter().rev().take(self.length).zip(self.coeffs.into_iter()) {
+ for (f, s) in src.iter().rev().take(self.length).zip(self.coeffs.iter()) {
acc += *f * *s;
}
let bias = 1 << (self.bits - 1);
const RALF_MAX_PACKET_SIZE: usize = 8192;
struct RALFDecoder {
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
chmap: NAChannelMap,
channels: u8,
let ch0 = abuf.get_offset(0) + self.sample_offset;
let ch1 = abuf.get_offset(1) + self.sample_offset;
let mut adata = abuf.get_abuf_i16().unwrap();
- let mut output = adata.get_data_mut();
+ let output = adata.get_data_mut().unwrap();
match dmode {
0 => {
for i in 0..length {
}
impl NADecoder for RALFDecoder {
- 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() {
let edata = info.get_extradata().unwrap();
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 table_bytes = table_bits >> 3;
validate!((table_bytes + 3 <= pktbuf.len()) && (pktbuf.len() <= RALF_MAX_PACKET_SIZE));
let cmp_len = table_bytes + 2;
- validate!(&pktbuf[..cmp_len] == &self.pkt_buf[..cmp_len]);
+ validate!(pktbuf[..cmp_len] == self.pkt_buf[..cmp_len]);
{
let copy_size = pktbuf.len() - cmp_len;
let dst = &mut self.pkt_buf[RALF_MAX_PACKET_SIZE..][..copy_size];
let mut frm = NAFrame::new_from_pkt(pkt, self.info.replace_info(NACodecTypeInfo::Audio(ainfo)), NABufferType::None);
frm.set_frame_type(FrameType::Skip);
- return Ok(Rc::new(RefCell::new(frm)));
+ return Ok(frm.into_ref());
}
src_len = pktbuf.len();
}
self.blocks.truncate(0);
{
let mut br = BitReader::new(&self.pkt_buf[2..], table_bytes, BitReaderMode::BE);
- while br.tell() < table_bits.into() {
+ while br.tell() < table_bits {
let size = br.read(13 + self.channels).unwrap() as usize;
let pts;
if br.read_bool().unwrap() {
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())
}
}
-pub fn get_decoder() -> Box<NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder> {
Box::new(RALFDecoder::new())
}