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
/
atrac3.rs
diff --git
a/nihav-commonfmt/src/codecs/atrac3.rs
b/nihav-commonfmt/src/codecs/atrac3.rs
index 441da8923a9d3695d9e5808bc22bd8ad2a4f516d..044fea69685d1d02863beb42eaa28bba2d3a8098 100644
(file)
--- a/
nihav-commonfmt/src/codecs/atrac3.rs
+++ b/
nihav-commonfmt/src/codecs/atrac3.rs
@@
-622,7
+622,7
@@
impl NADecoder for Atrac3Decoder {
}
{
}
{
- let mut br = BitReader::new(
self.pkt_buf.as_slice(), frame_size
, BitReaderMode::BE);
+ let mut br = BitReader::new(
&self.pkt_buf[0..frame_size]
, BitReaderMode::BE);
let id = br.read(6)?;
validate!(id == 0x28);
self.ch_data[0].decode_unit(&mut br, &self.codebooks, &self.scalefactors)?;
let id = br.read(6)?;
validate!(id == 0x28);
self.ch_data[0].decode_unit(&mut br, &self.codebooks, &self.scalefactors)?;
@@
-644,7
+644,7
@@
impl NADecoder for Atrac3Decoder {
} else {
off = frame_size / 2;
}
} else {
off = frame_size / 2;
}
- let mut br = BitReader::new(&self.pkt_buf[off..
], frame_size - off
, BitReaderMode::BE);
+ let mut br = BitReader::new(&self.pkt_buf[off..
frame_size]
, BitReaderMode::BE);
if self.mode == Mode::JointStereo {
let id = br.read(2)?;
validate!(id == 0x3);
if self.mode == Mode::JointStereo {
let id = br.read(2)?;
validate!(id == 0x3);
@@
-695,7
+695,7
@@
impl NADecoder for Atrac3Decoder {
}
}
}
}
-pub fn get_decoder() -> Box<dyn NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder
+ Send
> {
Box::new(Atrac3Decoder::new())
}
Box::new(Atrac3Decoder::new())
}
@@
-704,8
+704,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_atrac3() {
let mut dmx_reg = RegisteredDemuxers::new();
#[test]
fn test_atrac3() {
let mut dmx_reg = RegisteredDemuxers::new();
@@
-715,7
+715,7
@@
mod test {
let file = "assets/RV/rv30_atrc_384x208_realproducer_plus_8.51.rm";
// let file = "assets/RV/rv20_svt_atrc_640x352_realproducer_plus_8.51.rm";
let file = "assets/RV/rv30_atrc_384x208_realproducer_plus_8.51.rm";
// let file = "assets/RV/rv20_svt_atrc_640x352_realproducer_plus_8.51.rm";
- test_decode_audio("realmedia", file, Some(12000),
"atrac3"
, &dmx_reg, &dec_reg);
+ test_decode_audio("realmedia", file, Some(12000),
None/*Some("atrac3")*/
, &dmx_reg, &dec_reg);
}
}
}
}