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

Merge "Added intra mode probabilites into coding_context" into experimental

Browse Source
This commit is contained in:
Yaowu Xu 2012-04-17 18:37:23 +00:00 committed by On2 (Google) Code Review
commit bd49603be4
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vp8/encoder/onyx_int.h
View File

@ -90,6 +90,13 @@ typedef struct
vp8_prob coef_probs_8x8[BLOCK_TYPES]
[COEF_BANDS][PREV_COEF_CONTEXTS][ENTROPY_NODES];
vp8_prob ymode_prob [VP8_YMODES-1]; /* interframe intra mode probs */
#if CONFIG_UVINTRA
vp8_prob uv_mode_prob [VP8_YMODES][VP8_UV_MODES-1];
#else
vp8_prob uv_mode_prob [VP8_UV_MODES-1];
#endif
int mv_ref_ct[6][4][2];
int mode_context[6][4];
int mv_ref_ct_a[6][4][2];

6
vp8/encoder/ratectrl.c
View File

@ -155,6 +155,9 @@ void vp8_save_coding_context(VP8_COMP *cpi)
vp8_copy( cc->mv_ref_ct_a, cm->mv_ref_ct_a );
vp8_copy( cc->mode_context_a, cm->mode_context_a );
vp8_copy( cc->ymode_prob, cm->fc.ymode_prob );
vp8_copy( cc->uv_mode_prob, cm->fc.uv_mode_prob );
// Stats
#ifdef MODE_STATS
vp8_copy(cc->y_modes, y_modes);
@ -201,6 +204,9 @@ void vp8_restore_coding_context(VP8_COMP *cpi)
vp8_copy( cm->mv_ref_ct_a, cc->mv_ref_ct_a );
vp8_copy( cm->mode_context_a, cc->mode_context_a );
vp8_copy( cm->fc.ymode_prob, cc->ymode_prob);
vp8_copy( cm->fc.uv_mode_prob, cc->uv_mode_prob);
// Stats
#ifdef MODE_STATS
vp8_copy(y_modes, cc->y_modes);