X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fralf.rs;h=b9790512fd79c8f7c9563edf48b653505507d37e;hb=ce742854b2912b880fb3d3e330042b049dac8504;hp=c5a0f7fabe5266e6c650abfd911ea51d9561ba20;hpb=5580b11b0e9daf065c81a8b354295c6d5d1dd3dd;p=nihav.git diff --git a/nihav-realmedia/src/codecs/ralf.rs b/nihav-realmedia/src/codecs/ralf.rs index c5a0f7f..b979051 100644 --- a/nihav-realmedia/src/codecs/ralf.rs +++ b/nihav-realmedia/src/codecs/ralf.rs @@ -277,7 +277,7 @@ impl RALFDecoder { } } fn decode_block(&mut self, off: usize, size: usize, abuf: &mut NABufferType) -> DecoderResult<()> { - let mut br = BitReader::new(&self.pkt_buf[off..][..size], size, BitReaderMode::BE); + let mut br = BitReader::new(&self.pkt_buf[off..][..size], BitReaderMode::BE); let length = read_block_length(&mut br).unwrap(); validate!(length + self.sample_offset <= self.max_frame_size); @@ -428,7 +428,7 @@ impl NADecoder for RALFDecoder { validate!(src_len > table_bytes + 3); self.blocks.truncate(0); { - let mut br = BitReader::new(&self.pkt_buf[2..], table_bytes, BitReaderMode::BE); + let mut br = BitReader::new(&self.pkt_buf[2..][..table_bytes], BitReaderMode::BE); while br.tell() < table_bits { let size = br.read(13 + self.channels).unwrap() as usize; let pts; @@ -471,7 +471,7 @@ impl NADecoder for RALFDecoder { } } -pub fn get_decoder() -> Box { +pub fn get_decoder() -> Box { Box::new(RALFDecoder::new()) } @@ -479,9 +479,9 @@ pub fn get_decoder() -> Box { mod test { 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; + use nihav_codec_support::test::dec_video::*; + use crate::realmedia_register_all_codecs; + use crate::realmedia_register_all_demuxers; #[test] fn test_ralf() { let mut dmx_reg = RegisteredDemuxers::new();