Commit 4a8103d6 authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Removing two unused TX_SIZE_SEARCH_METHOD members."

parents cbce09ce bc93f425
...@@ -994,21 +994,13 @@ static void inter_super_block_yrd(VP9_COMP *cpi, MACROBLOCK *x, int *rate, ...@@ -994,21 +994,13 @@ static void inter_super_block_yrd(VP9_COMP *cpi, MACROBLOCK *x, int *rate,
return; return;
} }
if (cpi->sf.tx_size_search_method == USE_LARGESTINTRA_MODELINTER) {
for (tx_size = TX_4X4; tx_size <= max_tx_size; ++tx_size) for (tx_size = TX_4X4; tx_size <= max_tx_size; ++tx_size)
model_rd_for_sb_y_tx(cpi, bs, tx_size, x, xd, txfm_rd_in_plane(x, &r[tx_size][0], &d[tx_size], &s[tx_size],
&r[tx_size][0], &d[tx_size], &s[tx_size]); &sse[tx_size], ref_best_rd, 0, bs, tx_size,
choose_txfm_size_from_modelrd(cpi, x, r, rate, d, distortion, s,
skip, sse, ref_best_rd, bs);
} else {
for (tx_size = TX_4X4; tx_size <= max_tx_size; ++tx_size)
txfm_rd_in_plane(x, &r[tx_size][0], &d[tx_size],
&s[tx_size], &sse[tx_size],
ref_best_rd, 0, bs, tx_size,
cpi->sf.use_fast_coef_costing); cpi->sf.use_fast_coef_costing);
choose_txfm_size_from_rd(cpi, x, r, rate, d, distortion, s, choose_txfm_size_from_rd(cpi, x, r, rate, d, distortion, s,
skip, txfm_cache, bs); skip, txfm_cache, bs);
}
if (psse) if (psse)
*psse = sse[mbmi->tx_size]; *psse = sse[mbmi->tx_size];
} }
......
...@@ -56,8 +56,6 @@ typedef enum { ...@@ -56,8 +56,6 @@ typedef enum {
typedef enum { typedef enum {
USE_FULL_RD = 0, USE_FULL_RD = 0,
USE_LARGESTINTRA,
USE_LARGESTINTRA_MODELINTER,
USE_LARGESTALL, USE_LARGESTALL,
USE_TX_8X8 USE_TX_8X8
} TX_SIZE_SEARCH_METHOD; } TX_SIZE_SEARCH_METHOD;
......
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