diff options
| author | Peter Meerwald <pmeerw@pmeerw.net> | 2015-02-20 01:35:35 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-02-21 00:54:40 +0100 |
| commit | 9abc80f1ed673141326341e26a05c3e1f78576d0 (patch) | |
| tree | ca91fca7b76eec0d98a2b420f0220ec0df13a239 /libavcodec/g722enc.c | |
| parent | 76ce9bd8e26dcb3652240a1072840ff4011d7cdc (diff) | |
libavcodec: Make use of av_clip functions
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec/g722enc.c')
| -rw-r--r-- | libavcodec/g722enc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index e67ccf5324..3943622137 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -225,9 +225,9 @@ static void g722_encode_trellis(G722Context *c, int trellis, if (k < 0) continue; - decoded = av_clip((cur_node->state.scale_factor * + decoded = av_clip_intp2((cur_node->state.scale_factor * ff_g722_low_inv_quant6[k] >> 10) - + cur_node->state.s_predictor, -16384, 16383); + + cur_node->state.s_predictor, 14); dec_diff = xlow - decoded; #define STORE_NODE(index, UPDATE, VALUE)\ @@ -284,8 +284,7 @@ static void g722_encode_trellis(G722Context *c, int trellis, dhigh = cur_node->state.scale_factor * ff_g722_high_inv_quant[ihigh] >> 10; - decoded = av_clip(dhigh + cur_node->state.s_predictor, - -16384, 16383); + decoded = av_clip_intp2(dhigh + cur_node->state.s_predictor, 14); dec_diff = xhigh - decoded; STORE_NODE(1, ff_g722_update_high_predictor(&node->state, dhigh, ihigh), ihigh); |