X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fcook.rs;h=24df7c7292cb2a9f40cb194bb6acff6656fb012e;hb=2b6a8fdcfd39656130fbbc1ff48fd863b13f7daa;hp=85c8853ff3f9c291564d0eedc940d7c4226c0099;hpb=e64739f87a35f29be0bbbce366876180ba3eb57e;p=nihav.git

diff --git a/nihav-realmedia/src/codecs/cook.rs b/nihav-realmedia/src/codecs/cook.rs
index 85c8853..24df7c7 100644
--- a/nihav-realmedia/src/codecs/cook.rs
+++ b/nihav-realmedia/src/codecs/cook.rs
@@ -1,7 +1,7 @@
 use nihav_core::formats::*;
 use nihav_core::frame::*;
 use nihav_core::codecs::*;
-use nihav_core::dsp::mdct::IMDCT;
+use nihav_codec_support::dsp::mdct::IMDCT;
 use nihav_core::io::bitreader::*;
 use nihav_core::io::byteio::{ByteReader, MemoryReader};
 use nihav_core::io::codebook::*;
@@ -456,7 +456,7 @@ impl CookChannelPair {
                 *out *= cur_gain;
                 cur_gain *= cur_gain2;
             }
-            for i in 0..self.samples { self.delay[ch][i] = dsp.out[i]; }
+            self.delay[ch][..self.samples].copy_from_slice(&dsp.out[..self.samples]);
         }
         Ok(())
     }
@@ -582,6 +582,7 @@ impl NADecoder for CookDecoder {
                             let pair_chmap = self.pairs[i].read_hdr_v2(&mut br)?;
                             self.pairs[i].start_ch = start_ch;
                             validate!((chmap & pair_chmap) == 0);
+                            chmap |= pair_chmap;
                             start_ch += self.pairs[i].mode.get_channels();
                         }
                         self.channels = start_ch;
@@ -676,6 +677,12 @@ impl NADecoder for CookDecoder {
     }
 }
 
+impl NAOptionHandler for CookDecoder {
+    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(CookDecoder::new())
 }
@@ -684,17 +691,18 @@ pub fn get_decoder() -> Box<dyn NADecoder + Send> {
 mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
-    use nihav_core::test::dec_video::*;
-    use crate::realmedia_register_all_codecs;
+    use nihav_codec_support::test::dec_video::*;
+    use crate::realmedia_register_all_decoders;
     use crate::realmedia_register_all_demuxers;
     #[test]
     fn test_cook() {
         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/rv30_weighted_mc.rm";
+        // sample: https://samples.mplayerhq.hu/real/AC-cook/cook_5.1/multichannel.rma
         let file = "assets/RV/multichannel.rma";
         test_decode_audio("realmedia", file, Some(2000), None/*Some("cook")*/, &dmx_reg, &dec_reg);
     }