diff options
| author | James Zern <jzern@google.com> | 2013-08-22 18:40:34 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2013-08-23 19:16:49 -0700 |
| commit | c8ba8c513c5030ad5c7e03f547aad8f03614e92f (patch) | |
| tree | 57f61dd5a9e63d920d8d2843c4c313b465ad8311 /vp9/common/vp9_entropymode.h | |
| parent | 2c6ba737f83bd40214aae7510a9a6a8b4f8c30ce (diff) | |
| download | libvpx-c8ba8c513c5030ad5c7e03f547aad8f03614e92f.tar libvpx-c8ba8c513c5030ad5c7e03f547aad8f03614e92f.tar.gz libvpx-c8ba8c513c5030ad5c7e03f547aad8f03614e92f.tar.bz2 libvpx-c8ba8c513c5030ad5c7e03f547aad8f03614e92f.zip | |
cosmetics: strip 'VP9_' from defines in vp9 only code
Change-Id: I481d9bb2fa3ec72b6a83d5f04d545ad8013f295c
Diffstat (limited to 'vp9/common/vp9_entropymode.h')
| -rw-r--r-- | vp9/common/vp9_entropymode.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h index fced2cdfe..2f8085df6 100644 --- a/vp9/common/vp9_entropymode.h +++ b/vp9/common/vp9_entropymode.h @@ -16,8 +16,8 @@ #define SUBMVREF_COUNT 5 #define TX_SIZE_CONTEXTS 2 -#define VP9_MODE_UPDATE_PROB 252 -#define VP9_SWITCHABLE_FILTERS 3 // number of switchable filters +#define MODE_UPDATE_PROB 252 +#define SWITCHABLE_FILTERS 3 // number of switchable filters // #define MODE_STATS @@ -35,24 +35,24 @@ struct tx_counts { unsigned int p8x8[TX_SIZE_CONTEXTS][TX_SIZES - 2]; }; -extern const vp9_prob vp9_kf_uv_mode_prob[VP9_INTRA_MODES][VP9_INTRA_MODES - 1]; -extern const vp9_prob vp9_kf_y_mode_prob[VP9_INTRA_MODES][VP9_INTRA_MODES] - [VP9_INTRA_MODES - 1]; +extern const vp9_prob vp9_kf_uv_mode_prob[INTRA_MODES][INTRA_MODES - 1]; +extern const vp9_prob vp9_kf_y_mode_prob[INTRA_MODES][INTRA_MODES] + [INTRA_MODES - 1]; extern const vp9_tree_index vp9_intra_mode_tree[]; extern const vp9_tree_index vp9_inter_mode_tree[]; -extern struct vp9_token vp9_intra_mode_encodings[VP9_INTRA_MODES]; -extern struct vp9_token vp9_inter_mode_encodings[VP9_INTER_MODES]; +extern struct vp9_token vp9_intra_mode_encodings[INTRA_MODES]; +extern struct vp9_token vp9_inter_mode_encodings[INTER_MODES]; // probability models for partition information extern const vp9_tree_index vp9_partition_tree[]; extern struct vp9_token vp9_partition_encodings[PARTITION_TYPES]; extern const vp9_tree_index vp9_switchable_interp_tree - [2 * (VP9_SWITCHABLE_FILTERS - 1)]; + [2 * (SWITCHABLE_FILTERS - 1)]; -extern struct vp9_token vp9_switchable_interp_encodings[VP9_SWITCHABLE_FILTERS]; +extern struct vp9_token vp9_switchable_interp_encodings[SWITCHABLE_FILTERS]; void vp9_entropy_mode_init(); |