generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Relocate supertx prob update" into nextgenv2

Browse Source
This commit is contained in:
Yue Chen
2016-01-22 03:45:38 +00:00
committed by Gerrit Code Review
parent b1d49f24b4 fb29aec42c
commit 91f55290ef
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vp10/common/entropymode.c
View File

@@ -1326,6 +1326,16 @@ void vp10_adapt_inter_frame_probs(VP10_COMMON *cm) {
counts->inter_mode[i], fc->inter_mode_probs[i]); counts->inter_mode[i], fc->inter_mode_probs[i]);
#endif #endif
#if CONFIG_SUPERTX
for (i = 0; i < PARTITION_SUPERTX_CONTEXTS; ++i) {
int j;
for (j = 1; j < TX_SIZES; ++j) {
fc->supertx_prob[i][j] = mode_mv_merge_probs(pre_fc->supertx_prob[i][j],
counts->supertx[i][j]);
}
}
#endif // CONFIG_SUPERTX
for (i = 0; i < BLOCK_SIZE_GROUPS; i++) for (i = 0; i < BLOCK_SIZE_GROUPS; i++)
vpx_tree_merge_probs(vp10_intra_mode_tree, pre_fc->y_mode_prob[i], vpx_tree_merge_probs(vp10_intra_mode_tree, pre_fc->y_mode_prob[i],
counts->y_mode[i], fc->y_mode_prob[i]); counts->y_mode[i], fc->y_mode_prob[i]);
@@ -1420,16 +1430,6 @@ void vp10_adapt_intra_frame_probs(VP10_COMMON *cm) {
} }
#endif // CONFIG_EXT_TX #endif // CONFIG_EXT_TX
#if CONFIG_SUPERTX
for (i = 0; i < PARTITION_SUPERTX_CONTEXTS; ++i) {
int j;
for (j = 1; j < TX_SIZES; ++j) {
fc->supertx_prob[i][j] = mode_mv_merge_probs(pre_fc->supertx_prob[i][j],
counts->supertx[i][j]);
}
}
#endif // CONFIG_SUPERTX
if (cm->seg.temporal_update) { if (cm->seg.temporal_update) {
for (i = 0; i < PREDICTION_PROBS; i++) for (i = 0; i < PREDICTION_PROBS; i++)
fc->seg.pred_probs[i] = mode_mv_merge_probs(pre_fc->seg.pred_probs[i], fc->seg.pred_probs[i] = mode_mv_merge_probs(pre_fc->seg.pred_probs[i],