Commit 05263051 authored by Debargha Mukherjee's avatar Debargha Mukherjee Committed by Gerrit Code Review

Merge "Accumulate EXT_TX counts for multithread" into nextgenv2

parents b6da40ad 325b96dc
......@@ -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