Commit 6b763c9c authored by Yaowu Xu's avatar Yaowu Xu

Fix issues in --enable-entropy and --enable-cb4x4

Change-Id: I148d60d56599a238c60c429572a25cbddbe5191d
parent 01770b3e
This diff is collapsed.
......@@ -2892,7 +2892,7 @@ static void get_coef_counts_diff(AV1_COMP *cpi, int index,
assert(max_idx < COEF_PROBS_BUFS);
for (tx_size = TX_4X4; tx_size <= max_tx_size; ++tx_size)
for (tx_size = 0; tx_size <= max_tx_size; ++tx_size)
for (i = 0; i < PLANE_TYPES; ++i)
for (j = 0; j < REF_TYPES; ++j)
for (k = 0; k < COEF_BANDS; ++k)
......@@ -3166,7 +3166,7 @@ static void update_coef_probs(AV1_COMP *cpi, aom_writer *w) {
[COEFF_CONTEXTS];
av1_copy(eob_counts_copy, cm->counts.eob_branch);
for (i = 1; i <= cpi->common.coef_probs_update_idx; ++i) {
for (tx_size = TX_4X4; tx_size <= max_tx_size; ++tx_size)
for (tx_size = 0; tx_size <= max_tx_size; ++tx_size)
av1_full_to_model_counts(cm->counts.coef[tx_size],
subframe_stats->coef_counts_buf[i][tx_size]);
av1_copy(cm->counts.eob_branch, subframe_stats->eob_counts_buf[i]);
......
......@@ -4650,7 +4650,7 @@ static void encode_rd_sb_row(AV1_COMP *cpi, ThreadData *td,
TX_SIZE t;
SUBFRAME_STATS *subframe_stats = &cpi->subframe_stats;
for (t = TX_4X4; t < TX_SIZES; ++t)
for (t = 0; t < TX_SIZES; ++t)
av1_full_to_model_counts(cpi->td.counts->coef[t],
cpi->td.rd_counts.coef_counts[t]);
av1_partial_adapt_probs(cm, mi_row, mi_col);
......
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