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

Renamings for OBMC experiment

Browse Source 
To get ready for pulling AV1 to nextgenv2
Replace the experimental flag by MOTION_VAR. Rename major variables.

Change-Id: If6cf4f37b9319c46d8f90df551cc7295d66ca205
This commit is contained in:
Yue Chen
2016-10-13 15:18:22 -07:00
parent 732c188523
commit cb60b185c7
23 changed files with 257 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
av1/encoder/rd.c
View File

@@ -450,12 +450,12 @@ void av1_initialize_rd_consts(AV1_COMP *cpi) {
cm->fc->interintra_mode_prob[i],
av1_interintra_mode_tree);
#endif // CONFIG_EXT_INTER
#if CONFIG_OBMC || CONFIG_WARPED_MOTION
#if CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
for (i = BLOCK_8X8; i < BLOCK_SIZES; i++) {
av1_cost_tokens((int *)cpi->motvar_cost[i], cm->fc->motvar_prob[i],
av1_motvar_tree);
av1_cost_tokens((int *)cpi->motion_mode_cost[i],
cm->fc->motion_mode_prob[i], av1_motion_mode_tree);
}
#endif // CONFIG_OBMC || CONFIG_WARPED_MOTION
#endif // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
}
}
}