projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make all codec crates export just register_all functions and document them
[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 b0c4fc2305101b07702dc27898820cf065e6dfee..7e34739f07a2f6dbb8992ead35b3aed168e96e5a 100644
(file)
--- a/
nihav-rad/src/codecs/binkaud.rs
+++ b/
nihav-rad/src/codecs/binkaud.rs
@@
-234,7
+234,7
@@
impl NADecoder for BinkAudioDecoder {
if let NACodecTypeInfo::Audio(_) = info.get_properties() {
let pktbuf = pkt.get_buffer();
validate!(pktbuf.len() > 1);
if let NACodecTypeInfo::Audio(_) = info.get_properties() {
let pktbuf = pkt.get_buffer();
validate!(pktbuf.len() > 1);
- let mut br = BitReader::new(&pktbuf,
pktbuf.len(),
BitReaderMode::LE);
+ let mut br = BitReader::new(&pktbuf, BitReaderMode::LE);
let nsamples = br.read(32)? as usize;
// validate!(nsamples % self.duration == 0);
let nsamples = br.read(32)? as usize;
// validate!(nsamples % self.duration == 0);
@@
-273,13
+273,16
@@
impl NADecoder for BinkAudioDecoder {
Err(DecoderError::InvalidData)
}
}
Err(DecoderError::InvalidData)
}
}
+ fn flush(&mut self) {
+ self.delay = [[0.0; 256]; 2];
+ }
}
}
-pub fn get_decoder_dct() -> Box<dyn NADecoder> {
+pub fn get_decoder_dct() -> Box<dyn NADecoder
+ Send
> {
Box::new(BinkAudioDecoder::new(true))
}
Box::new(BinkAudioDecoder::new(true))
}
-pub fn get_decoder_rdft() -> Box<dyn NADecoder> {
+pub fn get_decoder_rdft() -> Box<dyn NADecoder
+ Send
> {
Box::new(BinkAudioDecoder::new(false))
}
Box::new(BinkAudioDecoder::new(false))
}
@@
-288,8
+291,8
@@
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_core::test::dec_video::*;
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_core::test::dec_video::*;
- use crate::
codecs::
rad_register_all_codecs;
- use crate::
demuxers::
rad_register_all_demuxers;
+ use crate::rad_register_all_codecs;
+ use crate::rad_register_all_demuxers;
#[test]
fn test_bink_audio() {
#[test]
fn test_bink_audio() {
@@
-303,6
+306,6
@@
mod test {
// let file = "assets/RAD/Snd0a110c51.dee";
// let file = "assets/RAD/NEW.BIK";
// let file = "assets/RAD/ge_video_86l.bk2";
// let file = "assets/RAD/Snd0a110c51.dee";
// let file = "assets/RAD/NEW.BIK";
// let file = "assets/RAD/ge_video_86l.bk2";
- test_decode_audio("bink", file, None,
"bink"
, &dmx_reg, &dec_reg);
+ test_decode_audio("bink", file, None,
None/*Some("bink")*/
, &dmx_reg, &dec_reg);
}
}
}
}