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-commonfmt
/
src
/
codecs
/
sipro.rs
diff --git
a/nihav-commonfmt/src/codecs/sipro.rs
b/nihav-commonfmt/src/codecs/sipro.rs
index fd035c624ecb8b7125e9f2cf1c8bb86a8381c062..bd72643b663103a6585d9cafe50f4b340d826364 100644
(file)
--- a/
nihav-commonfmt/src/codecs/sipro.rs
+++ b/
nihav-commonfmt/src/codecs/sipro.rs
@@
-685,7
+685,7
@@
impl NADecoder for SiproDecoder {
let frame_len = self.mode.subframe_len * self.mode.subframes;
for (input, output) in pktbuf.chunks(frm_size).zip(dst.chunks_mut(out_frm_size)) {
let frame_len = self.mode.subframe_len * self.mode.subframes;
for (input, output) in pktbuf.chunks(frm_size).zip(dst.chunks_mut(out_frm_size)) {
- let mut br = BitReader::new(input,
input.len(),
BitReaderMode::LE);
+ let mut br = BitReader::new(input, BitReaderMode::LE);
for dst in output.chunks_mut(frame_len) {
self.unpack_frame(&mut br)?;
if self.mode_type.is16k() {
for dst in output.chunks_mut(frame_len) {
self.unpack_frame(&mut br)?;
if self.mode_type.is16k() {
@@
-732,9
+732,11
@@
impl NADecoder for SiproDecoder {
frm.set_keyframe(true);
Ok(frm.into_ref())
}
frm.set_keyframe(true);
Ok(frm.into_ref())
}
+ fn flush(&mut self) {
+ }
}
}
-pub fn get_decoder() -> Box<dyn NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder
+ Send
> {
Box::new(SiproDecoder::new())
}
Box::new(SiproDecoder::new())
}
@@
-743,8
+745,8
@@
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_core::test::dec_video::test_decode_audio;
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_core::test::dec_video::test_decode_audio;
- use crate::
codecs::
generic_register_all_codecs;
- use nihav_realmedia::
demuxers::
realmedia_register_all_demuxers;
+ use crate::generic_register_all_codecs;
+ use nihav_realmedia::realmedia_register_all_demuxers;
#[test]
fn test_sipro() {
let mut dmx_reg = RegisteredDemuxers::new();
#[test]
fn test_sipro() {
let mut dmx_reg = RegisteredDemuxers::new();
@@
-753,7
+755,7
@@
mod test {
generic_register_all_codecs(&mut dec_reg);
let file = "assets/RV/autahi-vox.rm";
generic_register_all_codecs(&mut dec_reg);
let file = "assets/RV/autahi-vox.rm";
- test_decode_audio("realmedia", file, Some(5000),
"sipro"
, &dmx_reg, &dec_reg);
+ test_decode_audio("realmedia", file, Some(5000),
None/*Some("sipro")*/
, &dmx_reg, &dec_reg);
}
}
}
}