diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-11-25 10:59:24 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-25 10:59:24 -0800 |
| commit | cfc1f91c9f1dc09b4dc2612473954ae709efaff4 (patch) | |
| tree | 2b944f60fa7d5726631536e09c035d10ddd44df9 | |
| parent | e8af3db88a96ef501fed41de361c8d49ff37748b (diff) | |
| parent | 4896d5c7efa5a59ed425408796ca7ef64c335a9f (diff) | |
| download | libvpx-cfc1f91c9f1dc09b4dc2612473954ae709efaff4.tar libvpx-cfc1f91c9f1dc09b4dc2612473954ae709efaff4.tar.gz libvpx-cfc1f91c9f1dc09b4dc2612473954ae709efaff4.tar.bz2 libvpx-cfc1f91c9f1dc09b4dc2612473954ae709efaff4.zip | |
Merge "Moving {left, right}_block_mode to vp9_blockd.h."
| -rw-r--r-- | vp9/common/vp9_blockd.h | 28 | ||||
| -rw-r--r-- | vp9/common/vp9_findnearmv.h | 28 |
2 files changed, 28 insertions, 28 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index df963d1cc..37da92bd3 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -153,6 +153,34 @@ static INLINE int has_second_ref(const MB_MODE_INFO *mbmi) { return mbmi->ref_frame[1] > INTRA_FRAME; } +static MB_PREDICTION_MODE left_block_mode(const MODE_INFO *cur_mi, + const MODE_INFO *left_mi, int b) { + if (b == 0 || b == 2) { + if (!left_mi || is_inter_block(&left_mi->mbmi)) + return DC_PRED; + + return left_mi->mbmi.sb_type < BLOCK_8X8 ? left_mi->bmi[b + 1].as_mode + : left_mi->mbmi.mode; + } else { + assert(b == 1 || b == 3); + return cur_mi->bmi[b - 1].as_mode; + } +} + +static MB_PREDICTION_MODE above_block_mode(const MODE_INFO *cur_mi, + const MODE_INFO *above_mi, int b) { + if (b == 0 || b == 1) { + if (!above_mi || is_inter_block(&above_mi->mbmi)) + return DC_PRED; + + return above_mi->mbmi.sb_type < BLOCK_8X8 ? above_mi->bmi[b + 2].as_mode + : above_mi->mbmi.mode; + } else { + assert(b == 2 || b == 3); + return cur_mi->bmi[b - 2].as_mode; + } +} + enum mv_precision { MV_PRECISION_Q3, MV_PRECISION_Q4 diff --git a/vp9/common/vp9_findnearmv.h b/vp9/common/vp9_findnearmv.h index 2362caa41..e9d4e1171 100644 --- a/vp9/common/vp9_findnearmv.h +++ b/vp9/common/vp9_findnearmv.h @@ -41,32 +41,4 @@ void vp9_append_sub8x8_mvs_for_idx(VP9_COMMON *cm, MACROBLOCKD *xd, int block_idx, int ref_idx, int mi_row, int mi_col); -static MB_PREDICTION_MODE left_block_mode(const MODE_INFO *cur_mi, - const MODE_INFO *left_mi, int b) { - if (b == 0 || b == 2) { - if (!left_mi || is_inter_block(&left_mi->mbmi)) - return DC_PRED; - - return left_mi->mbmi.sb_type < BLOCK_8X8 ? left_mi->bmi[b + 1].as_mode - : left_mi->mbmi.mode; - } else { - assert(b == 1 || b == 3); - return cur_mi->bmi[b - 1].as_mode; - } -} - -static MB_PREDICTION_MODE above_block_mode(const MODE_INFO *cur_mi, - const MODE_INFO *above_mi, int b) { - if (b == 0 || b == 1) { - if (!above_mi || is_inter_block(&above_mi->mbmi)) - return DC_PRED; - - return above_mi->mbmi.sb_type < BLOCK_8X8 ? above_mi->bmi[b + 2].as_mode - : above_mi->mbmi.mode; - } else { - assert(b == 2 || b == 3); - return cur_mi->bmi[b - 2].as_mode; - } -} - #endif // VP9_COMMON_VP9_FINDNEARMV_H_ |