core: split options into separate module

[nihav.git] / nihav-core / src / soundcvt / mod.rs

diff --git a/nihav-core/src/soundcvt/mod.rs b/nihav-core/src/soundcvt/mod.rs
index 1b7b0309f000506372fd29281cb2faf6065f504a..6864f7e14a9ea179ea4e486b07782dea68f85dda 100644 (file)
--- a/nihav-core/src/soundcvt/mod.rs
+++ b/nihav-core/src/soundcvt/mod.rs
@@ -368,8 +368,8 @@ Result<NABufferType, SoundConvertError> {
     }
     let mut dst_buf = ret.unwrap();
 
-    let sstep = src.get_audio_step();
-    let dstep = dst_buf.get_audio_step();
+    let sstep = src.get_audio_step().max(1);
+    let dstep = dst_buf.get_audio_step().max(1);
     let sr: Box<dyn SampleReader> = match src {
             NABufferType::AudioU8(ref ab) => {
                 let stride = ab.get_stride();
@@ -576,7 +576,7 @@ mod test {
                             block_len:      512,
                         };
         let mut src_frm = alloc_audio_buffer(src_ainfo, 42, chcfg51.clone()).unwrap();
-        if let NABufferType::AudioPacked(ref mut abuf) = src_frm {
+        if let NABufferType::AudioU8(ref mut abuf) = src_frm {
             let data = abuf.get_data_mut().unwrap();
             let mut idx = 0;
             for _ in 0..42 {