diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-12-06 09:14:36 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-12-06 09:14:36 -0800 |
| commit | 5be34ba80feae9fe8df0cfadc4596315af14fbbe (patch) | |
| tree | 4b6a06b558aa1998491bf848e8da3ab56ffaac7f /vp9/common | |
| parent | de2046275ddc99692b34f3176949e667dfccd1ad (diff) | |
| parent | 6fd71e1b09eaa664030a3a3634322f253e6c6d26 (diff) | |
| download | libvpx-5be34ba80feae9fe8df0cfadc4596315af14fbbe.tar libvpx-5be34ba80feae9fe8df0cfadc4596315af14fbbe.tar.gz libvpx-5be34ba80feae9fe8df0cfadc4596315af14fbbe.tar.bz2 libvpx-5be34ba80feae9fe8df0cfadc4596315af14fbbe.zip | |
Merge "vp9_get_pred_context_intra_inter() clean up."
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_pred_common.c | 12 | ||||
| -rw-r--r-- | vp9/common/vp9_pred_common.h | 9 |
2 files changed, 9 insertions, 12 deletions
diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c index a367f0b5d..793117daa 100644 --- a/vp9/common/vp9_pred_common.c +++ b/vp9/common/vp9_pred_common.c @@ -60,13 +60,11 @@ unsigned char vp9_get_pred_context_switchable_interp(const MACROBLOCKD *xd) { return SWITCHABLE_FILTERS; } // Returns a context number for the given MB prediction signal -unsigned char vp9_get_pred_context_intra_inter(const MACROBLOCKD *xd) { - const MODE_INFO *const above_mi = get_above_mi(xd); - const MODE_INFO *const left_mi = get_left_mi(xd); - const MB_MODE_INFO *const above_mbmi = get_above_mbmi(above_mi); - const MB_MODE_INFO *const left_mbmi = get_left_mbmi(left_mi); - const int above_in_image = above_mi != NULL; - const int left_in_image = left_mi != NULL; +int vp9_get_intra_inter_context(const MACROBLOCKD *xd) { + const MB_MODE_INFO *const above_mbmi = get_above_mbmi(get_above_mi(xd)); + const MB_MODE_INFO *const left_mbmi = get_left_mbmi(get_left_mi(xd)); + const int above_in_image = above_mbmi != NULL; + const int left_in_image = left_mbmi != NULL; const int above_intra = above_in_image ? !is_inter_block(above_mbmi) : 1; const int left_intra = left_in_image ? !is_inter_block(left_mbmi) : 1; 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, |