X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fra144.rs;h=63d4d12548ea2733bee9d0396a0da10c80ac4bb9;hb=ac818eac7671fa8ddfea5aa4fb86fc0b5ab82d2e;hp=35090a657dc398829aa25e4dd30bdfcab0ddbd2b;hpb=fa90ccfb8676a917a02fbb56381f86aa1962d313;p=nihav.git diff --git a/nihav-realmedia/src/codecs/ra144.rs b/nihav-realmedia/src/codecs/ra144.rs index 35090a6..63d4d12 100644 --- a/nihav-realmedia/src/codecs/ra144.rs +++ b/nihav-realmedia/src/codecs/ra144.rs @@ -219,7 +219,7 @@ fn eval_reflection(coeffs: &[i16; LPC_ORDER]) -> Option { dst = &mut tmp2; } let a = (1 << 12) - ((src[i + 1] * src[i + 1]) >> 12); - let scale = if a != 0 { (1 << 24) / a } else { (1 << 24) }; + let scale = if a != 0 { (1 << 24) / a } else { 1 << 24 }; for j in 0..=i { let result = (src[j] - ((tmp3[i + 1] * src[i - j]) >> 12)).checked_mul(scale); if let Some(val) = result { @@ -311,6 +311,12 @@ impl NADecoder for RA144Decoder { } } +impl NAOptionHandler for RA144Decoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } +} + pub fn get_decoder() -> Box { Box::new(RA144Decoder::new()) } @@ -319,15 +325,15 @@ 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_decoders; + use crate::realmedia_register_all_demuxers; #[test] fn test_ra144() { 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/ra3_in_rm_file.rm"; test_decode_audio("realmedia", file, Some(5000), None/*Some("ra14.4")*/, &dmx_reg, &dec_reg);