remove trailing whitespaces

[nihav.git] / nihav-ms / src / codecs / msadpcm.rs

diff --git a/nihav-ms/src/codecs/msadpcm.rs b/nihav-ms/src/codecs/msadpcm.rs
index de6f447068c99f81e60843182facf612c90ca993..d753882b98e7ef98552ec4f19c16d867111c5cbf 100644 (file)
--- a/nihav-ms/src/codecs/msadpcm.rs
+++ b/nihav-ms/src/codecs/msadpcm.rs
@@ -3,7 +3,7 @@ use nihav_core::io::byteio::*;
 use std::str::FromStr;
 
 const ADAPT_TABLE: [i32; 16] = [
-    230, 230, 230, 230, 307, 409, 512, 614, 
+    230, 230, 230, 230, 307, 409, 512, 614,
     768, 614, 512, 409, 307, 230, 230, 230
 ];
 const ADAPT_COEFFS: [[i32; 2]; 7] = [
@@ -320,7 +320,7 @@ impl NAEncoder for MSADPCMEncoder {
                 if (outinfo.channels == 1) && ((outinfo.block_len & 1) == 1) {
                     outinfo.block_len += 1;
                 }
-                let mut ofmt = EncodeParameters::default();
+                let mut ofmt = *encinfo;
                 ofmt.format = NACodecTypeInfo::Audio(outinfo);
                 return Ok(ofmt);
             }
@@ -346,13 +346,15 @@ impl NAEncoder for MSADPCMEncoder {
                 let soniton = NASoniton::new(4, 0);
                 let out_ainfo = NAAudioInfo::new(ainfo.sample_rate, ainfo.channels, soniton, Self::calc_block_size(self.block_len, self.channels));
                 let info = NACodecInfo::new("ms-adpcm", NACodecTypeInfo::Audio(out_ainfo), None);
-                let stream = NAStream::new(StreamType::Audio, stream_id, info.clone(), self.block_len as u32, ainfo.sample_rate).into_ref();
+                let mut stream = NAStream::new(StreamType::Audio, stream_id, info.clone(), self.block_len as u32, ainfo.sample_rate);
+                stream.set_num(stream_id as usize);
+                let stream = stream.into_ref();
 
                 self.stream = Some(stream.clone());
                 self.samples = Vec::with_capacity(self.block_len * self.channels);
                 self.srate = ainfo.sample_rate;
                 self.flush = false;
-                
+
                 Ok(stream)
             },
         }