let _bits = br.read_u16be().unwrap();
let sample_rate = br.read_u32be().unwrap();
let max_frame_size = br.read_u32be().unwrap();
- validate!((channels == 1 || channels == 2) && (sample_rate >= 8000 && sample_rate <= 96000));
+ validate!((channels == 1 || channels == 2) && (8000..=96000).contains(&sample_rate));
self.max_frame_size = max_frame_size.max(sample_rate) as usize;
let ainfo = NAAudioInfo::new(ainfo.get_sample_rate(), channels as u8,
let table_bits = ((self.pkt_buf[0] as usize) << 8) | (self.pkt_buf[1] as usize);
let table_bytes = (table_bits + 7) >> 3;
validate!(src_len > table_bytes + 3);
- self.blocks.truncate(0);
+ self.blocks.clear();
{
let mut br = BitReader::new(&self.pkt_buf[2..][..table_bytes], BitReaderMode::BE);
while br.tell() < table_bits {
}
}
+impl NAOptionHandler for RALFDecoder {
+ fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+ fn set_options(&mut self, _options: &[NAOption]) { }
+ fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
+}
+
pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(RALFDecoder::new())
}
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_decoders;
+ use crate::realmedia_register_all_demuxers;
#[test]
fn test_ralf() {
let mut dmx_reg = RegisteredDemuxers::new();
realmedia_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- realmedia_register_all_codecs(&mut dec_reg);
+ realmedia_register_all_decoders(&mut dec_reg);
- let file = "assets/RV/rv40_ralf.rmvb";
- test_decode_audio("realmedia", file, Some(2000), None/*Some("ralf")*/, &dmx_reg, &dec_reg);
-//panic!("end");
+ // sample from a private collection
+ test_decoding("realmedia", "ralf", "assets/RV/rv40_ralf.rmvb", None, &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0x6cf18361, 0x9548b5ce, 0x5dfc0b5c, 0x2bd6f392]));
}
}