diff options
Diffstat (limited to 'vp9/common/vp9_entropymv.h')
| -rw-r--r-- | vp9/common/vp9_entropymv.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h index 162d2b44f..715b5bb2b 100644 --- a/vp9/common/vp9_entropymv.h +++ b/vp9/common/vp9_entropymv.h @@ -45,8 +45,16 @@ typedef enum { MV_JOINT_HNZVNZ = 3, /* Both components nonzero */ } MV_JOINT_TYPE; +static INLINE int mv_joint_vertical(MV_JOINT_TYPE type) { + return type == MV_JOINT_HZVNZ || type == MV_JOINT_HNZVNZ; +} + +static INLINE int mv_joint_horizontal(MV_JOINT_TYPE type) { + return type == MV_JOINT_HNZVZ || type == MV_JOINT_HNZVNZ; +} + extern const vp9_tree_index vp9_mv_joint_tree[2 * MV_JOINTS - 2]; -extern struct vp9_token_struct vp9_mv_joint_encodings [MV_JOINTS]; +extern struct vp9_token vp9_mv_joint_encodings[MV_JOINTS]; /* Symbols for coding magnitude class of nonzero components */ #define MV_CLASSES 11 @@ -65,7 +73,7 @@ typedef enum { } MV_CLASS_TYPE; extern const vp9_tree_index vp9_mv_class_tree[2 * MV_CLASSES - 2]; -extern struct vp9_token_struct vp9_mv_class_encodings [MV_CLASSES]; +extern struct vp9_token vp9_mv_class_encodings[MV_CLASSES]; #define CLASS0_BITS 1 /* bits at integer precision for class 0 */ #define CLASS0_SIZE (1 << CLASS0_BITS) @@ -76,10 +84,10 @@ extern struct vp9_token_struct vp9_mv_class_encodings [MV_CLASSES]; #define MV_VALS ((MV_MAX << 1) + 1) extern const vp9_tree_index vp9_mv_class0_tree[2 * CLASS0_SIZE - 2]; -extern struct vp9_token_struct vp9_mv_class0_encodings[CLASS0_SIZE]; +extern struct vp9_token vp9_mv_class0_encodings[CLASS0_SIZE]; extern const vp9_tree_index vp9_mv_fp_tree[2 * 4 - 2]; -extern struct vp9_token_struct vp9_mv_fp_encodings[4]; +extern struct vp9_token vp9_mv_fp_encodings[4]; typedef struct { vp9_prob sign; |