X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fralf.rs;h=b3cce732907b9fe42bddd5cdce45937f62069c82;hb=08a1fab72215ea7716f51adf7008f85372e80c71;hp=6edfd85bcd0f15c92a1b88499bc951d2e77109ff;hpb=61d3e29467a4a634bbca56b8acfadcc346122a50;p=nihav.git diff --git a/nihav-realmedia/src/codecs/ralf.rs b/nihav-realmedia/src/codecs/ralf.rs index 6edfd85..b3cce73 100644 --- a/nihav-realmedia/src/codecs/ralf.rs +++ b/nihav-realmedia/src/codecs/ralf.rs @@ -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 { +pub fn get_decoder() -> Box { Box::new(RALFDecoder::new()) } @@ -488,7 +490,7 @@ mod test { realmedia_register_all_codecs(&mut dec_reg); let file = "assets/RV/rv40_ralf.rmvb"; - test_decode_audio("realmedia", file, Some(2000), "ralf", &dmx_reg, &dec_reg); + test_decode_audio("realmedia", file, Some(2000), None/*Some("ralf")*/, &dmx_reg, &dec_reg); //panic!("end"); } }