summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunqing Wang <yunqingwang@google.com>2015-03-10 10:52:55 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2015-03-10 10:52:55 -0700
commit3e637a70dab1ddead4ba14caeb8f840a47a256ca (patch)
tree6d6f753a3e6e31f79663195548e00a03a0fb925e
parent12943e722d1740bf38b5b2beec8bdb1f1604342a (diff)
parentf0cf9719d0c3eee99431ef313a5aaf817f22b5af (diff)
downloadlibvpx-3e637a70dab1ddead4ba14caeb8f840a47a256ca.tar
libvpx-3e637a70dab1ddead4ba14caeb8f840a47a256ca.tar.gz
libvpx-3e637a70dab1ddead4ba14caeb8f840a47a256ca.tar.bz2
libvpx-3e637a70dab1ddead4ba14caeb8f840a47a256ca.zip
Merge "Accumulate tx_totals counters in multi-threaded encoder"
-rw-r--r--vp9/common/vp9_thread_common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/vp9/common/vp9_thread_common.c b/vp9/common/vp9_thread_common.c
index 27a3212ca..7a3871c41 100644
--- a/vp9/common/vp9_thread_common.c
+++ b/vp9/common/vp9_thread_common.c
@@ -382,6 +382,9 @@ void vp9_accumulate_frame_counts(VP9_COMMON *cm, FRAME_COUNTS *counts,
cm->counts.tx.p8x8[i][j] += counts->tx.p8x8[i][j];
}
+ for (i = 0; i < TX_SIZES; i++)
+ cm->counts.tx.tx_totals[i] += counts->tx.tx_totals[i];
+
for (i = 0; i < SKIP_CONTEXTS; i++)
for (j = 0; j < 2; j++)
cm->counts.skip[i][j] += counts->skip[i][j];