diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2015-03-10 09:53:45 -0700 |
|---|---|---|
| committer | Yunqing Wang <yunqingwang@google.com> | 2015-03-10 10:02:49 -0700 |
| commit | f0cf9719d0c3eee99431ef313a5aaf817f22b5af (patch) | |
| tree | 33b0b817e38e9875c28f1b5d9ab3c0e060f0b7c8 /vp9/common/vp9_thread_common.c | |
| parent | 6eaca27df21d2bd8da1c063c484b5f5c28621d3a (diff) | |
| download | libvpx-f0cf9719d0c3eee99431ef313a5aaf817f22b5af.tar libvpx-f0cf9719d0c3eee99431ef313a5aaf817f22b5af.tar.gz libvpx-f0cf9719d0c3eee99431ef313a5aaf817f22b5af.tar.bz2 libvpx-f0cf9719d0c3eee99431ef313a5aaf817f22b5af.zip | |
Accumulate tx_totals counters in multi-threaded encoder
Tx_totals counters weren't handled correctly in multi-thread
case, which caused the mismatch while encoding using threads > 1.
This patch fixed that.
Change-Id: Ice9b0386f57175fb92a0bdcd5042686a3106246a
Diffstat (limited to 'vp9/common/vp9_thread_common.c')
| -rw-r--r-- | vp9/common/vp9_thread_common.c | 3 |
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]; |