diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-11-20 14:39:58 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-20 14:39:58 -0800 |
| commit | a218a96784adf34d7d668e37fa0e3c322f5adc37 (patch) | |
| tree | 66dc74b157e55db0842c77424aa9214069612156 /vp9/common | |
| parent | d54893da1dd2d0c1e9a2e0196de2b993d8387865 (diff) | |
| parent | 4956fcd31b69c9695f3a8b62aa629cdcfc5065ca (diff) | |
| download | libvpx-a218a96784adf34d7d668e37fa0e3c322f5adc37.tar libvpx-a218a96784adf34d7d668e37fa0e3c322f5adc37.tar.gz libvpx-a218a96784adf34d7d668e37fa0e3c322f5adc37.tar.bz2 libvpx-a218a96784adf34d7d668e37fa0e3c322f5adc37.zip | |
Merge "Adding MV_FP_SIZE constant."
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_entropymv.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h index d843f5bfe..b62f7c42f 100644 --- a/vp9/common/vp9_entropymv.h +++ b/vp9/common/vp9_entropymv.h @@ -62,6 +62,7 @@ typedef enum { #define CLASS0_BITS 1 /* bits at integer precision for class 0 */ #define CLASS0_SIZE (1 << CLASS0_BITS) #define MV_OFFSET_BITS (MV_CLASSES + CLASS0_BITS - 2) +#define MV_FP_SIZE 4 #define MV_MAX_BITS (MV_CLASSES + CLASS0_BITS + 2) #define MV_MAX ((1 << MV_MAX_BITS) - 1) @@ -80,7 +81,7 @@ extern struct vp9_token vp9_mv_class_encodings[MV_CLASSES]; extern const vp9_tree_index vp9_mv_class0_tree[TREE_SIZE(CLASS0_SIZE)]; extern struct vp9_token vp9_mv_class0_encodings[CLASS0_SIZE]; -extern const vp9_tree_index vp9_mv_fp_tree[TREE_SIZE(4)]; +extern const vp9_tree_index vp9_mv_fp_tree[TREE_SIZE(MV_FP_SIZE)]; extern struct vp9_token vp9_mv_fp_encodings[4]; typedef struct { @@ -88,8 +89,8 @@ typedef struct { vp9_prob classes[MV_CLASSES - 1]; vp9_prob class0[CLASS0_SIZE - 1]; vp9_prob bits[MV_OFFSET_BITS]; - vp9_prob class0_fp[CLASS0_SIZE][4 - 1]; - vp9_prob fp[4 - 1]; + vp9_prob class0_fp[CLASS0_SIZE][MV_FP_SIZE - 1]; + vp9_prob fp[MV_FP_SIZE - 1]; vp9_prob class0_hp; vp9_prob hp; } nmv_component; @@ -116,8 +117,8 @@ typedef struct { unsigned int classes[MV_CLASSES]; unsigned int class0[CLASS0_SIZE]; unsigned int bits[MV_OFFSET_BITS][2]; - unsigned int class0_fp[CLASS0_SIZE][4]; - unsigned int fp[4]; + unsigned int class0_fp[CLASS0_SIZE][MV_FP_SIZE]; + unsigned int fp[MV_FP_SIZE]; unsigned int class0_hp[2]; unsigned int hp[2]; } nmv_component_counts; |