diff options
| author | Yue Chen <yuec@google.com> | 2016-10-13 15:18:22 -0700 |
|---|---|---|
| committer | Yue Chen <yuec@google.com> | 2016-10-13 15:51:22 -0700 |
| commit | cb60b185c73e0f15eeac71d83175345de9b03fa6 (patch) | |
| tree | 9ced84ad0af18b4a602fa515e4c112f934538851 /aom_dsp/sad.c | |
| parent | 732c188523fe3341d621ebdd38481d3f92bf3452 (diff) | |
Renamings for OBMC experiment
To get ready for pulling AV1 to nextgenv2
Replace the experimental flag by MOTION_VAR. Rename major variables.
Change-Id: If6cf4f37b9319c46d8f90df551cc7295d66ca205
Diffstat (limited to 'aom_dsp/sad.c')
| -rw-r--r-- | aom_dsp/sad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/aom_dsp/sad.c b/aom_dsp/sad.c index 7d284fc1e..2172b6cde 100644 --- a/aom_dsp/sad.c +++ b/aom_dsp/sad.c @@ -410,7 +410,7 @@ HIGHBD_MASKSADMXN(4, 4) #endif // CONFIG_AOM_HIGHBITDEPTH #endif // CONFIG_AV1 && CONFIG_EXT_INTER -#if CONFIG_AV1 && CONFIG_OBMC +#if CONFIG_AV1 && CONFIG_MOTION_VAR // pre: predictor being evaluated // wsrc: target weighted prediction (has been *4096 to keep precision) // mask: 2d weights (scaled by 4096) @@ -509,4 +509,4 @@ HIGHBD_OBMCSADMXN(4, 8) HIGHBD_OBMCSADMXN(4, 4) /* clang-format on */ #endif // CONFIG_AOM_HIGHBITDEPTH -#endif // CONFIG_AV1 && CONFIG_OBMC +#endif // CONFIG_AV1 && CONFIG_MOTION_VAR |