X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fralf.rs;h=154b80cd8fb8f3227ac2a7ab83dbe51aee2d52fd;hb=6f2630992fe340ad1a122ec10c649f756e478185;hp=dd8b698d3f1bf154ee3ac9406b79bce45125cee9;hpb=000d32472c61617368d72be67300ccdcc45dbd75;p=nihav.git

diff --git a/nihav-realmedia/src/codecs/ralf.rs b/nihav-realmedia/src/codecs/ralf.rs
index dd8b698..154b80c 100644
--- a/nihav-realmedia/src/codecs/ralf.rs
+++ b/nihav-realmedia/src/codecs/ralf.rs
@@ -370,7 +370,7 @@ impl NADecoder for RALFDecoder {
             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,
@@ -426,7 +426,7 @@ impl NADecoder for RALFDecoder {
         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 {
@@ -471,6 +471,12 @@ impl NADecoder for RALFDecoder {
     }
 }
 
+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())
 }
@@ -480,15 +486,16 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_codec_support::test::dec_video::*;
-    use crate::realmedia_register_all_codecs;
+    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);
 
+        // 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]));
     }