diff options
Diffstat (limited to 'third_party/aom/av1/common/entropymv.h')
| -rw-r--r-- | third_party/aom/av1/common/entropymv.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/third_party/aom/av1/common/entropymv.h b/third_party/aom/av1/common/entropymv.h index 61bbbe326..bea5c6724 100644 --- a/third_party/aom/av1/common/entropymv.h +++ b/third_party/aom/av1/common/entropymv.h @@ -93,6 +93,11 @@ typedef struct { aom_cdf_prob fp_cdf[CDF_SIZE(MV_FP_SIZE)]; aom_prob class0_hp; aom_prob hp; +#if CONFIG_NEW_MULTISYMBOL + aom_cdf_prob class0_hp_cdf[CDF_SIZE(2)]; + aom_cdf_prob hp_cdf[CDF_SIZE(2)]; + aom_cdf_prob class0_cdf[CDF_SIZE(CLASS0_SIZE)]; +#endif } nmv_component; typedef struct { @@ -127,14 +132,16 @@ typedef struct { nmv_component_counts comps[2]; } nmv_context_counts; -void av1_inc_mv(const MV *mv, nmv_context_counts *mvctx, const int usehp); -#if CONFIG_GLOBAL_MOTION -extern const aom_tree_index - av1_global_motion_types_tree[TREE_SIZE(GLOBAL_TRANS_TYPES)]; -#endif // CONFIG_GLOBAL_MOTION -#if !CONFIG_EC_ADAPT -void av1_set_mv_cdfs(nmv_context *ctx); +typedef enum { +#if CONFIG_INTRABC + MV_SUBPEL_NONE = -1, #endif + MV_SUBPEL_LOW_PRECISION = 0, + MV_SUBPEL_HIGH_PRECISION, +} MvSubpelPrecision; + +void av1_inc_mv(const MV *mv, nmv_context_counts *mvctx, + MvSubpelPrecision precision); #ifdef __cplusplus } // extern "C" |