diff --git a/vp9/common/vp9_entropymv.c b/vp9/common/vp9_entropymv.c index e8696fefa7bddfe003ea497cfe2fffe0d83ca5a1..a62fa476a1db990cbc4d510b1a94eda5d5885293 100644 --- a/vp9/common/vp9_entropymv.c +++ b/vp9/common/vp9_entropymv.c @@ -82,17 +82,6 @@ const nmv_context vp9_default_nmv_context = { }, }; -MV_JOINT_TYPE vp9_get_mv_joint(const MV *mv) { - if (mv->row == 0 && mv->col == 0) - return MV_JOINT_ZERO; - else if (mv->row == 0 && mv->col != 0) - return MV_JOINT_HNZVZ; - else if (mv->row != 0 && mv->col == 0) - return MV_JOINT_HZVNZ; - else - return MV_JOINT_HNZVNZ; -} - #define mv_class_base(c) ((c) ? (CLASS0_SIZE << (c + 2)) : 0) MV_CLASS_TYPE vp9_get_mv_class(int z, int *offset) { diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h index de18dfb7a63adc4ca83bc937358ffa1e72755a74..15f9ada439ccba5ef07866065213240a7115b884 100644 --- a/vp9/common/vp9_entropymv.h +++ b/vp9/common/vp9_entropymv.h @@ -99,7 +99,14 @@ typedef struct { nmv_component comps[2]; } nmv_context; -MV_JOINT_TYPE vp9_get_mv_joint(const MV *mv); +static INLINE MV_JOINT_TYPE vp9_get_mv_joint(const MV *mv) { + if (mv->row == 0) { + return mv->col == 0 ? MV_JOINT_ZERO : MV_JOINT_HNZVZ; + } else { + return mv->col == 0 ? MV_JOINT_HZVNZ : MV_JOINT_HNZVNZ; + } +} + MV_CLASS_TYPE vp9_get_mv_class(int z, int *offset); int vp9_get_mv_mag(MV_CLASS_TYPE c, int offset);