From 9abc80f1ed673141326341e26a05c3e1f78576d0 Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Fri, 20 Feb 2015 01:35:35 +0100 Subject: libavcodec: Make use of av_clip functions Signed-off-by: Peter Meerwald Signed-off-by: Luca Barbato --- libavcodec/g722enc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libavcodec/g722enc.c') 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); -- cgit v1.2.3