diff options
| author | Jingning Han <jingning@google.com> | 2014-07-31 14:38:20 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-07-31 14:38:20 -0700 |
| commit | f94227c81d7278ddf9634bb91ee2d2e7cfe610e3 (patch) | |
| tree | 8faab80fc592054457c85b94a296c9436d56f538 | |
| parent | d39610a452dc3523e576ca5cebd486c7b05a13df (diff) | |
| parent | 1c3a80b9a1b938786768de968217f86860c95552 (diff) | |
| download | libvpx-f94227c81d7278ddf9634bb91ee2d2e7cfe610e3.tar libvpx-f94227c81d7278ddf9634bb91ee2d2e7cfe610e3.tar.gz libvpx-f94227c81d7278ddf9634bb91ee2d2e7cfe610e3.tar.bz2 libvpx-f94227c81d7278ddf9634bb91ee2d2e7cfe610e3.zip | |
Merge "Skip calling vp9_block_energy when aq-mode is off"
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index b1ef3dcac..50980d027 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1463,7 +1463,7 @@ static void rd_use_partition(VP9_COMP *cpi, pc_tree->partitioning = partition; save_context(cpi, mi_row, mi_col, a, l, sa, sl, bsize); - if (bsize == BLOCK_16X16) { + if (bsize == BLOCK_16X16 && cpi->oxcf.aq_mode) { set_offsets(cpi, tile, mi_row, mi_col, bsize); x->mb_energy = vp9_block_energy(cpi, x, bsize); } @@ -1993,10 +1993,10 @@ static void rd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, assert(num_8x8_blocks_wide_lookup[bsize] == num_8x8_blocks_high_lookup[bsize]); - if (bsize == BLOCK_16X16) { - set_offsets(cpi, tile, mi_row, mi_col, bsize); + set_offsets(cpi, tile, mi_row, mi_col, bsize); + + if (bsize == BLOCK_16X16 && cpi->oxcf.aq_mode) x->mb_energy = vp9_block_energy(cpi, x, bsize); - } if (cpi->sf.cb_partition_search && bsize == BLOCK_16X16) { int cb_partition_search_ctrl = ((pc_tree->index == 0 || pc_tree->index == 3) |