diff options
| author | James Zern <jzern@google.com> | 2015-12-11 12:40:53 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-12-14 14:42:12 -0800 |
| commit | d36659cec7fab96cedc67db4d511ed7135637d0e (patch) | |
| tree | 6c3b6953db77ab19ab9676378bd983a12f67ecee /vp9/encoder/vp9_pickmode.c | |
| parent | 6e87880e7f9dfb53d10c2be55a82765b076aaa76 (diff) | |
| download | libvpx-d36659cec7fab96cedc67db4d511ed7135637d0e.tar libvpx-d36659cec7fab96cedc67db4d511ed7135637d0e.tar.gz libvpx-d36659cec7fab96cedc67db4d511ed7135637d0e.tar.bz2 libvpx-d36659cec7fab96cedc67db4d511ed7135637d0e.zip | |
move vp9_avg to vpx_dsp
Change-Id: I7bc991abea383db1f86c1bb0f2e849837b54d90f
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 90650dbe8..0d86518a5 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -619,14 +619,14 @@ static void block_yrd(VP9_COMP *cpi, MACROBLOCK *x, int *rate, int64_t *dist, scan_order->scan, scan_order->iscan); break; case TX_16X16: - vp9_hadamard_16x16(src_diff, diff_stride, (int16_t *)coeff); + vpx_hadamard_16x16(src_diff, diff_stride, (int16_t *)coeff); vp9_quantize_fp(coeff, 256, x->skip_block, p->zbin, p->round_fp, p->quant_fp, p->quant_shift, qcoeff, dqcoeff, pd->dequant, eob, scan_order->scan, scan_order->iscan); break; case TX_8X8: - vp9_hadamard_8x8(src_diff, diff_stride, (int16_t *)coeff); + vpx_hadamard_8x8(src_diff, diff_stride, (int16_t *)coeff); vp9_quantize_fp(coeff, 64, x->skip_block, p->zbin, p->round_fp, p->quant_fp, p->quant_shift, qcoeff, dqcoeff, pd->dequant, eob, @@ -673,7 +673,7 @@ static void block_yrd(VP9_COMP *cpi, MACROBLOCK *x, int *rate, int64_t *dist, if (*eob == 1) *rate += (int)abs(qcoeff[0]); else if (*eob > 1) - *rate += vp9_satd((const int16_t *)qcoeff, step << 4); + *rate += vpx_satd((const int16_t *)qcoeff, step << 4); *dist += vp9_block_error_fp(coeff, dqcoeff, step << 4) >> shift; } |