diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-11 13:44:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-11 13:44:15 +0200 |
| commit | a2c92e60639b132e291c97aff9a7e18d1a0ae049 (patch) | |
| tree | e1fe6a89bfbc2ef1ccfb8e7d2f64847368e83e31 | |
| parent | f8a237a3074b444a8d88d92d9fcce10508479d35 (diff) | |
| download | ffmpeg-a2c92e60639b132e291c97aff9a7e18d1a0ae049.tar.gz | |
swr: pass context to swri_get_dither()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswresample/dither.c | 6 | ||||
| -rw-r--r-- | libswresample/swresample.c | 2 | ||||
| -rw-r--r-- | libswresample/swresample_internal.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libswresample/dither.c b/libswresample/dither.c index 88f788066e..8d5d0bcca9 100644 --- a/libswresample/dither.c +++ b/libswresample/dither.c @@ -21,7 +21,7 @@ #include "libavutil/avassert.h" #include "swresample_internal.h" -void swri_get_dither(void *dst, int len, unsigned seed, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt, enum SwrDitherType method) { +void swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt) { double scale = 0; #define TMP_EXTRA 2 double *tmp = av_malloc((len + TMP_EXTRA) * sizeof(double)); @@ -40,7 +40,7 @@ void swri_get_dither(void *dst, int len, unsigned seed, enum AVSampleFormat out_ double v; seed = seed* 1664525 + 1013904223; - switch(method){ + switch(s->dither_method){ case SWR_DITHER_RECTANGULAR: v= ((double)seed) / UINT_MAX - 0.5; break; case SWR_DITHER_TRIANGULAR : case SWR_DITHER_TRIANGULAR_HIGHPASS : @@ -56,7 +56,7 @@ void swri_get_dither(void *dst, int len, unsigned seed, enum AVSampleFormat out_ for(i=0; i<len; i++){ double v; - switch(method){ + switch(s->dither_method){ case SWR_DITHER_RECTANGULAR: case SWR_DITHER_TRIANGULAR : v = tmp[i]; diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 78b0355c4f..3078e87c65 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -527,7 +527,7 @@ static int swr_convert_internal(struct SwrContext *s, AudioData *out, int out_co return ret; if(ret) for(ch=0; ch<s->dither.ch_count; ch++) - swri_get_dither(s->dither.ch[ch], s->dither.count, 12345678913579<<ch, s->out_sample_fmt, s->int_sample_fmt, s->dither_method); + swri_get_dither(s, s->dither.ch[ch], s->dither.count, 12345678913579<<ch, s->out_sample_fmt, s->int_sample_fmt); av_assert0(s->dither.ch_count == preout->ch_count); if(s->dither_pos + out_count > s->dither.count) diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h index 68b51305bc..d2cb85b375 100644 --- a/libswresample/swresample_internal.h +++ b/libswresample/swresample_internal.h @@ -94,6 +94,6 @@ int swri_rematrix_init(SwrContext *s); int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mustcopy); void swri_sum2(enum AVSampleFormat format, void *dst, const void *src0, const void *src1, float coef0, float coef1, int len); -void swri_get_dither(void *dst, int len, unsigned seed, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt, enum SwrDitherType type); +void swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt); #endif |