generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge VP9_YMODES, VP9_UV_MODES, INTRA_MODE_COUNT and cousins.

Browse Source 
These are now merged in a new define called VP9_INTRA_MODES.

Change-Id: I0890f895756a7395d84c92f98f43e43f4cf9050d
This commit is contained in:
Ronald S. Bultje
2013-05-30 16:21:48 -07:00
parent 4d3d00b195
commit a433abbcad
12 changed files with 61 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vp9/encoder/vp9_onyx_int.h
View File

@@ -81,8 +81,8 @@ typedef struct {
vp9_coeff_probs_model coef_probs_16x16[BLOCK_TYPES];
vp9_coeff_probs_model coef_probs_32x32[BLOCK_TYPES];
vp9_prob y_mode_prob[VP9_YMODES - 1]; /* interframe intra mode probs */
vp9_prob uv_mode_prob[VP9_YMODES][VP9_UV_MODES - 1];
vp9_prob y_mode_prob[VP9_INTRA_MODES - 1]; /* interframe intra mode probs */
vp9_prob uv_mode_prob[VP9_INTRA_MODES][VP9_INTRA_MODES - 1];
vp9_prob partition_prob[NUM_PARTITION_CONTEXTS][PARTITION_TYPES - 1];
vp9_prob switchable_interp_prob[VP9_SWITCHABLE_FILTERS + 1]
@@ -411,8 +411,8 @@ typedef struct VP9_COMP {
int cq_target_quality;
int y_mode_count[VP9_YMODES];
int y_uv_mode_count[VP9_YMODES][VP9_UV_MODES];
int y_mode_count[VP9_INTRA_MODES];
int y_uv_mode_count[VP9_INTRA_MODES][VP9_INTRA_MODES];
unsigned int partition_count[NUM_PARTITION_CONTEXTS][PARTITION_TYPES];
nmv_context_counts NMVcount;