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
/
ts102366.rs
diff --git
a/nihav-commonfmt/src/codecs/ts102366.rs
b/nihav-commonfmt/src/codecs/ts102366.rs
index 62acaebd95278d5ebc1ea4df184410cc36c0bb9a..cdad8900f2aebfe92b0393cdbc399cfd1290ad6a 100644
(file)
--- a/
nihav-commonfmt/src/codecs/ts102366.rs
+++ b/
nihav-commonfmt/src/codecs/ts102366.rs
@@
-1171,9
+1171,9
@@
impl NADecoder for AudioDecoder {
let mut br;
if (pktbuf[0] == MAGIC_BYTE0) && (pktbuf[1] == MAGIC_BYTE1) {
let mut br;
if (pktbuf[0] == MAGIC_BYTE0) && (pktbuf[1] == MAGIC_BYTE1) {
- br = BitReader::new(pktbuf.as_slice(),
pktbuf.len(),
BitReaderMode::BE);
+ br = BitReader::new(pktbuf.as_slice(), BitReaderMode::BE);
} else if (pktbuf[0] == MAGIC_BYTE1) && (pktbuf[1] == MAGIC_BYTE0) {
} else if (pktbuf[0] == MAGIC_BYTE1) && (pktbuf[1] == MAGIC_BYTE0) {
- br = BitReader::new(pktbuf.as_slice(),
pktbuf.len(),
BitReaderMode::LE16MSB);
+ br = BitReader::new(pktbuf.as_slice(), BitReaderMode::LE16MSB);
} else {
return Err(DecoderError::InvalidData);
}
} else {
return Err(DecoderError::InvalidData);
}
@@
-1240,7
+1240,7
@@
impl NADecoder for AudioDecoder {
}
}
}
}
-pub fn get_decoder() -> Box<dyn NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder
+ Send
> {
Box::new(AudioDecoder::new())
}
Box::new(AudioDecoder::new())
}
@@
-1249,8
+1249,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_ts102366() {
let mut dmx_reg = RegisteredDemuxers::new();
#[test]
fn test_ts102366() {
let mut dmx_reg = RegisteredDemuxers::new();
@@
-1259,7
+1259,7
@@
mod test {
generic_register_all_codecs(&mut dec_reg);
let file = "assets/RV/sp_sample1.rm";
generic_register_all_codecs(&mut dec_reg);
let file = "assets/RV/sp_sample1.rm";
- test_decode_audio("realmedia", file, Some(12000),
"ac3"
, &dmx_reg, &dec_reg);
+ test_decode_audio("realmedia", file, Some(12000),
None/*Some("ac3")*/
, &dmx_reg, &dec_reg);
}
}
}
}