diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 23:20:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 23:28:09 +0100 |
| commit | 6908ded20e8040a48f6e281e665aabd6b1066a9e (patch) | |
| tree | 35feaa42000c10e0e17d4dfa99efc33631e4d7ec /libswresample | |
| parent | 3ef06f3415a4693c435bd72a59fedaf4d325a5d9 (diff) | |
| download | ffmpeg-streaming-6908ded20e8040a48f6e281e665aabd6b1066a9e.zip ffmpeg-streaming-6908ded20e8040a48f6e281e665aabd6b1066a9e.tar.gz | |
swr: fix the noise sample type for noise shaping
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/dither.c | 19 | ||||
| -rw-r--r-- | libswresample/swresample.c | 2 | ||||
| -rw-r--r-- | libswresample/swresample_internal.h | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/libswresample/dither.c b/libswresample/dither.c index 05c75fc..d7cb8a1 100644 --- a/libswresample/dither.c +++ b/libswresample/dither.c @@ -23,15 +23,12 @@ #include "noise_shaping_data.c" -void swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt) { +void swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSampleFormat noise_fmt) { double scale = s->dither.ns_scale; #define TMP_EXTRA 2 double *tmp = av_malloc((len + TMP_EXTRA) * sizeof(double)); int i; - out_fmt = av_get_packed_sample_fmt(out_fmt); - in_fmt = av_get_packed_sample_fmt( in_fmt); - for(i=0; i<len + TMP_EXTRA; i++){ double v; seed = seed* 1664525 + 1013904223; @@ -63,11 +60,11 @@ void swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSa v*= scale; - switch(in_fmt){ - case AV_SAMPLE_FMT_S16: ((int16_t*)dst)[i] = v; break; - case AV_SAMPLE_FMT_S32: ((int32_t*)dst)[i] = v; break; - case AV_SAMPLE_FMT_FLT: ((float *)dst)[i] = v; break; - case AV_SAMPLE_FMT_DBL: ((double *)dst)[i] = v; break; + switch(noise_fmt){ + case AV_SAMPLE_FMT_S16P: ((int16_t*)dst)[i] = v; break; + case AV_SAMPLE_FMT_S32P: ((int32_t*)dst)[i] = v; break; + case AV_SAMPLE_FMT_FLTP: ((float *)dst)[i] = v; break; + case AV_SAMPLE_FMT_DBLP: ((double *)dst)[i] = v; break; default: av_assert0(0); } } @@ -117,6 +114,10 @@ int swri_dither_init(SwrContext *s, enum AVSampleFormat out_fmt, enum AVSampleFo } s->dither.noise = s->preout; + if (s->dither.method > SWR_DITHER_NS) { + s->dither.noise.bps = 4; + s->dither.noise.fmt = AV_SAMPLE_FMT_FLTP; + } return 0; } diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 5e0e4aa..b311419 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -654,7 +654,7 @@ static int swr_convert_internal(struct SwrContext *s, AudioData *out, int out_co return ret; if(ret) for(ch=0; ch<s->dither.noise.ch_count; ch++) - swri_get_dither(s, s->dither.noise.ch[ch], s->dither.noise.count, 12345678913579<<ch, s->out_sample_fmt, s->int_sample_fmt); + swri_get_dither(s, s->dither.noise.ch[ch], s->dither.noise.count, 12345678913579<<ch, s->dither.noise.fmt); av_assert0(s->dither.noise.ch_count == preout->ch_count); if(s->dither.dither_pos + out_count > s->dither.noise.count) diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h index 1b0167c..5236098 100644 --- a/libswresample/swresample_internal.h +++ b/libswresample/swresample_internal.h @@ -176,7 +176,7 @@ void swri_rematrix_free(SwrContext *s); int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mustcopy); void swri_rematrix_init_x86(struct SwrContext *s); -void swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt); +void swri_get_dither(SwrContext *s, void *dst, int len, unsigned seed, enum AVSampleFormat noise_fmt); int swri_dither_init(SwrContext *s, enum AVSampleFormat out_fmt, enum AVSampleFormat in_fmt); void swri_audio_convert_init_arm(struct AudioConvert *ac, |
