projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch NACodecInfo to Arc
[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 45e98ebc92464b51767338f91f20bd9c88f6a99b..38d76c3764f8e1dd2107d2ba7ccb3ef2b6cc69d1 100644
(file)
--- a/
nihav-realmedia/src/codecs/ra144.rs
+++ b/
nihav-realmedia/src/codecs/ra144.rs
@@
-1,5
+1,3
@@
-use std::rc::Rc;
-use std::cell::RefCell;
use nihav_core::formats::*;
use nihav_core::frame::*;
use nihav_core::codecs::*;
use nihav_core::formats::*;
use nihav_core::frame::*;
use nihav_core::codecs::*;
@@
-14,7
+12,7
@@
const FRAME_SIZE: usize = 20;
struct RA144Decoder {
chmap: NAChannelMap,
ainfo: NAAudioInfo,
struct RA144Decoder {
chmap: NAChannelMap,
ainfo: NAAudioInfo,
- info:
Rc<NACodecInfo>
,
+ info:
NACodecInfoRef
,
old_energy: u16,
lpc_data: [[i32; LPC_ORDER]; 2],
old_energy: u16,
lpc_data: [[i32; LPC_ORDER]; 2],
@@
-244,7
+242,7
@@
fn clip_out(sample: i16) -> i16 {
}
impl NADecoder for RA144Decoder {
}
impl NADecoder for RA144Decoder {
- fn init(&mut self, info:
Rc<NACodecInfo>
) -> DecoderResult<()> {
+ fn init(&mut self, info:
NACodecInfoRef
) -> DecoderResult<()> {
if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
self.chmap.add_channels(&CHMAP_MONO);
self.ainfo = NAAudioInfo::new(ainfo.get_sample_rate(),
if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
self.chmap.add_channels(&CHMAP_MONO);
self.ainfo = NAAudioInfo::new(ainfo.get_sample_rate(),
@@
-264,9
+262,9
@@
impl NADecoder for RA144Decoder {
let duration = NBLOCKS * BLOCKSIZE * nframes;
let duration = NBLOCKS * BLOCKSIZE * nframes;
- let
mut
abuf = alloc_audio_buffer(self.ainfo, duration, self.chmap.clone())?;
+ let abuf = alloc_audio_buffer(self.ainfo, duration, self.chmap.clone())?;
let mut adata = abuf.get_abuf_i16().unwrap();
let mut adata = abuf.get_abuf_i16().unwrap();
- let
mut dst = adata.get_data_mut
();
+ 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);
for (input, output) in pktbuf.chunks(FRAME_SIZE).zip(dst.chunks_mut(NBLOCKS * BLOCKSIZE)) {
let mut br = BitReader::new(input, input.len(), BitReaderMode::BE);
@@
-317,11
+315,20
@@
pub fn get_decoder() -> Box<NADecoder> {
#[cfg(test)]
mod test {
#[cfg(test)]
mod test {
- use crate::test::dec_video::*;
+ use nihav_core::codecs::RegisteredDecoders;
+ use nihav_core::demuxers::RegisteredDemuxers;
+ use nihav_core::test::dec_video::*;
+ use crate::codecs::realmedia_register_all_codecs;
+ use crate::demuxers::realmedia_register_all_demuxers;
#[test]
fn test_ra144() {
#[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_codecs(&mut dec_reg);
+
let file = "assets/RV/ra3_in_rm_file.rm";
let file = "assets/RV/ra3_in_rm_file.rm";
- test_decode_audio("realmedia", file, Some(5000), "ra14.4");
+ test_decode_audio("realmedia", file, Some(5000), "ra14.4"
, &dmx_reg, &dec_reg
);
}
}
}
}