diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-05-07 17:09:38 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-07 17:09:38 -0700 |
| commit | d6c490cb1546a3c12bc8f59d5c087c729e4d32fd (patch) | |
| tree | fbacf148189a32cdb50a9f8f5b398aa1158a23b9 /vp9/common/vp9_onyxc_int.h | |
| parent | 9cd5406c3206beab15a01ec198ecb4f51e4a84ad (diff) | |
| parent | a14ae84749c9aa351d35811230c20253f197ddd5 (diff) | |
| download | libvpx-d6c490cb1546a3c12bc8f59d5c087c729e4d32fd.tar libvpx-d6c490cb1546a3c12bc8f59d5c087c729e4d32fd.tar.gz libvpx-d6c490cb1546a3c12bc8f59d5c087c729e4d32fd.tar.bz2 libvpx-d6c490cb1546a3c12bc8f59d5c087c729e4d32fd.zip | |
Merge "Deprecate code_zerogroup experiment." into experimental
Diffstat (limited to 'vp9/common/vp9_onyxc_int.h')
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index f7f4c06b3..d9d298903 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -62,12 +62,6 @@ typedef struct frame_contexts { vp9_coeff_probs coef_probs_8x8[BLOCK_TYPES]; vp9_coeff_probs coef_probs_16x16[BLOCK_TYPES]; vp9_coeff_probs coef_probs_32x32[BLOCK_TYPES]; -#if CONFIG_CODE_ZEROGROUP - vp9_zpc_probs zpc_probs_4x4; - vp9_zpc_probs zpc_probs_8x8; - vp9_zpc_probs zpc_probs_16x16; - vp9_zpc_probs zpc_probs_32x32; -#endif nmv_context nmvc; nmv_context pre_nmvc; @@ -88,12 +82,6 @@ typedef struct frame_contexts { vp9_coeff_probs pre_coef_probs_8x8[BLOCK_TYPES]; vp9_coeff_probs pre_coef_probs_16x16[BLOCK_TYPES]; vp9_coeff_probs pre_coef_probs_32x32[BLOCK_TYPES]; -#if CONFIG_CODE_ZEROGROUP - vp9_zpc_probs pre_zpc_probs_4x4; - vp9_zpc_probs pre_zpc_probs_8x8; - vp9_zpc_probs pre_zpc_probs_16x16; - vp9_zpc_probs pre_zpc_probs_32x32; -#endif vp9_coeff_count coef_counts_4x4[BLOCK_TYPES]; vp9_coeff_count coef_counts_8x8[BLOCK_TYPES]; @@ -102,13 +90,6 @@ typedef struct frame_contexts { unsigned int eob_branch_counts[TX_SIZE_MAX_SB][BLOCK_TYPES][REF_TYPES] [COEF_BANDS][PREV_COEF_CONTEXTS]; -#if CONFIG_CODE_ZEROGROUP - vp9_zpc_count zpc_counts_4x4; - vp9_zpc_count zpc_counts_8x8; - vp9_zpc_count zpc_counts_16x16; - vp9_zpc_count zpc_counts_32x32; -#endif - nmv_context_counts NMVcount; vp9_prob switchable_interp_prob[VP9_SWITCHABLE_FILTERS + 1] [VP9_SWITCHABLE_FILTERS - 1]; @@ -343,10 +324,6 @@ static int get_mi_col(const MACROBLOCKD *xd) { } static int get_token_alloc(int mb_rows, int mb_cols) { -#if CONFIG_CODE_ZEROGROUP - return mb_rows * mb_cols * (24 * 16 * 2); -#else return mb_rows * mb_cols * (24 * 16 + 4); -#endif } #endif // VP9_COMMON_VP9_ONYXC_INT_H_ |