Commit 325b96dc authored by Peter de Rivaz's avatar Peter de Rivaz Committed by Debargha Mukherjee

Accumulate EXT_TX counts for multithread

EXT_TX introduces some new symbols to be decoded.
The encoder counts how many times these are used.
In multithreaded mode, the counts from the worker threads
need to be accumulated into the main thread.

This change means that VP10/VPxEncoderThreadTest now works
with more choices of cpu-used and number of passes.

Change-Id: Ibe7e6a3c58145265f4ead155ff98fb4cb37c3513
parent 236623cf
......@@ -137,6 +137,6 @@ VP9_INSTANTIATE_TEST_CASE(
VP10_INSTANTIATE_TEST_CASE(
VPxEncoderThreadTest,
::testing::Values(::libvpx_test::kTwoPassGood),
::testing::Range(0, 1));
::testing::Values(::libvpx_test::kTwoPassGood, ::libvpx_test::kOnePassGood),
::testing::Range(0, 9));
} // namespace
......@@ -435,6 +435,17 @@ void vp10_accumulate_frame_counts(VP10_COMMON *cm, FRAME_COUNTS *counts,
comps->fp[i] += comps_t->fp[i];
}
#if CONFIG_EXT_TX
for (i = 0; i < EXT_TX_SIZES; i++)
for (j = 0; j < TX_TYPES; j++)
cm->counts.inter_tx_type[i][j] += counts->inter_tx_type[i][j];
for (i = 0; i < EXT_TX_SIZES; i++)
for (j = 0; j < INTRA_MODES; j++)
for (k = 0; k < TX_TYPES; k++)
cm->counts.intra_tx_type[i][j][k] += counts->intra_tx_type[i][j][k];
#endif
#if CONFIG_MISC_FIXES
for (i = 0; i < PREDICTION_PROBS; i++)
for (j = 0; j < 2; j++)
......
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