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 | |
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')
-rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 10 | ||||
-rw-r--r-- | vp9/encoder/vp9_pickmode.c | 4 | ||||
-rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 83955dc2c..7ba7cae72 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1827,7 +1827,7 @@ static void auto_partition_range(VP9_COMP *cpi, const TileInfo *const tile, int bh, bw; BLOCK_SIZE min_size = BLOCK_32X32; BLOCK_SIZE max_size = BLOCK_8X8; - int bsl = mi_width_log2_lookup[BLOCK_64X64]; + int bsl = mi_width_log2(BLOCK_64X64); const int search_range_ctrl = (((mi_row + mi_col) >> bsl) + get_chessboard_index(cm)) % 2; // Trap case where we do not have a prediction. @@ -1976,8 +1976,8 @@ static void rd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, pc_tree->partitioning = PARTITION_NONE; // Adjust threshold according to partition size. - stop_thresh >>= 8 - (b_width_log2_lookup[bsize] + - b_height_log2_lookup[bsize]); + stop_thresh >>= 8 - (b_width_log2(bsize) + + b_height_log2(bsize)); stop_thresh_rd = RDCOST(x->rdmult, x->rddiv, 0, stop_thresh); // If obtained distortion is very small, choose current partition @@ -2548,8 +2548,8 @@ static void nonrd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, pc_tree->partitioning = PARTITION_NONE; // Adjust threshold according to partition size. - stop_thresh >>= 8 - (b_width_log2_lookup[bsize] + - b_height_log2_lookup[bsize]); + stop_thresh >>= 8 - (b_width_log2(bsize) + + b_height_log2(bsize)); stop_thresh_rd = RDCOST(x->rdmult, x->rddiv, 0, stop_thresh); // If obtained distortion is very small, choose current partition diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index b2ab714e3..4b3f4f5a0 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -287,7 +287,7 @@ static void encode_breakout_test(VP9_COMP *cpi, MACROBLOCK *x, // Adjust ac threshold according to partition size. thresh_ac >>= - 8 - (b_width_log2_lookup[bsize] + b_height_log2_lookup[bsize]); + 8 - (b_width_log2(bsize) + b_height_log2(bsize)); thresh_dc = (xd->plane[0].dequant[0] * xd->plane[0].dequant[0] >> 6); } else { @@ -387,7 +387,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, // Mode index conversion form THR_MODES to PREDICTION_MODE for a ref frame. int mode_idx[MB_MODE_COUNT] = {0}; INTERP_FILTER filter_ref = cm->interp_filter; - int bsl = mi_width_log2_lookup[bsize]; + int bsl = mi_width_log2(bsize); const int pred_filter_search = cm->interp_filter == SWITCHABLE ? (((mi_row + mi_col) >> bsl) + get_chessboard_index(cm)) % 2 : 0; int const_motion[MAX_REF_FRAMES] = { 0 }; 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; |