switch to refcounted buffers

[nihav.git] / nihav-rad / src / codecs / binkaud.rs

diff --git a/nihav-rad/src/codecs/binkaud.rs b/nihav-rad/src/codecs/binkaud.rs
index 05440190008cd533efb394ad4841cd2287045801..c38f6d4beff88ca7094eefe4bf675e2ad8391591 100644 (file)
--- a/nihav-rad/src/codecs/binkaud.rs
+++ b/nihav-rad/src/codecs/binkaud.rs
@@ -184,7 +184,7 @@ impl NADecoder for BinkAudioDecoder {
             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;
@@ -238,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;