diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-12-05 17:01:03 -0800 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-12-05 17:01:03 -0800 |
| commit | 6fd71e1b09eaa664030a3a3634322f253e6c6d26 (patch) | |
| tree | 3c99e7f72b248f4aaceae5f6a4fc0025cfc483af /vp9/common/vp9_pred_common.h | |
| parent | da519166e9f8a0c9bfa9dbda61195a5fef466476 (diff) | |
| download | libvpx-6fd71e1b09eaa664030a3a3634322f253e6c6d26.tar libvpx-6fd71e1b09eaa664030a3a3634322f253e6c6d26.tar.gz libvpx-6fd71e1b09eaa664030a3a3634322f253e6c6d26.tar.bz2 libvpx-6fd71e1b09eaa664030a3a3634322f253e6c6d26.zip | |
vp9_get_pred_context_intra_inter() clean up.
Renaming:
vp9_get_pred_context_intra_inter => vp9_get_intra_inter_context
vp9_get_pred_prob_intra_inter => vp9_get_intra_inter_prob
Change-Id: I2c1affea2e84f4e616137c6df82adb11c7845781
Diffstat (limited to 'vp9/common/vp9_pred_common.h')
| -rw-r--r-- | vp9/common/vp9_pred_common.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vp9/common/vp9_pred_common.h b/vp9/common/vp9_pred_common.h index b6f18e323..bd0b8d662 100644 --- a/vp9/common/vp9_pred_common.h +++ b/vp9/common/vp9_pred_common.h @@ -61,12 +61,11 @@ static INLINE unsigned char vp9_get_pred_flag_mbskip(const MACROBLOCKD *xd) { unsigned char vp9_get_pred_context_switchable_interp(const MACROBLOCKD *xd); -unsigned char vp9_get_pred_context_intra_inter(const MACROBLOCKD *xd); +int vp9_get_intra_inter_context(const MACROBLOCKD *xd); -static INLINE vp9_prob vp9_get_pred_prob_intra_inter(const VP9_COMMON *cm, - const MACROBLOCKD *xd) { - const int pred_context = vp9_get_pred_context_intra_inter(xd); - return cm->fc.intra_inter_prob[pred_context]; +static INLINE vp9_prob vp9_get_intra_inter_prob(const VP9_COMMON *cm, + const MACROBLOCKD *xd) { + return cm->fc.intra_inter_prob[vp9_get_intra_inter_context(xd)]; } unsigned char vp9_get_pred_context_comp_inter_inter(const VP9_COMMON *cm, |