diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2013-08-01 14:15:53 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-01 14:15:53 -0700 |
commit | 0497b8d7cd3442f93972dfea821431a10a06da6f (patch) | |
tree | 7c53387d63bb42c5c107a60d51a8f46033e4a5b7 /vp9 | |
parent | 56df76bf1b812055eefb1ef9285969ddd41f8940 (diff) | |
parent | fb3e78a73abc28ed7be4a0a757f936c03967c9ef (diff) | |
download | libvpx-0497b8d7cd3442f93972dfea821431a10a06da6f.tar libvpx-0497b8d7cd3442f93972dfea821431a10a06da6f.tar.gz libvpx-0497b8d7cd3442f93972dfea821431a10a06da6f.tar.bz2 libvpx-0497b8d7cd3442f93972dfea821431a10a06da6f.zip |
Merge "vp9_get_pred_context_intra_inter cleanup."
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/common/vp9_pred_common.c | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c index e8bcdea82..9f421e9be 100644 --- a/vp9/common/vp9_pred_common.c +++ b/vp9/common/vp9_pred_common.c @@ -55,34 +55,28 @@ unsigned char vp9_get_pred_context_switchable_interp(const MACROBLOCKD *xd) { } // Returns a context number for the given MB prediction signal unsigned char vp9_get_pred_context_intra_inter(const MACROBLOCKD *xd) { - int pred_context; 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 int left_in_image = xd->left_available && left_mbmi->mb_in_image; const int above_in_image = xd->up_available && above_mbmi->mb_in_image; - // Note: - // The mode info data structure has a one element border above and to the - // left of the entries correpsonding to real macroblocks. - // The prediction flags in these dummy entries are initialised to 0. - if (above_in_image && left_in_image) { // both edges available - if (left_mbmi->ref_frame[0] == INTRA_FRAME && - above_mbmi->ref_frame[0] == INTRA_FRAME) { // intra/intra (3) - pred_context = 3; - } else { // intra/inter (1) or inter/inter (0) - pred_context = left_mbmi->ref_frame[0] == INTRA_FRAME || - above_mbmi->ref_frame[0] == INTRA_FRAME; - } - } else if (above_in_image || left_in_image) { // one edge available - const MB_MODE_INFO *edge_mbmi = above_in_image ? above_mbmi : left_mbmi; + const int left_intra = left_mbmi->ref_frame[0] == INTRA_FRAME; + const int above_intra = above_mbmi->ref_frame[0] == INTRA_FRAME; - // inter: 0, intra: 2 - pred_context = 2 * (edge_mbmi->ref_frame[0] == INTRA_FRAME); - } else { - pred_context = 0; - } - assert(pred_context >= 0 && pred_context < INTRA_INTER_CONTEXTS); - return pred_context; + // The mode info data structure has a one element border above and to the + // left of the entries corresponding to real macroblocks. + // The prediction flags in these dummy entries are initialized to 0. + // 0 - inter/inter, inter/--, --/inter, --/-- + // 1 - intra/inter, inter/intra + // 2 - intra/--, --/intra + // 3 - intra/intra + if (above_in_image && left_in_image) // both edges available + return left_intra && above_intra ? 3 + : left_intra || above_intra; + else if (above_in_image || left_in_image) // one edge available + return 2 * (above_in_image ? above_intra : left_intra); + else + return 0; } // Returns a context number for the given MB prediction signal unsigned char vp9_get_pred_context_comp_inter_inter(const VP9_COMMON *cm, |