generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-10 18:06:19 +01:00
parent fca51256d4
commit 558aa6cab7
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libswresample/dither_template.c
View File

@ -23,7 +23,7 @@
ERROR ERROR
#endif #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 i, j, pos, ch;
int taps = s->dither.ns_taps; int taps = s->dither.ns_taps;
float S = s->dither.ns_scale; 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++) { for (ch=0; ch<srcs->ch_count; ch++) {
const float *noise = ((const float *)noises->ch[ch]) + s->dither.noise_pos; 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; pos = s->dither.ns_pos;
for (i=0; i<count; i++) { 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++) for(j=0; j<taps; j++)
d -= s->dither.ns_coeffs[j] * s->dither.ns_errors[ch][pos + j]; d -= s->dither.ns_coeffs[j] * s->dither.ns_errors[ch][pos + j];
pos = pos ? pos - 1 : pos - 1 + taps; 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; s->dither.ns_errors[ch][pos + taps] = s->dither.ns_errors[ch][pos] = d1 - d;
d1 *= S; d1 *= S;
CLIP(d1); CLIP(d1);
data[i] = d1; dst[i] = d1;
} }
} }

8
libswresample/swresample.c
View File

@ -677,10 +677,10 @@ static int swr_convert_internal(struct SwrContext *s, AudioData *out, int out_co
} }
} else { } else {
switch(s->int_sample_fmt) { 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_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, &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, &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, &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; s->dither.noise_pos += out_count;

8
libswresample/swresample_internal.h
View File

@ -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_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); 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_int16 (SwrContext *s, AudioData *dsts, const AudioData *srcs, AudioData *noises, int count);
void swri_noise_shaping_int32 (SwrContext *s, 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 *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 *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); int swri_rematrix_init(SwrContext *s);
void swri_rematrix_free(SwrContext *s); void swri_rematrix_free(SwrContext *s);