X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fralf.rs;h=7bcab6bdbfce8fc85571382e9da4e6635a2f92b5;hb=f9be4e750dccff762b9a3d894faec50ffdb59233;hp=b8a06d140f1ecd67ba987689b87430c699ed7af9;hpb=171860fcc4a4ba3ec28bc4b720b9f582377be4cf;p=nihav.git

diff --git a/nihav-realmedia/src/codecs/ralf.rs b/nihav-realmedia/src/codecs/ralf.rs
index b8a06d1..7bcab6b 100644
--- a/nihav-realmedia/src/codecs/ralf.rs
+++ b/nihav-realmedia/src/codecs/ralf.rs
@@ -140,7 +140,7 @@ impl Filter {
     }
     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);
@@ -355,7 +355,7 @@ fn read_block_length(br: &mut BitReader) -> DecoderResult<usize> {
 }
 
 impl NADecoder for RALFDecoder {
-    fn init(&mut self, info: NACodecInfoRef) -> 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();
 
@@ -389,7 +389,7 @@ impl NADecoder for RALFDecoder {
             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();
@@ -402,7 +402,7 @@ impl NADecoder for RALFDecoder {
             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];
@@ -429,7 +429,7 @@ impl NADecoder for RALFDecoder {
         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() {
@@ -467,9 +467,11 @@ impl NADecoder for RALFDecoder {
         frm.set_keyframe(true);
         Ok(frm.into_ref())
     }
+    fn flush(&mut self) {
+    }
 }
 
-pub fn get_decoder() -> Box<NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder> {
     Box::new(RALFDecoder::new())
 }