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-realmedia
/
src
/
codecs
/
ra144.rs
diff --git
a/nihav-realmedia/src/codecs/ra144.rs
b/nihav-realmedia/src/codecs/ra144.rs
index 394ab21adc2fc51becaa23af5203e14cf41e5df2..5cae66cfba421425975a4c69041b0eccf33d10f3 100644
(file)
--- a/
nihav-realmedia/src/codecs/ra144.rs
+++ b/
nihav-realmedia/src/codecs/ra144.rs
@@
-267,7
+267,7
@@
impl NADecoder for RA144Decoder {
let dst = adata.get_data_mut().unwrap();
for (input, output) in pktbuf.chunks(FRAME_SIZE).zip(dst.chunks_mut(NBLOCKS * BLOCKSIZE)) {
let dst = adata.get_data_mut().unwrap();
for (input, output) in pktbuf.chunks(FRAME_SIZE).zip(dst.chunks_mut(NBLOCKS * BLOCKSIZE)) {
- let mut br = BitReader::new(input,
input.len(),
BitReaderMode::BE);
+ let mut br = BitReader::new(input, BitReaderMode::BE);
let mut lpc_refl: [i32; LPC_ORDER] = [0; LPC_ORDER];
for i in 0..LPC_ORDER {
let mut lpc_refl: [i32; LPC_ORDER] = [0; LPC_ORDER];
for i in 0..LPC_ORDER {
@@
-311,6
+311,12
@@
impl NADecoder for RA144Decoder {
}
}
}
}
+impl NAOptionHandler for RA144Decoder {
+ 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() -> Box<dyn NADecoder + Send> {
Box::new(RA144Decoder::new())
}
pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(RA144Decoder::new())
}
@@
-319,15
+325,15
@@
pub fn get_decoder() -> Box<dyn NADecoder + Send> {
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
- use nihav_co
re
::test::dec_video::*;
- use crate::
codecs::realmedia_register_all_codec
s;
- use crate::
demuxers::
realmedia_register_all_demuxers;
+ use nihav_co
dec_support
::test::dec_video::*;
+ use crate::
realmedia_register_all_decoder
s;
+ use crate::realmedia_register_all_demuxers;
#[test]
fn test_ra144() {
let mut dmx_reg = RegisteredDemuxers::new();
realmedia_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
#[test]
fn test_ra144() {
let mut dmx_reg = RegisteredDemuxers::new();
realmedia_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- realmedia_register_all_
codec
s(&mut dec_reg);
+ realmedia_register_all_
decoder
s(&mut dec_reg);
let file = "assets/RV/ra3_in_rm_file.rm";
test_decode_audio("realmedia", file, Some(5000), None/*Some("ra14.4")*/, &dmx_reg, &dec_reg);
let file = "assets/RV/ra3_in_rm_file.rm";
test_decode_audio("realmedia", file, Some(5000), None/*Some("ra14.4")*/, &dmx_reg, &dec_reg);