Remove dead struct member Change-Id: Id228c94fbe6005ac37a59bb8c23cfb0f95f97af0
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h index e2f8a3e..db48884 100644 --- a/av1/common/entropymode.h +++ b/av1/common/entropymode.h
@@ -482,9 +482,6 @@ #if CONFIG_COMPOUND_SINGLEREF unsigned int comp_inter_mode[COMP_INTER_MODE_CONTEXTS][2]; #endif // CONFIG_COMPOUND_SINGLEREF - // TODO(urvang): Only needed for !CONFIG_VAR_TX case. So can be removed when - // CONFIG_VAR_TX flag is removed. - unsigned int tx_size[MAX_TX_DEPTH][TX_SIZE_CONTEXTS][MAX_TX_DEPTH + 1]; #if CONFIG_RECT_TX_EXT unsigned int quarter_tx_size[2]; #endif
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index c00586d..668a6bd 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c
@@ -3636,8 +3636,6 @@ sizeof(cm->counts.comp_ref))); assert(!memcmp(cm->counts.comp_bwdref, zero_counts.comp_bwdref, sizeof(cm->counts.comp_bwdref))); - assert(!memcmp(&cm->counts.tx_size, &zero_counts.tx_size, - sizeof(cm->counts.tx_size))); assert(!memcmp(cm->counts.skip, zero_counts.skip, sizeof(cm->counts.skip))); assert( !memcmp(&cm->counts.mv[0], &zero_counts.mv[0], sizeof(cm->counts.mv[0])));
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c index 2c5389a..719cef2 100644 --- a/av1/decoder/decodemv.c +++ b/av1/decoder/decodemv.c
@@ -474,7 +474,6 @@ static TX_SIZE read_selected_tx_size(AV1_COMMON *cm, MACROBLOCKD *xd, int32_t tx_size_cat, aom_reader *r) { - FRAME_COUNTS *counts = xd->counts; const int ctx = get_tx_size_context(xd); FRAME_CONTEXT *ec_ctx = xd->tile_ctx; (void)cm; @@ -485,7 +484,6 @@ #if CONFIG_RECT_TX assert(!is_rect_tx(tx_size)); #endif // CONFIG_RECT_TX - if (counts) ++counts->tx_size[tx_size_cat][ctx][depth]; return tx_size; }
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c index 597b73d..6f1f341 100644 --- a/av1/encoder/encodeframe.c +++ b/av1/encoder/encodeframe.c
@@ -4728,12 +4728,6 @@ if (is_inter) { tx_partition_count_update(cm, x, bsize, mi_row, mi_col, td->counts); } else { - const int tx_size_ctx = get_tx_size_context(xd); - const int32_t tx_size_cat = is_inter ? inter_tx_size_cat_lookup[bsize] - : intra_tx_size_cat_lookup[bsize]; - const TX_SIZE coded_tx_size = txsize_sqr_up_map[tx_size]; - const int depth = tx_size_to_depth(coded_tx_size); - ++td->counts->tx_size[tx_size_cat][tx_size_ctx][depth]; if (tx_size != max_txsize_rect_lookup[bsize]) ++x->txb_split_count; }