summaryrefslogtreecommitdiff
path: root/vp9/common/vp9_pred_common.c
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2013-04-24 12:14:58 -0700
committerDmitry Kovalev <dkovalev@google.com>2013-04-25 10:23:00 -0700
commit61a47da869a3f507e446caa19ac0209fcbb475fe (patch)
tree2d75f532f51efefa42d76e8b62e3174cb4183e05 /vp9/common/vp9_pred_common.c
parent2cf0675a523354cbc0dbbcf76926e9cef2c391d7 (diff)
downloadlibvpx-61a47da869a3f507e446caa19ac0209fcbb475fe.tar
libvpx-61a47da869a3f507e446caa19ac0209fcbb475fe.tar.gz
libvpx-61a47da869a3f507e446caa19ac0209fcbb475fe.tar.bz2
libvpx-61a47da869a3f507e446caa19ac0209fcbb475fe.zip
Adding is_inter_mode function.
Change-Id: I2d32d46002cb92c63050c2b8328865c406103621
Diffstat (limited to 'vp9/common/vp9_pred_common.c')
-rw-r--r--vp9/common/vp9_pred_common.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c
index c12920c4d..882b56f0c 100644
--- a/vp9/common/vp9_pred_common.c
+++ b/vp9/common/vp9_pred_common.c
@@ -59,16 +59,14 @@ unsigned char vp9_get_pred_context(const VP9_COMMON *const cm,
case PRED_SWITCHABLE_INTERP: {
// left
const int left_in_image = xd->left_available && left_mi->mbmi.mb_in_image;
- const int left_mv_pred = left_mi->mbmi.mode >= NEARESTMV &&
- left_mi->mbmi.mode <= SPLITMV;
+ const int left_mv_pred = is_inter_mode(left_mi->mbmi.mode);
const int left_interp = left_in_image && left_mv_pred ?
vp9_switchable_interp_map[left_mi->mbmi.interp_filter] :
VP9_SWITCHABLE_FILTERS;
// above
const int above_in_image = xd->up_available && above_mi->mbmi.mb_in_image;
- const int above_mv_pred = above_mi->mbmi.mode >= NEARESTMV &&
- above_mi->mbmi.mode <= SPLITMV;
+ const int above_mv_pred = is_inter_mode(above_mi->mbmi.mode);
const int above_interp = above_in_image && above_mv_pred ?
vp9_switchable_interp_map[above_mi->mbmi.interp_filter] :
VP9_SWITCHABLE_FILTERS;