diff options
author | Scott LaVarnway <slavarnway@google.com> | 2013-09-11 13:45:44 -0400 |
---|---|---|
committer | Scott LaVarnway <slavarnway@google.com> | 2013-09-11 13:45:44 -0400 |
commit | ac6093d179d8488f90bf10c6d0abcc48be327d28 (patch) | |
tree | b5be18157350f2fe68238ab4c093aec74e6107f9 /vp9/common/vp9_pred_common.h | |
parent | 0607abc3dd26e6782ad9577765f9aeef311b0de9 (diff) | |
download | libvpx-ac6093d179d8488f90bf10c6d0abcc48be327d28.tar libvpx-ac6093d179d8488f90bf10c6d0abcc48be327d28.tar.gz libvpx-ac6093d179d8488f90bf10c6d0abcc48be327d28.tar.bz2 libvpx-ac6093d179d8488f90bf10c6d0abcc48be327d28.zip |
New mode_info_context storage -- undo revert
mode_info_context was stored as a grid of MODE_INFO structs.
The grid now constists of pointers to MODE_INFO structs. The
MODE_INFO structs are now stored as a stream (decoder only),
eliminating unnecessary copies and is a little more cache
friendly.
Change-Id: I031d376284c6eb98a38ad5595b797f048a6cfc0d
Diffstat (limited to 'vp9/common/vp9_pred_common.h')
-rw-r--r-- | vp9/common/vp9_pred_common.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/vp9/common/vp9_pred_common.h b/vp9/common/vp9_pred_common.h index 89e1356d7..47ca8abd8 100644 --- a/vp9/common/vp9_pred_common.h +++ b/vp9/common/vp9_pred_common.h @@ -19,12 +19,12 @@ int vp9_get_segment_id(VP9_COMMON *cm, const uint8_t *segment_ids, static INLINE int vp9_get_pred_context_seg_id(const MACROBLOCKD *xd) { - const MODE_INFO *const mi = xd->mode_info_context; - const MB_MODE_INFO *const above_mbmi = &mi[-xd->mode_info_stride].mbmi; - const MB_MODE_INFO *const left_mbmi = &mi[-1].mbmi; + const MODE_INFO * const above_mi = xd->mi_8x8[-xd->mode_info_stride]; + const MODE_INFO * const left_mi = xd->mi_8x8[-1]; + const int above_sip = above_mi ? above_mi->mbmi.seg_id_predicted : 0; + const int left_sip = left_mi ? left_mi->mbmi.seg_id_predicted : 0; - return above_mbmi->seg_id_predicted + - (xd->left_available ? left_mbmi->seg_id_predicted : 0); + return above_sip + (xd->left_available ? left_sip : 0); } static INLINE vp9_prob vp9_get_pred_prob_seg_id(struct segmentation *seg, @@ -32,16 +32,15 @@ static INLINE vp9_prob vp9_get_pred_prob_seg_id(struct segmentation *seg, return seg->pred_probs[vp9_get_pred_context_seg_id(xd)]; } -void vp9_set_pred_flag_seg_id(VP9_COMMON *cm, BLOCK_SIZE bsize, - int mi_row, int mi_col, uint8_t pred_flag); +void vp9_set_pred_flag_seg_id(MACROBLOCKD *xd, uint8_t pred_flag); static INLINE int vp9_get_pred_context_mbskip(const MACROBLOCKD *xd) { - const MODE_INFO *const mi = xd->mode_info_context; - const MB_MODE_INFO *const above_mbmi = &mi[-xd->mode_info_stride].mbmi; - const MB_MODE_INFO *const left_mbmi = &mi[-1].mbmi; + const MODE_INFO * const above_mi = xd->mi_8x8[-xd->mode_info_stride]; + const MODE_INFO * const left_mi = xd->mi_8x8[-1]; + const int above_skip_coeff = above_mi ? above_mi->mbmi.skip_coeff : 0; + const int left_skip_coeff = left_mi ? left_mi->mbmi.skip_coeff : 0; - return above_mbmi->skip_coeff + - (xd->left_available ? left_mbmi->skip_coeff : 0); + return above_skip_coeff + (xd->left_available ? left_skip_coeff : 0); } static INLINE vp9_prob vp9_get_pred_prob_mbskip(const VP9_COMMON *cm, @@ -50,11 +49,11 @@ static INLINE vp9_prob vp9_get_pred_prob_mbskip(const VP9_COMMON *cm, } static INLINE unsigned char vp9_get_pred_flag_mbskip(const MACROBLOCKD *xd) { - return xd->mode_info_context->mbmi.skip_coeff; + return xd->this_mi->mbmi.skip_coeff; } -void vp9_set_pred_flag_mbskip(VP9_COMMON *cm, BLOCK_SIZE bsize, - int mi_row, int mi_col, uint8_t pred_flag); +void vp9_set_pred_flag_mbskip(MACROBLOCKD *xd, BLOCK_SIZE bsize, + uint8_t pred_flag); unsigned char vp9_get_pred_context_switchable_interp(const MACROBLOCKD *xd); @@ -114,8 +113,9 @@ static const vp9_prob *get_tx_probs(BLOCK_SIZE bsize, uint8_t context, } static const vp9_prob *get_tx_probs2(const MACROBLOCKD *xd, - const struct tx_probs *tx_probs) { - const BLOCK_SIZE bsize = xd->mode_info_context->mbmi.sb_type; + const struct tx_probs *tx_probs, + const MODE_INFO *m) { + const BLOCK_SIZE bsize = m->mbmi.sb_type; const int context = vp9_get_pred_context_tx_size(xd); return get_tx_probs(bsize, context, tx_probs); } |