MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swr/resample: use av_clip_int16 instead of av_clip

Browse Source 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
This commit is contained in:
Ganesh Ajjanagadde 2015-12-23 14:48:40 -08:00
parent 8cbb055760
commit 26937fb416
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libswresample/resample.c
View File

@ -202,7 +202,7 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap
switch(c->format){ switch(c->format){
case AV_SAMPLE_FMT_S16P: case AV_SAMPLE_FMT_S16P:
for(i=0;i<tap_count;i++) for(i=0;i<tap_count;i++)
((int16_t*)filter)[ph * alloc + i] = av_clip(lrintf(tab[i] * scale / norm), INT16_MIN, INT16_MAX); ((int16_t*)filter)[ph * alloc + i] = av_clip_int16(lrintf(tab[i] * scale / norm));
if (tap_count % 2 == 0) { if (tap_count % 2 == 0) {
for (i = 0; i < tap_count; i++) for (i = 0; i < tap_count; i++)
((int16_t*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((int16_t*)filter)[ph * alloc + i]; ((int16_t*)filter)[(phase_count-ph) * alloc + tap_count-1-i] = ((int16_t*)filter)[ph * alloc + i];
@ -210,7 +210,7 @@ static int build_filter(ResampleContext *c, void *filter, double factor, int tap
else { else {
for (i = 1; i <= tap_count; i++) for (i = 1; i <= tap_count; i++)
((int16_t*)filter)[(phase_count-ph) * alloc + tap_count-i] = ((int16_t*)filter)[(phase_count-ph) * alloc + tap_count-i] =
av_clip(lrintf(tab[i] * scale / (norm - tab[0] + tab[tap_count])), INT16_MIN, INT16_MAX); av_clip_int16(lrintf(tab[i] * scale / (norm - tab[0] + tab[tap_count])));
} }
break; break;
case AV_SAMPLE_FMT_S32P: case AV_SAMPLE_FMT_S32P: