From 78808ad9fb101cbd06652b383f94f4409f2eba2d Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Mon, 22 Oct 2012 12:19:00 -0700 Subject: Merge of the newmventropy experiment Removes the old mv encoding code. Change-Id: I1026d48cc5ac15ccb776f98463e929254c3dc7da --- vp8/encoder/onyx_int.h | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'vp8/encoder/onyx_int.h') diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index ef17568ce..8c4f78bac 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -60,17 +60,10 @@ #define VP8_TEMPORAL_ALT_REF 1 typedef struct { -#if CONFIG_NEWMVENTROPY nmv_context nmvc; int nmvjointcost[MV_JOINTS]; int nmvcosts[2][MV_VALS]; int nmvcosts_hp[2][MV_VALS]; -#else - MV_CONTEXT mvc[2]; - int mvcosts[2][MVvals + 1]; - MV_CONTEXT_HP mvc_hp[2]; - int mvcosts_hp[2][MVvals_hp + 1]; -#endif #ifdef MODE_STATS // Stats @@ -556,12 +549,7 @@ typedef struct VP8_COMP { // int uv_mode_count[VP8_UV_MODES]; /* intra MB type cts this frame */ int y_uv_mode_count[VP8_YMODES][VP8_UV_MODES]; -#if CONFIG_NEWMVENTROPY nmv_context_counts NMVcount; -#else - unsigned int MVcount [2] [MVvals]; /* (row,col) MV cts this frame */ - unsigned int MVcount_hp [2] [MVvals_hp]; /* (row,col) MV cts this frame */ -#endif unsigned int coef_counts [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [MAX_ENTROPY_TOKENS]; /* for this frame */ vp8_prob frame_coef_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES]; -- cgit v1.2.3