X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fcodecs%2Fatrac3.rs;h=044fea69685d1d02863beb42eaa28bba2d3a8098;hp=59e690bf3002ef7df26383b000dde3eaff4ef237;hb=e64739f87a35f29be0bbbce366876180ba3eb57e;hpb=38953fb529efad1b0b609eec77f7839e62ad2719 diff --git a/nihav-commonfmt/src/codecs/atrac3.rs b/nihav-commonfmt/src/codecs/atrac3.rs index 59e690b..044fea6 100644 --- a/nihav-commonfmt/src/codecs/atrac3.rs +++ b/nihav-commonfmt/src/codecs/atrac3.rs @@ -1,12 +1,9 @@ -use std::rc::Rc; -use std::cell::RefCell; use nihav_core::formats::*; use nihav_core::frame::*; use nihav_core::codecs::*; use nihav_core::io::bitreader::*; use nihav_core::io::byteio::*; use nihav_core::io::codebook::*; -use nihav_core::dsp::fft::FFTMode; use nihav_core::dsp::mdct::IMDCT; use std::f32::consts; @@ -159,8 +156,7 @@ impl Channel { } fn synth(&mut self, dsp: &mut DSP) { let mut flag = 0; - let mut band = 0; - for (data, delay) in self.data.chunks_mut(256).zip(self.delay.chunks_mut(256)) { + for (band, (data, delay)) in self.data.chunks_mut(256).zip(self.delay.chunks_mut(256)).enumerate() { if (flag & 1) != 0 { for i in 0..128 { let t0 = data[i]; @@ -173,7 +169,6 @@ impl Channel { dsp.apply_gains(data, delay, &mut self.gain_data, self.block_no, band); delay.copy_from_slice(&dsp.tmp[256..512]); flag ^= 1; - band += 1; } self.block_no ^= 1; } @@ -212,15 +207,15 @@ const ATRAC3_MODE0_BITS: [u8; 8] = [ 0, 4, 3, 3, 4, 4, 5, 6 ]; fn read_coeffs_mode0(br: &mut BitReader, dst: &mut [f32], quant: usize, scale: f32) -> DecoderResult<()> { let bits = ATRAC3_MODE0_BITS[quant]; if bits > 0 { - for i in 0..dst.len() { + for el in dst.iter_mut() { let val = br.read_s(bits)? as f32; - dst[i] = val * scale; + *el = val * scale; } } else { - for i in (0..dst.len()).step_by(2) { + for out in dst.chunks_mut(2) { let val = br.read(4)? as usize; - dst[i + 0] = ATRAC3_MODE0_CB[val >> 2] * scale; - dst[i + 1] = ATRAC3_MODE0_CB[val & 3] * scale; + out[0] = ATRAC3_MODE0_CB[val >> 2] * scale; + out[1] = ATRAC3_MODE0_CB[val & 3] * scale; } } Ok(()) @@ -239,20 +234,20 @@ const ATRAC3_MODE1_CB: [f32; 9 * 2] = [ ]; fn read_coeffs_mode1(br: &mut BitReader, cb: &Codebook, dst: &mut [f32], scale: f32) -> DecoderResult<()> { - for i in (0..dst.len()).step_by(2) { + for out in dst.chunks_mut(2) { let val = br.read_cb(cb)? as usize; - dst[i + 0] = ATRAC3_MODE1_CB[val * 2 + 0] * scale; - dst[i + 1] = ATRAC3_MODE1_CB[val * 2 + 1] * scale; + out[0] = ATRAC3_MODE1_CB[val * 2 + 0] * scale; + out[1] = ATRAC3_MODE1_CB[val * 2 + 1] * scale; } Ok(()) } fn read_coeffs_other(br: &mut BitReader, cb: &Codebook, dst: &mut [f32], scale: f32) -> DecoderResult<()> { - for i in 0..dst.len() { + for el in dst.iter_mut() { let val = (br.read_cb(cb)? as i8) + 1; let sign = (val & 1) != 0; - let coef = (if sign { -(val >> 1) } else { val >> 1 }) as f32; - dst[i] = coef * scale; + let coef = f32::from(if sign { -(val >> 1) } else { val >> 1 }); + *el = coef * scale; } Ok(()) } @@ -290,7 +285,7 @@ impl DSP { } Self { - imdct: IMDCT::new(FFTMode::SplitRadix, 512, false), + imdct: IMDCT::new(512, false), tmp: [0.0; ATRAC3_FRAME_SIZE + 64], gain_tab, gain_tab2, window, } @@ -387,7 +382,7 @@ impl DSP { } struct Atrac3Decoder { - info: Rc, + info: NACodecInfoRef, channels: usize, chmap: NAChannelMap, samples: usize, @@ -515,7 +510,7 @@ impl Atrac3Decoder { if self.weighting_delay[1] == 7 { pw = [1.0; 2]; } else { - let w = (self.weighting_delay[1] as f32) / 7.0; + let w = f32::from(self.weighting_delay[1]) / 7.0; let iw = (2.0 - w * w).sqrt(); if self.weighting_delay[0] == 0 { pw = [w, iw]; @@ -527,7 +522,7 @@ impl Atrac3Decoder { if self.weighting_delay[3] == 7 { cw = [1.0; 2]; } else { - let w = (self.weighting_delay[3] as f32) / 7.0; + let w = f32::from(self.weighting_delay[3]) / 7.0; let iw = (2.0 - w * w).sqrt(); if self.weighting_delay[2] == 0 { cw = [w, iw]; @@ -555,7 +550,7 @@ fn interp(a: f32, b: f32, pos: usize) -> f32 { } impl NADecoder for Atrac3Decoder { - fn init(&mut self, info: Rc) -> DecoderResult<()> { + fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> { if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() { self.info = info.clone(); let edata = info.get_extradata().unwrap(); @@ -609,7 +604,7 @@ impl NADecoder for Atrac3Decoder { Err(DecoderError::InvalidData) } } - fn decode(&mut self, pkt: &NAPacket) -> DecoderResult { + fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult { let info = pkt.get_stream().get_info(); validate!(info.get_properties().is_audio()); let pktbuf = pkt.get_buffer(); @@ -627,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)?; @@ -649,7 +644,7 @@ impl NADecoder for Atrac3Decoder { } 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); @@ -679,9 +674,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); @@ -690,22 +685,37 @@ impl NADecoder for Atrac3Decoder { let mut frm = NAFrame::new_from_pkt(pkt, self.info.replace_info(NACodecTypeInfo::Audio(ainfo)), abuf); frm.set_keyframe(true); - Ok(Rc::new(RefCell::new(frm))) + Ok(frm.into_ref()) + } + fn flush(&mut self) { + for ch_data in self.ch_data.iter_mut() { + ch_data.delay = [0.0; 1024]; + ch_data.qmf_delay = [0.0; 64 * 3]; + } } } -pub fn get_decoder() -> Box { +pub fn get_decoder() -> Box { Box::new(Atrac3Decoder::new()) } #[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::generic_register_all_codecs; + use nihav_realmedia::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), None/*Some("atrac3")*/, &dmx_reg, &dec_reg); } }