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 eda269a793407b233af4700d5bdd6a1f61fc8945..044fea69685d1d02863beb42eaa28bba2d3a8098 100644 (file)
--- a/nihav-commonfmt/src/codecs/atrac3.rs
+++ b/nihav-commonfmt/src/codecs/atrac3.rs
@@ -4,7 +4,6 @@ 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;
 
@@ -157,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];
@@ -171,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;
     }
@@ -210,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(())
@@ -237,20 +234,20 @@ const ATRAC3_MODE1_CB: [f32; 9 * 2] = [
 ];
 
 fn read_coeffs_mode1(br: &mut BitReader, cb: &Codebook<u8>, 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<u8>, 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(())
 }
@@ -288,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,
             }
@@ -513,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];
@@ -525,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];
@@ -625,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)?;
@@ -647,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);
@@ -690,9 +687,15 @@ impl NADecoder for Atrac3Decoder {
         frm.set_keyframe(true);
         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<NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
     Box::new(Atrac3Decoder::new())
 }
 
@@ -701,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 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();
@@ -712,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";
-        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);
     }
 }