Commit 7e0f88b6 authored by Jingning Han's avatar Jingning Han
Browse files

Use lookup table to find largest txfm size

Refactor choose_largest_txfm_size_ and make it find the largest
transform size via lookup table.

Change-Id: I685e0396d71111b599d5367ab1b9c934bd5490c8
parent 8105ce6d
...@@ -787,8 +787,7 @@ static void choose_largest_txfm_size(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -787,8 +787,7 @@ static void choose_largest_txfm_size(VP9_COMP *cpi, MACROBLOCK *x,
int *skip, int64_t *sse, int *skip, int64_t *sse,
int64_t ref_best_rd, int64_t ref_best_rd,
BLOCK_SIZE_TYPE bs) { BLOCK_SIZE_TYPE bs) {
const TX_SIZE max_txfm_size = TX_32X32 const TX_SIZE max_txfm_size = max_txsize_lookup[bs];
- (bs < BLOCK_32X32) - (bs < BLOCK_16X16);
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
MACROBLOCKD *const xd = &x->e_mbd; MACROBLOCKD *const xd = &x->e_mbd;
MB_MODE_INFO *const mbmi = &xd->mode_info_context->mbmi; MB_MODE_INFO *const mbmi = &xd->mode_info_context->mbmi;
...@@ -818,8 +817,7 @@ static void choose_txfm_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -818,8 +817,7 @@ static void choose_txfm_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x,
int *s, int *skip, int *s, int *skip,
int64_t tx_cache[TX_MODES], int64_t tx_cache[TX_MODES],
BLOCK_SIZE_TYPE bs) { BLOCK_SIZE_TYPE bs) {
const TX_SIZE max_tx_size = TX_32X32 const TX_SIZE max_tx_size = max_txsize_lookup[bs];
- (bs < BLOCK_32X32) - (bs < BLOCK_16X16);
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
MACROBLOCKD *const xd = &x->e_mbd; MACROBLOCKD *const xd = &x->e_mbd;
MB_MODE_INFO *const mbmi = &xd->mode_info_context->mbmi; MB_MODE_INFO *const mbmi = &xd->mode_info_context->mbmi;
...@@ -922,8 +920,7 @@ static void choose_txfm_size_from_modelrd(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -922,8 +920,7 @@ static void choose_txfm_size_from_modelrd(VP9_COMP *cpi, MACROBLOCK *x,
int *s, int *skip, int64_t *sse, int *s, int *skip, int64_t *sse,
int64_t ref_best_rd, int64_t ref_best_rd,
BLOCK_SIZE_TYPE bs) { BLOCK_SIZE_TYPE bs) {
const TX_SIZE max_txfm_size = TX_32X32 const TX_SIZE max_txfm_size = max_txsize_lookup[bs];
- (bs < BLOCK_32X32) - (bs < BLOCK_16X16);
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
MACROBLOCKD *const xd = &x->e_mbd; MACROBLOCKD *const xd = &x->e_mbd;
MB_MODE_INFO *const mbmi = &xd->mode_info_context->mbmi; MB_MODE_INFO *const mbmi = &xd->mode_info_context->mbmi;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment