projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename register_all_codecs to register_all_decoders
[nihav.git]
/
nihav-rad
/
src
/
codecs
/
binkaud.rs
diff --git
a/nihav-rad/src/codecs/binkaud.rs
b/nihav-rad/src/codecs/binkaud.rs
index 479ee35d1b2fac7fc8f54c270d334acae5cfcd6b..1cdb0a1ddbf2c7d6334414786946f8577606cdbf 100644
(file)
--- a/
nihav-rad/src/codecs/binkaud.rs
+++ b/
nihav-rad/src/codecs/binkaud.rs
@@
-130,6
+130,7
@@
impl BinkAudioDecoder {
}
Ok(())
}
}
Ok(())
}
+ #[allow(clippy::transmute_ptr_to_ptr)]
fn output(&mut self, dst: &mut [f32], off0: usize, off1: usize, chno: usize) {
match self.transform {
Transform::DCT(ref mut dct) => {
fn output(&mut self, dst: &mut [f32], off0: usize, off1: usize, chno: usize) {
match self.transform {
Transform::DCT(ref mut dct) => {
@@
-278,6
+279,12
@@
impl NADecoder for BinkAudioDecoder {
}
}
}
}
+impl NAOptionHandler for BinkAudioDecoder {
+ 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_dct() -> Box<dyn NADecoder + Send> {
Box::new(BinkAudioDecoder::new(true))
}
pub fn get_decoder_dct() -> Box<dyn NADecoder + Send> {
Box::new(BinkAudioDecoder::new(true))
}
@@
-291,7
+298,7
@@
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_codec_support::test::dec_video::*;
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_codec_support::test::dec_video::*;
- use crate::rad_register_all_
codec
s;
+ use crate::rad_register_all_
decoder
s;
use crate::rad_register_all_demuxers;
#[test]
use crate::rad_register_all_demuxers;
#[test]
@@
-299,7
+306,7
@@
mod test {
let mut dmx_reg = RegisteredDemuxers::new();
rad_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
let mut dmx_reg = RegisteredDemuxers::new();
rad_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- rad_register_all_
codec
s(&mut dec_reg);
+ rad_register_all_
decoder
s(&mut dec_reg);
let file = "assets/RAD/ActivisionLogo.bik";
test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg);
let file = "assets/RAD/ActivisionLogo.bik";
test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg);
@@
-309,7
+316,7
@@
mod test {
let mut dmx_reg = RegisteredDemuxers::new();
rad_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
let mut dmx_reg = RegisteredDemuxers::new();
rad_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- rad_register_all_
codec
s(&mut dec_reg);
+ rad_register_all_
decoder
s(&mut dec_reg);
let file = "assets/RAD/NWCLOGO.BIK";
test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg);
let file = "assets/RAD/NWCLOGO.BIK";
test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg);