diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-05-24 16:13:54 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2013-05-27 13:53:56 -0700 |
| commit | 2b96ffe025673a6943476989a689df938df7523b (patch) | |
| tree | 334209a89251e23774799881257c56ac09095cd3 /vp9/encoder/vp9_onyx_int.h | |
| parent | 95339d68258b8f752e114e6c81e6e19f99cde5a4 (diff) | |
| download | libvpx-2b96ffe025673a6943476989a689df938df7523b.tar libvpx-2b96ffe025673a6943476989a689df938df7523b.tar.gz libvpx-2b96ffe025673a6943476989a689df938df7523b.tar.bz2 libvpx-2b96ffe025673a6943476989a689df938df7523b.zip | |
a few clean-ups
1. remove prediction mode conversion
2. unified bmode, same for key and non-key frame
3. set I4X4_PRED count for pdf to 0, as I4X4_PRED is no longer
coded ever. It is determined by ref_frame and block partition
Change-Id: If5b282957c24339b241acdb9f2afef85658fe47d
Diffstat (limited to 'vp9/encoder/vp9_onyx_int.h')
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index cb0e5daf5..15f9571bb 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -84,7 +84,7 @@ typedef struct { vp9_prob sb_ymode_prob[VP9_I32X32_MODES - 1]; vp9_prob ymode_prob[VP9_YMODES - 1]; /* interframe intra mode probs */ vp9_prob uv_mode_prob[VP9_YMODES][VP9_UV_MODES - 1]; - vp9_prob bmode_prob[VP9_NKF_BINTRAMODES - 1]; + vp9_prob bmode_prob[VP9_BINTRAMODES - 1]; vp9_prob partition_prob[NUM_PARTITION_CONTEXTS][PARTITION_TYPES - 1]; vp9_prob switchable_interp_prob[VP9_SWITCHABLE_FILTERS + 1] @@ -415,7 +415,7 @@ typedef struct VP9_COMP { int sb_ymode_count [VP9_I32X32_MODES]; int ymode_count[VP9_YMODES]; /* intra MB type cts this frame */ - int bmode_count[VP9_NKF_BINTRAMODES]; + int bmode_count[VP9_BINTRAMODES]; int y_uv_mode_count[VP9_YMODES][VP9_UV_MODES]; unsigned int partition_count[NUM_PARTITION_CONTEXTS][PARTITION_TYPES]; |