From: Paul Brossier <piem@piem.org>
Date: Thu, 21 Apr 2016 17:02:41 +0000 (+0200)
Subject: src/io/source_{avcodec,sndfile}.c: avoid modifying input param
X-Git-Tag: 0.4.4~300^2~297
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=26a6af7d29e6ec29f66e076b3a26157c2415c8d2;p=aubio.git

src/io/source_{avcodec,sndfile}.c: avoid modifying input param
---

diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
index 9bf9098d..3ab9a1f7 100644
--- a/src/io/source_avcodec.c
+++ b/src/io/source_avcodec.c
@@ -166,10 +166,10 @@ aubio_source_avcodec_t * new_aubio_source_avcodec(const char_t * path, uint_t sa
   //AUBIO_DBG("input_channels: %d\n", s->input_channels);
 
   if (samplerate == 0) {
-    samplerate = s->input_samplerate;
-    //AUBIO_DBG("sampling rate set to 0, automagically adjusting to %d\n", samplerate);
+    s->samplerate = s->input_samplerate;
+  } else {
+    s->samplerate = samplerate;
   }
-  s->samplerate = samplerate;
 
   if (s->samplerate >  s->input_samplerate) {
     AUBIO_WRN("source_avcodec: upsampling %s from %d to %d\n", s->path,
diff --git a/src/io/source_sndfile.c b/src/io/source_sndfile.c
index 34804e15..f69d2f6f 100644
--- a/src/io/source_sndfile.c
+++ b/src/io/source_sndfile.c
@@ -107,10 +107,11 @@ aubio_source_sndfile_t * new_aubio_source_sndfile(const char_t * path, uint_t sa
   s->input_format     = sfinfo.format;
 
   if (samplerate == 0) {
-    samplerate = s->input_samplerate;
+    s->samplerate = s->input_samplerate;
     //AUBIO_DBG("sampling rate set to 0, automagically adjusting to %d\n", samplerate);
+  } else {
+    s->samplerate = samplerate;
   }
-  s->samplerate = samplerate;
   /* compute input block size required before resampling */
   s->ratio = s->samplerate/(smpl_t)s->input_samplerate;
   s->input_hop_size = (uint_t)FLOOR(s->hop_size / s->ratio + .5);