diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index c899eb23d326d99730309fb69b965fec805e5621..950a6c8bbe7aaa9ba9787f3589b2b338e4ffd436 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3289,7 +3289,6 @@ static void encode_frame_internal(VP9_COMP *cpi) { vp9_zero(cm->counts); vp9_zero(cpi->coef_counts); - vp9_zero(cpi->tx_stepdown_count); vp9_zero(rd_opt->comp_pred_diff); vp9_zero(rd_opt->filter_diff); vp9_zero(rd_opt->tx_select_diff); diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index d131ed606cc0ae2cb9d18f32a2072b4bba312b2d..b1b12a135c9b133e550919a22e0b2cad9511adef 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -372,8 +372,6 @@ typedef struct VP9_COMP { int dummy_packing; /* flag to indicate if packing is dummy */ - unsigned int tx_stepdown_count[TX_SIZES]; - int initial_width; int initial_height; diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index a2d89e7dd6010f65cff444fb35c88056944d2c01..e52620f81b21dbb1104d808da854bd16cc7e725e 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -468,7 +468,6 @@ static void choose_largest_tx_size(VP9_COMP *cpi, MACROBLOCK *x, txfm_rd_in_plane(x, rate, distortion, skip, sse, ref_best_rd, 0, bs, mbmi->tx_size, cpi->sf.use_fast_coef_costing); - cpi->tx_stepdown_count[0]++; } static void choose_tx_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x, @@ -551,16 +550,12 @@ static void choose_tx_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x, if (max_tx_size == TX_32X32 && best_tx == TX_32X32) { tx_cache[TX_MODE_SELECT] = rd[TX_32X32][1]; - cpi->tx_stepdown_count[0]++; } else if (max_tx_size >= TX_16X16 && best_tx == TX_16X16) { tx_cache[TX_MODE_SELECT] = rd[TX_16X16][1]; - cpi->tx_stepdown_count[max_tx_size - TX_16X16]++; } else if (rd[TX_8X8][1] < rd[TX_4X4][1]) { tx_cache[TX_MODE_SELECT] = rd[TX_8X8][1]; - cpi->tx_stepdown_count[max_tx_size - TX_8X8]++; } else { tx_cache[TX_MODE_SELECT] = rd[TX_4X4][1]; - cpi->tx_stepdown_count[max_tx_size - TX_4X4]++; } }