RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "smackaud: clip output samples" 

Smacker audio uses overflows instead of clipping.

This reverts commit 375ca0aca8.
This commit is contained in:
Kostya Shishkov 2013-05-27 05:40:44 +02:00
parent be7952b5c3
commit 5f30c6c8ed
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/smacker.c
View File

@ -659,7 +659,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data,
res = 0; res = 0;
val |= h[3].values[res] << 8; val |= h[3].values[res] << 8;
pred[1] += sign_extend(val, 16); pred[1] += sign_extend(val, 16);
*samples++ = av_clip_int16(pred[1]); *samples++ = pred[1];
} else { } else {
if(vlc[0].table) if(vlc[0].table)
res = get_vlc2(&gb, vlc[0].table, SMKTREE_BITS, 3); res = get_vlc2(&gb, vlc[0].table, SMKTREE_BITS, 3);
@ -672,7 +672,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data,
res = 0; res = 0;
val |= h[1].values[res] << 8; val |= h[1].values[res] << 8;
pred[0] += sign_extend(val, 16); pred[0] += sign_extend(val, 16);
*samples++ = av_clip_int16(pred[0]); *samples++ = pred[0];
} }
} }
} else { //8-bit data } else { //8-bit data
@ -687,14 +687,14 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data,
else else
res = 0; res = 0;
pred[1] += sign_extend(h[1].values[res], 8); pred[1] += sign_extend(h[1].values[res], 8);
*samples8++ = av_clip_uint8(pred[1]); *samples8++ = pred[1];
} else { } else {
if(vlc[0].table) if(vlc[0].table)
res = get_vlc2(&gb, vlc[0].table, SMKTREE_BITS, 3); res = get_vlc2(&gb, vlc[0].table, SMKTREE_BITS, 3);
else else
res = 0; res = 0;
pred[0] += sign_extend(h[0].values[res], 8); pred[0] += sign_extend(h[0].values[res], 8);
*samples8++ = av_clip_uint8(pred[0]); *samples8++ = pred[0];
} }
} }
} }