virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avcodec/adpcm: use av_clip_intp2()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-21 20:41:36 +01:00
parent d1c705087f
commit f848a66009
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/adpcm.c
View File

@ -269,7 +269,7 @@ static inline short adpcm_ima_oki_expand_nibble(ADPCMChannelStatus *c, int nibbl
if (sign) predictor -= diff; if (sign) predictor -= diff;
else predictor += diff; else predictor += diff;
c->predictor = av_clip(predictor, -2048, 2047); c->predictor = av_clip_intp2(predictor, 11);
c->step_index = step_index; c->step_index = step_index;
return c->predictor << 4; return c->predictor << 4;

2
libavcodec/adpcmenc.c
View File

@ -227,7 +227,7 @@ static inline uint8_t adpcm_ms_compress_sample(ADPCMChannelStatus *c,
bias = -c->idelta / 2; bias = -c->idelta / 2;
nibble = (nibble + bias) / c->idelta; nibble = (nibble + bias) / c->idelta;
nibble = av_clip(nibble, -8, 7) & 0x0F; nibble = av_clip_intp2(nibble, 3) & 0x0F;
predictor += ((nibble & 0x08) ? (nibble - 0x10) : nibble) * c->idelta; predictor += ((nibble & 0x08) ? (nibble - 0x10) : nibble) * c->idelta;