X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fbinkaud.rs;h=182c6c91f2a5d7e370f429e6d3dda1d895f58be6;hb=2422d9699cd56cbb86ac32b3e8dd026e20a89db5;hp=a85a07ed00fd5ee2a3986dcb421d3b1863d9f5bc;hpb=e5ea652540a63efcd09af052d74d2c6bcaa0a65a;p=nihav.git

diff --git a/nihav-rad/src/codecs/binkaud.rs b/nihav-rad/src/codecs/binkaud.rs
index a85a07e..182c6c9 100644
--- a/nihav-rad/src/codecs/binkaud.rs
+++ b/nihav-rad/src/codecs/binkaud.rs
@@ -152,15 +152,7 @@ impl BinkAudioDecoder {
             for i in 0..(self.len >> 4) {
                 self.delay[chno][i] = self.coeffs[self.duration + i];
             }
-        } else { // somehow it ends here in reverse order
-            for i in 0..self.len >> 2 {
-                let t0 = self.coeffs[self.len - 2 - i * 2];
-                let t1 = self.coeffs[self.len - 1 - i * 2];
-                self.coeffs[self.len - 2 - i * 2] = self.coeffs[i * 2];
-                self.coeffs[self.len - 1 - i * 2] = self.coeffs[i * 2 + 1];
-                self.coeffs[i * 2] = t0;
-                self.coeffs[i * 2 + 1] = t1;
-            }
+        } else {
             let overlap_len = if self.first_frm { 0 } else { self.len >> 8 };
             overlap(&self.delay[0], &self.coeffs[0..], &mut dst[off0..], overlap_len, 2);
             overlap(&self.delay[1], &self.coeffs[1..], &mut dst[off1..], overlap_len, 2);
@@ -186,13 +178,13 @@ const CRITICAL_FREQS: [usize; MAX_BANDS] = [
 const RUN_TAB: [usize; 16] = [ 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 32, 64 ];
 
 impl NADecoder for BinkAudioDecoder {
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+    fn init(&mut self, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
             let srate    = ainfo.get_sample_rate();
             let channels = ainfo.get_channels();
             validate!(channels <= 2);
             self.ainfo = NAAudioInfo::new(srate, channels, SND_F32P_FORMAT, 2);
-            self.chmap = NAChannelMap::from_str("L,R").unwrap();
+            self.chmap = NAChannelMap::from_str(if channels == 2 {"L,R"} else {"C"}).unwrap();
             if let Some(ref edata) = info.get_extradata() {
                 if edata.as_slice() == b"BIKb" {
                     self.version_b = true;
@@ -211,7 +203,7 @@ impl NADecoder for BinkAudioDecoder {
                 self.duration >>= 1;
             }
             self.transform = if !self.use_dct {
-                    Transform::RDFT(RDFTBuilder::new_rdft(FFTMode::SplitRadix, self.len >> 1, false))
+                    Transform::RDFT(RDFTBuilder::new_rdft(FFTMode::SplitRadix, self.len >> 1, false, false))
                 } else {
                     Transform::DCT(DCT::new(DCTMode::DCT_III, self.len))
                 };
@@ -246,11 +238,11 @@ impl NADecoder for BinkAudioDecoder {
             let nsamples = br.read(32)? as usize;
 //            validate!(nsamples % self.duration == 0);
 
-            let mut abuf = alloc_audio_buffer(self.ainfo, nsamples / self.chmap.num_channels() / 2, self.chmap.clone())?;
+            let abuf = alloc_audio_buffer(self.ainfo, nsamples / self.chmap.num_channels() / 2, self.chmap.clone())?;
             let mut adata = abuf.get_abuf_f32().unwrap();
             let mut off0 = adata.get_offset(0);
             let mut off1 = adata.get_offset(1);
-            let mut dst = adata.get_data_mut();
+            let dst = adata.get_data_mut().unwrap();
 
             let num_subframes = nsamples / self.duration / self.chmap.num_channels() / 2;