diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-04-30 16:13:20 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-04-30 16:13:20 -0700 |
| commit | d068d869b93e2139a53d3d3037c009a1aa22e3d4 (patch) | |
| tree | f51938560cbbac5056d43acabfd259f8524a5c04 /vp9/common/vp9_onyxc_int.h | |
| parent | ad6890316c4fe742b047fd3d167cc591e01f5ec1 (diff) | |
| download | libvpx-d068d869b93e2139a53d3d3037c009a1aa22e3d4.tar libvpx-d068d869b93e2139a53d3d3037c009a1aa22e3d4.tar.gz libvpx-d068d869b93e2139a53d3d3037c009a1aa22e3d4.tar.bz2 libvpx-d068d869b93e2139a53d3d3037c009a1aa22e3d4.zip | |
sb8x8 integration in rd loop.
Work-in-progress, not yet ready for review. TODO items:
- bitstream writing (encoder) and reading (decoder)
- decoder reconstruction
Change-Id: I5afb7284e7e0480847b47cd0097cb469433c9081
Diffstat (limited to 'vp9/common/vp9_onyxc_int.h')
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index cbead80f8..96ceca26a 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -65,9 +65,13 @@ typedef struct frame_contexts { vp9_prob ymode_prob[VP9_YMODES - 1]; /* interframe intra mode probs */ vp9_prob sb_ymode_prob[VP9_I32X32_MODES - 1]; vp9_prob uv_mode_prob[VP9_YMODES][VP9_UV_MODES - 1]; +#if !CONFIG_SB8X8 vp9_prob i8x8_mode_prob[VP9_I8X8_MODES - 1]; +#endif vp9_prob sub_mv_ref_prob[SUBMVREF_COUNT][VP9_SUBMVREFS - 1]; +#if !CONFIG_SB8X8 vp9_prob mbsplit_prob[VP9_NUMMBSPLITS - 1]; +#endif vp9_prob partition_prob[NUM_PARTITION_CONTEXTS][PARTITION_TYPES - 1]; vp9_coeff_probs coef_probs_4x4[BLOCK_TYPES]; @@ -87,17 +91,25 @@ typedef struct frame_contexts { vp9_prob pre_ymode_prob[VP9_YMODES - 1]; /* interframe intra mode probs */ vp9_prob pre_sb_ymode_prob[VP9_I32X32_MODES - 1]; vp9_prob pre_uv_mode_prob[VP9_YMODES][VP9_UV_MODES - 1]; +#if !CONFIG_SB8X8 vp9_prob pre_i8x8_mode_prob[VP9_I8X8_MODES - 1]; +#endif vp9_prob pre_sub_mv_ref_prob[SUBMVREF_COUNT][VP9_SUBMVREFS - 1]; +#if !CONFIG_SB8X8 vp9_prob pre_mbsplit_prob[VP9_NUMMBSPLITS - 1]; +#endif vp9_prob pre_partition_prob[NUM_PARTITION_CONTEXTS][PARTITION_TYPES - 1]; unsigned int bmode_counts[VP9_NKF_BINTRAMODES]; unsigned int ymode_counts[VP9_YMODES]; /* interframe intra mode probs */ unsigned int sb_ymode_counts[VP9_I32X32_MODES]; unsigned int uv_mode_counts[VP9_YMODES][VP9_UV_MODES]; +#if !CONFIG_SB8X8 unsigned int i8x8_mode_counts[VP9_I8X8_MODES]; /* interframe intra probs */ +#endif unsigned int sub_mv_ref_counts[SUBMVREF_COUNT][VP9_SUBMVREFS]; +#if !CONFIG_SB8X8 unsigned int mbsplit_counts[VP9_NUMMBSPLITS]; +#endif unsigned int partition_counts[NUM_PARTITION_CONTEXTS][PARTITION_TYPES]; vp9_coeff_probs pre_coef_probs_4x4[BLOCK_TYPES]; |