X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Fatrac3.rs;h=7b543bf2774a34b4ff1709e2cdc7853e4c4f6244;hb=1a967e6bad5f17943b4de0607078eb940ad5adfe;hp=59e690bf3002ef7df26383b000dde3eaff4ef237;hpb=38953fb529efad1b0b609eec77f7839e62ad2719;p=nihav.git diff --git a/nihav-commonfmt/src/codecs/atrac3.rs b/nihav-commonfmt/src/codecs/atrac3.rs index 59e690b..7b543bf 100644 --- a/nihav-commonfmt/src/codecs/atrac3.rs +++ b/nihav-commonfmt/src/codecs/atrac3.rs @@ -679,9 +679,9 @@ impl NADecoder for Atrac3Decoder { let ainfo = self.info.get_properties().get_audio_info().unwrap(); - let mut abuf = alloc_audio_buffer(ainfo, ATRAC3_FRAME_SIZE, self.chmap.clone())?; + let abuf = alloc_audio_buffer(ainfo, ATRAC3_FRAME_SIZE, self.chmap.clone())?; let mut adata = abuf.get_abuf_f32().unwrap(); - let mut output = adata.get_data_mut(); + let output = adata.get_data_mut().unwrap(); for ch in 0..self.channels { let dpos = abuf.get_offset(ch); @@ -700,12 +700,21 @@ pub fn get_decoder() -> Box { #[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::test_decode_audio; + use crate::codecs::generic_register_all_codecs; + use nihav_realmedia::demuxers::realmedia_register_all_demuxers; #[test] fn test_atrac3() { + let mut dmx_reg = RegisteredDemuxers::new(); + realmedia_register_all_demuxers(&mut dmx_reg); + let mut dec_reg = RegisteredDecoders::new(); + generic_register_all_codecs(&mut dec_reg); + 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"); + test_decode_audio("realmedia", file, Some(12000), "atrac3", &dmx_reg, &dec_reg); } }