[FFmpeg-cvslog] Revert "smackaud: clip output samples"
Kostya Shishkov
git at videolan.org
Tue May 28 07:57:34 CEST 2013
ffmpeg | branch: master | Kostya Shishkov <kostya.shishkov at gmail.com> | Mon May 27 05:40:44 2013 +0200| [5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d] | committer: Kostya Shishkov
Revert "smackaud: clip output samples"
Smacker audio uses overflows instead of clipping.
This reverts commit 375ca0aca81be2951d9ba4731196e70e490d3cdf.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d
---
libavcodec/smacker.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index a27997f..cc3ad8d 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -659,7 +659,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data,
res = 0;
val |= h[3].values[res] << 8;
pred[1] += sign_extend(val, 16);
- *samples++ = av_clip_int16(pred[1]);
+ *samples++ = pred[1];
} else {
if(vlc[0].table)
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;
val |= h[1].values[res] << 8;
pred[0] += sign_extend(val, 16);
- *samples++ = av_clip_int16(pred[0]);
+ *samples++ = pred[0];
}
}
} else { //8-bit data
@@ -687,14 +687,14 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data,
else
res = 0;
pred[1] += sign_extend(h[1].values[res], 8);
- *samples8++ = av_clip_uint8(pred[1]);
+ *samples8++ = pred[1];
} else {
if(vlc[0].table)
res = get_vlc2(&gb, vlc[0].table, SMKTREE_BITS, 3);
else
res = 0;
pred[0] += sign_extend(h[0].values[res], 8);
- *samples8++ = av_clip_uint8(pred[0]);
+ *samples8++ = pred[0];
}
}
}
More information about the ffmpeg-cvslog
mailing list