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::*;
for (i, b) in src.iter().enumerate() {
buf[i] = b ^ COOK_XOR_KEY[i & 3];
}
- let mut br = BitReader::new(buf, src.len(), BitReaderMode::BE);
+ let mut br = BitReader::new(&buf[..src.len()], BitReaderMode::BE);
let num_gains = br.read_code(UintCodeType::UnaryOnes)? as usize;
validate!(num_gains <= 8);
*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(())
}
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;
frm.set_keyframe(true);
Ok(frm.into_ref())
}
+ fn flush(&mut self) {
+ for pair in self.pairs.iter_mut() {
+ pair.delay = [[0.0; MAX_SAMPLES]; 2];
+ }
+ }
+}
+
+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> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(CookDecoder::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_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";
let file = "assets/RV/multichannel.rma";
- test_decode_audio("realmedia", file, Some(2000), "cook", &dmx_reg, &dec_reg);
+ test_decode_audio("realmedia", file, Some(2000), None/*Some("cook")*/, &dmx_reg, &dec_reg);
}
}