diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2014-07-11 13:46:46 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-07-11 13:46:46 -0700 |
| commit | 6298e232e168aba11e227ba9c0ec8e8dc3a190ae (patch) | |
| tree | 1dcbd226bf41a4f8d2f5683d9fa232f4c9e4fd78 /vp9/encoder/vp9_rdopt.c | |
| parent | 84744a497a49ab8f527c18afd3a80c4787d4a138 (diff) | |
| parent | 1b5e9871f7a4fe7b89da047df046b0cfb4b3566d (diff) | |
| download | libvpx-6298e232e168aba11e227ba9c0ec8e8dc3a190ae.tar libvpx-6298e232e168aba11e227ba9c0ec8e8dc3a190ae.tar.gz libvpx-6298e232e168aba11e227ba9c0ec8e8dc3a190ae.tar.bz2 libvpx-6298e232e168aba11e227ba9c0ec8e8dc3a190ae.zip | |
Merge "Code refactoring: use defined inline functions"
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index b597d3b48..eae469dab 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1793,8 +1793,8 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x, } if (cpi->sf.adaptive_motion_search) { - int bwl = b_width_log2_lookup[bsize]; - int bhl = b_height_log2_lookup[bsize]; + int bwl = b_width_log2(bsize); + int bhl = b_height_log2(bsize); int i; int tlevel = x->pred_mv_sad[ref] >> (bwl + bhl + 4); @@ -2266,8 +2266,8 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, thresh_ac = clamp(thresh_ac, min_thresh, max_thresh); // Adjust threshold according to partition size. - thresh_ac >>= 8 - (b_width_log2_lookup[bsize] + - b_height_log2_lookup[bsize]); + thresh_ac >>= 8 - (b_width_log2(bsize) + + b_height_log2(bsize)); thresh_dc = (xd->plane[0].dequant[0] * xd->plane[0].dequant[0] >> 6); } else { thresh_ac = 0; |