diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-12-10 14:11:26 -0800 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-12-10 14:11:26 -0800 |
| commit | 2dd20e468a448e8df0bfc53f2d3cd22ee7b8d518 (patch) | |
| tree | d5ec5a054e4596182a964b82429508922b17e43a /vp9/common | |
| parent | 35b7b0b549b763b849a49e002d12dc7472cfd882 (diff) | |
| download | libvpx-2dd20e468a448e8df0bfc53f2d3cd22ee7b8d518.tar libvpx-2dd20e468a448e8df0bfc53f2d3cd22ee7b8d518.tar.gz libvpx-2dd20e468a448e8df0bfc53f2d3cd22ee7b8d518.tar.bz2 libvpx-2dd20e468a448e8df0bfc53f2d3cd22ee7b8d518.zip | |
Cleaning up skip context calculation.
Renames:
vp9_get_pred_context_mbskip => vp9_get_skip_context
vp9_get_pred_prob_mbskip => vp9_get_skip_prob
Change-Id: I2af499848ef73f3f5cd8cdb27852d0bcdfe31d09
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_pred_common.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/vp9/common/vp9_pred_common.h b/vp9/common/vp9_pred_common.h index 95ac84814..9a8f85c09 100644 --- a/vp9/common/vp9_pred_common.h +++ b/vp9/common/vp9_pred_common.h @@ -40,19 +40,17 @@ static INLINE vp9_prob vp9_get_pred_prob_seg_id(struct segmentation *seg, return seg->pred_probs[vp9_get_pred_context_seg_id(xd)]; } -static INLINE int vp9_get_pred_context_mbskip(const MACROBLOCKD *xd) { +static INLINE int vp9_get_skip_context(const MACROBLOCKD *xd) { const MODE_INFO *const above_mi = get_above_mi(xd); const MODE_INFO *const left_mi = get_left_mi(xd); - const int above_skip_coeff = (above_mi != NULL) ? - above_mi->mbmi.skip_coeff : 0; - const int left_skip_coeff = (left_mi != NULL) ? left_mi->mbmi.skip_coeff : 0; - - return above_skip_coeff + left_skip_coeff; + const int above_skip = (above_mi != NULL) ? above_mi->mbmi.skip_coeff : 0; + const int left_skip = (left_mi != NULL) ? left_mi->mbmi.skip_coeff : 0; + return above_skip + left_skip; } -static INLINE vp9_prob vp9_get_pred_prob_mbskip(const VP9_COMMON *cm, - const MACROBLOCKD *xd) { - return cm->fc.mbskip_probs[vp9_get_pred_context_mbskip(xd)]; +static INLINE vp9_prob vp9_get_skip_prob(const VP9_COMMON *cm, + const MACROBLOCKD *xd) { + return cm->fc.mbskip_probs[vp9_get_skip_context(xd)]; } int vp9_get_pred_context_switchable_interp(const MACROBLOCKD *xd); |