diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2016-01-19 11:05:09 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2016-01-22 14:46:43 -0800 |
| commit | 5a9753fca56f0eeb9f61e342b2fccffc364f9426 (patch) | |
| tree | dd33d82febff9fba67a61b711a30504b7f8a827b /libvpx/vp9/common/vp9_entropymv.h | |
| parent | e8544063f08d093e211247d09d74e5bf86976dd5 (diff) | |
| download | android_external_libvpx-5a9753fca56f0eeb9f61e342b2fccffc364f9426.tar.gz android_external_libvpx-5a9753fca56f0eeb9f61e342b2fccffc364f9426.tar.bz2 android_external_libvpx-5a9753fca56f0eeb9f61e342b2fccffc364f9426.zip | |
Merge Conflict Fix CL to lmp-mr1-release for ag/849478
DO NOT MERGE - libvpx: Pull from upstream
Current HEAD: 7105df53d7dc13d5e575bc8df714ec8d1da36b06
BUG=23452792
Change-Id: Ic78176fc369e0bacc71d423e0e2e6075d004aaec
Diffstat (limited to 'libvpx/vp9/common/vp9_entropymv.h')
| -rw-r--r-- | libvpx/vp9/common/vp9_entropymv.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/libvpx/vp9/common/vp9_entropymv.h b/libvpx/vp9/common/vp9_entropymv.h index e7033e4..8c817bf 100644 --- a/libvpx/vp9/common/vp9_entropymv.h +++ b/libvpx/vp9/common/vp9_entropymv.h @@ -13,7 +13,10 @@ #define VP9_COMMON_VP9_ENTROPYMV_H_ #include "./vpx_config.h" -#include "vp9/common/vp9_blockd.h" + +#include "vpx_dsp/prob.h" + +#include "vp9/common/vp9_mv.h" #ifdef __cplusplus extern "C" { @@ -74,24 +77,24 @@ typedef enum { #define MV_UPP ((1 << MV_IN_USE_BITS) - 1) #define MV_LOW (-(1 << MV_IN_USE_BITS)) -extern const vp9_tree_index vp9_mv_joint_tree[]; -extern const vp9_tree_index vp9_mv_class_tree[]; -extern const vp9_tree_index vp9_mv_class0_tree[]; -extern const vp9_tree_index vp9_mv_fp_tree[]; +extern const vpx_tree_index vp9_mv_joint_tree[]; +extern const vpx_tree_index vp9_mv_class_tree[]; +extern const vpx_tree_index vp9_mv_class0_tree[]; +extern const vpx_tree_index vp9_mv_fp_tree[]; typedef struct { - vp9_prob sign; - vp9_prob classes[MV_CLASSES - 1]; - vp9_prob class0[CLASS0_SIZE - 1]; - vp9_prob bits[MV_OFFSET_BITS]; - vp9_prob class0_fp[CLASS0_SIZE][MV_FP_SIZE - 1]; - vp9_prob fp[MV_FP_SIZE - 1]; - vp9_prob class0_hp; - vp9_prob hp; + vpx_prob sign; + vpx_prob classes[MV_CLASSES - 1]; + vpx_prob class0[CLASS0_SIZE - 1]; + vpx_prob bits[MV_OFFSET_BITS]; + vpx_prob class0_fp[CLASS0_SIZE][MV_FP_SIZE - 1]; + vpx_prob fp[MV_FP_SIZE - 1]; + vpx_prob class0_hp; + vpx_prob hp; } nmv_component; typedef struct { - vp9_prob joints[MV_JOINTS - 1]; + vpx_prob joints[MV_JOINTS - 1]; nmv_component comps[2]; } nmv_context; @@ -104,8 +107,6 @@ static INLINE MV_JOINT_TYPE vp9_get_mv_joint(const MV *mv) { } MV_CLASS_TYPE vp9_get_mv_class(int z, int *offset); -int vp9_get_mv_mag(MV_CLASS_TYPE c, int offset); - typedef struct { unsigned int sign[2]; |