generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Cleaning up vp9_get_pred_context_switchable_interp() functuion."

Browse Source
This commit is contained in:
Dmitry Kovalev
2013-12-09 17:34:30 -08:00
committed by Gerrit Code Review
parent af7b7ffb4e 9edd4d4db7
commit d2dad31e79
2 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
vp9/common/vp9_pred_common.c
View File

@@ -25,37 +25,26 @@ static INLINE const MB_MODE_INFO *get_left_mbmi(const MODE_INFO *const left) {
} }
// Returns a context number for the given MB prediction signal // Returns a context number for the given MB prediction signal
unsigned char vp9_get_pred_context_switchable_interp(const MACROBLOCKD *xd) { int vp9_get_pred_context_switchable_interp(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_in_image = above_mi != NULL;
const int left_in_image = left_mi != NULL;
// Note: // Note:
// The mode info data structure has a one element border above and to the // The mode info data structure has a one element border above and to the
// left of the entries correpsonding to real macroblocks. // left of the entries correpsonding to real macroblocks.
// The prediction flags in these dummy entries are initialised to 0. // The prediction flags in these dummy entries are initialised to 0.
// left const MODE_INFO *const left_mi = get_left_mi(xd);
const int left_mv_pred = left_in_image ? is_inter_block(&left_mi->mbmi) const int has_left = left_mi != NULL ? is_inter_block(&left_mi->mbmi) : 0;
: 0; const int left_type = has_left ? left_mi->mbmi.interp_filter
const int left_interp = left_in_image && left_mv_pred
? left_mi->mbmi.interp_filter
: SWITCHABLE_FILTERS; : SWITCHABLE_FILTERS;
// above const MODE_INFO *const above_mi = get_above_mi(xd);
const int above_mv_pred = above_in_image ? is_inter_block(&above_mi->mbmi) const int has_above = above_mi != NULL ? is_inter_block(&above_mi->mbmi) : 0;
: 0; const int above_type = has_above ? above_mi->mbmi.interp_filter
const int above_interp = above_in_image && above_mv_pred
? above_mi->mbmi.interp_filter
: SWITCHABLE_FILTERS; : SWITCHABLE_FILTERS;
if (left_type == above_type)
if (left_interp == above_interp) return left_type;
return left_interp; else if (left_type == SWITCHABLE_FILTERS && above_type != SWITCHABLE_FILTERS)
else if (left_interp == SWITCHABLE_FILTERS && return above_type;
above_interp != SWITCHABLE_FILTERS) else if (left_type != SWITCHABLE_FILTERS && above_type == SWITCHABLE_FILTERS)
return above_interp; return left_type;
else if (left_interp != SWITCHABLE_FILTERS &&
above_interp == SWITCHABLE_FILTERS)
return left_interp;
else else
return SWITCHABLE_FILTERS; return SWITCHABLE_FILTERS;
} }

2
vp9/common/vp9_pred_common.h
View File

@@ -59,7 +59,7 @@ static INLINE unsigned char vp9_get_pred_flag_mbskip(const MACROBLOCKD *xd) {
return xd->mi_8x8[0]->mbmi.skip_coeff; return xd->mi_8x8[0]->mbmi.skip_coeff;
} }
unsigned char vp9_get_pred_context_switchable_interp(const MACROBLOCKD *xd); int vp9_get_pred_context_switchable_interp(const MACROBLOCKD *xd);
int vp9_get_intra_inter_context(const MACROBLOCKD *xd); int vp9_get_intra_inter_context(const MACROBLOCKD *xd);