generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Skip calling vp9_block_energy when aq-mode is off"

Browse Source
This commit is contained in:
Jingning Han
2014-07-31 14:38:20 -07:00
committed by Gerrit Code Review
parent d39610a452 1c3a80b9a1
commit f94227c81d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_encodeframe.c
View File

@@ -1463,7 +1463,7 @@ static void rd_use_partition(VP9_COMP *cpi,
pc_tree->partitioning = partition; pc_tree->partitioning = partition;
save_context(cpi, mi_row, mi_col, a, l, sa, sl, bsize); 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); set_offsets(cpi, tile, mi_row, mi_col, bsize);
x->mb_energy = vp9_block_energy(cpi, x, 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] == assert(num_8x8_blocks_wide_lookup[bsize] ==
num_8x8_blocks_high_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); x->mb_energy = vp9_block_energy(cpi, x, bsize);
}
if (cpi->sf.cb_partition_search && bsize == BLOCK_16X16) { if (cpi->sf.cb_partition_search && bsize == BLOCK_16X16) {
int cb_partition_search_ctrl = ((pc_tree->index == 0 || pc_tree->index == 3) int cb_partition_search_ctrl = ((pc_tree->index == 0 || pc_tree->index == 3)