swr: add seperate in/out pointers to the noise shaping code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libswresample/dither_template.c

@@ -23,7 +23,7 @@
 ERROR
 #endif
 
-void RENAME(swri_noise_shaping)(SwrContext *s, AudioData *srcs, AudioData *noises, int count){
+void RENAME(swri_noise_shaping)(SwrContext *s, AudioData *dsts, const AudioData *srcs, AudioData *noises, int count){
     int i, j, pos, ch;
     int taps  = s->dither.ns_taps;
     float S   = s->dither.ns_scale;
@@ -31,10 +31,11 @@ void RENAME(swri_noise_shaping)(SwrContext *s, AudioData *srcs, AudioData *noise
 
     for (ch=0; ch<srcs->ch_count; ch++) {
         const float *noise = ((const float *)noises->ch[ch]) + s->dither.noise_pos;
-        DELEM *data = (DELEM*)srcs->ch[ch];
+        const DELEM *src = (const DELEM*)srcs->ch[ch];
+        DELEM *dst = (DELEM*)dsts->ch[ch];
         pos  = s->dither.ns_pos;
         for (i=0; i<count; i++) {
-            double d1, d = data[i]*S_1;
+            double d1, d = src[i]*S_1;
             for(j=0; j<taps; j++)
                 d -= s->dither.ns_coeffs[j] * s->dither.ns_errors[ch][pos + j];
             pos = pos ? pos - 1 : pos - 1 + taps;
@@ -42,7 +43,7 @@ void RENAME(swri_noise_shaping)(SwrContext *s, AudioData *srcs, AudioData *noise
             s->dither.ns_errors[ch][pos + taps] = s->dither.ns_errors[ch][pos] = d1 - d;
             d1 *= S;
             CLIP(d1);
-            data[i] = d1;
+            dst[i] = d1;
         }
     }
 

libswresample/swresample.c

@@ -677,10 +677,10 @@ static int swr_convert_internal(struct SwrContext *s, AudioData *out, int out_co
                 }
             } else {
                 switch(s->int_sample_fmt) {
-                case AV_SAMPLE_FMT_S16P :swri_noise_shaping_int16(s, preout, &s->dither.noise, out_count); break;
-                case AV_SAMPLE_FMT_S32P :swri_noise_shaping_int32(s, preout, &s->dither.noise, out_count); break;
-                case AV_SAMPLE_FMT_FLTP :swri_noise_shaping_float(s, preout, &s->dither.noise, out_count); break;
-                case AV_SAMPLE_FMT_DBLP :swri_noise_shaping_double(s,preout, &s->dither.noise, out_count); break;
+                case AV_SAMPLE_FMT_S16P :swri_noise_shaping_int16(s, preout, preout, &s->dither.noise, out_count); break;
+                case AV_SAMPLE_FMT_S32P :swri_noise_shaping_int32(s, preout, preout, &s->dither.noise, out_count); break;
+                case AV_SAMPLE_FMT_FLTP :swri_noise_shaping_float(s, preout, preout, &s->dither.noise, out_count); break;
+                case AV_SAMPLE_FMT_DBLP :swri_noise_shaping_double(s,preout, preout, &s->dither.noise, out_count); break;
                 }
             }
             s->dither.noise_pos += out_count;

libswresample/swresample_internal.h

@@ -167,10 +167,10 @@ int swri_resample_int32(struct ResampleContext *c, int32_t *dst, const int32_t *
 int swri_resample_float(struct ResampleContext *c, float   *dst, const float   *src, int *consumed, int src_size, int dst_size, int update_ctx);
 int swri_resample_double(struct ResampleContext *c,double  *dst, const double  *src, int *consumed, int src_size, int dst_size, int update_ctx);
 
-void swri_noise_shaping_int16 (SwrContext *s, AudioData *srcs, AudioData *noises, int count);
-void swri_noise_shaping_int32 (SwrContext *s, AudioData *srcs, AudioData *noises, int count);
-void swri_noise_shaping_float (SwrContext *s, AudioData *srcs, AudioData *noises, int count);
-void swri_noise_shaping_double(SwrContext *s, AudioData *srcs, AudioData *noises, int count);
+void swri_noise_shaping_int16 (SwrContext *s, AudioData *dsts, const AudioData *srcs, AudioData *noises, int count);
+void swri_noise_shaping_int32 (SwrContext *s, AudioData *dsts, const AudioData *srcs, AudioData *noises, int count);
+void swri_noise_shaping_float (SwrContext *s, AudioData *dsts, const AudioData *srcs, AudioData *noises, int count);
+void swri_noise_shaping_double(SwrContext *s, AudioData *dsts, const AudioData *srcs, AudioData *noises, int count);
 
 int swri_rematrix_init(SwrContext *s);
 void swri_rematrix_free(SwrContext *s);