X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fg722enc.c;h=38432f5006c707272b9402f7565116d383114701;hb=53dd75e91154100a83b11f6ef9dfd15d79bcc3aa;hp=5a7bfb25fed3697dd5cd80de82329d1bb2ab5a6f;hpb=841e9f431cf4b1be0b5c3932c289d405f34dfcc2;p=ffmpeg diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index 5a7bfb25fed..38432f5006c 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -226,9 +226,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)\ @@ -285,8 +285,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);