diff options
| author | Deb Mukherjee <debargha@google.com> | 2013-06-07 13:24:14 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2013-06-07 16:00:26 -0700 |
| commit | 869a39ba60379b031573ed5ba1911088d353a3c1 (patch) | |
| tree | ab869bec48a2de08ce0efc2ed8b37c8d1f2af48b /vp9/common/vp9_onyxc_int.h | |
| parent | 36f02bf3c15691e426b0a8e80d1fa0f2ae5afbb2 (diff) | |
| download | libvpx-869a39ba60379b031573ed5ba1911088d353a3c1.tar libvpx-869a39ba60379b031573ed5ba1911088d353a3c1.tar.gz libvpx-869a39ba60379b031573ed5ba1911088d353a3c1.tar.bz2 libvpx-869a39ba60379b031573ed5ba1911088d353a3c1.zip | |
Cleans up mbskip encoding
Refactors mbskip coding to be compatible with coding of the rest of
the symbols. Adds forward/backward adaptation and removes a lot of
the legacy code.
Results:
fast50: +1.6%
derfraw300: +0.317%
Change-Id: I395a2976d15af044d3b8ded5acfa45f6f065f980
Diffstat (limited to 'vp9/common/vp9_onyxc_int.h')
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index dedda2069..4cb60f196 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -94,6 +94,10 @@ typedef struct frame_contexts { unsigned int tx_count_32x32p[TX_SIZE_MAX_SB]; unsigned int tx_count_16x16p[TX_SIZE_MAX_SB - 1]; unsigned int tx_count_8x8p[TX_SIZE_MAX_SB - 2]; + + vp9_prob mbskip_probs[MBSKIP_CONTEXTS]; + vp9_prob pre_mbskip_probs[MBSKIP_CONTEXTS]; + unsigned int mbskip_count[MBSKIP_CONTEXTS][2]; } FRAME_CONTEXT; typedef enum { @@ -244,8 +248,6 @@ typedef struct VP9Common { MV_REFERENCE_FRAME comp_var_ref[2]; COMPPREDMODE_TYPE comp_pred_mode; - vp9_prob mbskip_pred_probs[MBSKIP_CONTEXTS]; - FRAME_CONTEXT fc; /* this frame entropy */ FRAME_CONTEXT frame_contexts[NUM_FRAME_CONTEXTS]; unsigned int frame_context_idx; /* Context to use/update */ |