diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-08-02 16:25:33 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-08-02 16:25:33 -0700 |
| commit | 680ec32d18b4e879cb092e3ace7818b85ee005c2 (patch) | |
| tree | 59d9782c1d05a20739cea0e48b9fc4339494478f /vp9/common/vp9_findnearmv.h | |
| parent | d4e020c4b1fc92b6babbde44bbe14bb4d9d1515c (diff) | |
| download | libvpx-680ec32d18b4e879cb092e3ace7818b85ee005c2.tar libvpx-680ec32d18b4e879cb092e3ace7818b85ee005c2.tar.gz libvpx-680ec32d18b4e879cb092e3ace7818b85ee005c2.tar.bz2 libvpx-680ec32d18b4e879cb092e3ace7818b85ee005c2.zip | |
Adding is_inter_block function.
Using it instead of long unclear verbose check
"mbmi->ref_frame[0] != INTRA_FRAME".
Change-Id: I9c7b4b3797942fa962bf3ba7460fff3084beabe9
Diffstat (limited to 'vp9/common/vp9_findnearmv.h')
| -rw-r--r-- | vp9/common/vp9_findnearmv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/common/vp9_findnearmv.h b/vp9/common/vp9_findnearmv.h index c1f82cc86..e5221ed67 100644 --- a/vp9/common/vp9_findnearmv.h +++ b/vp9/common/vp9_findnearmv.h @@ -50,7 +50,7 @@ static MB_PREDICTION_MODE left_block_mode(const MODE_INFO *cur_mb, int b) { /* On L edge, get from MB to left of us */ --cur_mb; - if (cur_mb->mbmi.ref_frame[0] != INTRA_FRAME) { + if (is_inter_block(&cur_mb->mbmi)) { return DC_PRED; } else if (cur_mb->mbmi.sb_type < BLOCK_SIZE_SB8X8) { return ((cur_mb->bmi + 1 + b)->as_mode); @@ -68,7 +68,7 @@ static MB_PREDICTION_MODE above_block_mode(const MODE_INFO *cur_mb, /* On top edge, get from MB above us */ cur_mb -= mi_stride; - if (cur_mb->mbmi.ref_frame[0] != INTRA_FRAME) { + if (is_inter_block(&cur_mb->mbmi)) { return DC_PRED; } else if (cur_mb->mbmi.sb_type < BLOCK_SIZE_SB8X8) { return ((cur_mb->bmi + 2 + b)->as_mode); |