diff options
| author | James Zern <jzern@google.com> | 2016-09-28 23:36:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-28 23:36:23 +0000 |
| commit | e094e151de32659fae15b3567e5dead4a5ba310d (patch) | |
| tree | 43d14ca21831b7882310ff54473854c798f7f080 | |
| parent | bb27be0dfe94dc5cb0e638cc4c0cf8900bf518dd (diff) | |
| parent | 32c375447c037526f32ea0e8bc50c8c783fa14ce (diff) | |
| download | libvpx-e094e151de32659fae15b3567e5dead4a5ba310d.tar libvpx-e094e151de32659fae15b3567e5dead4a5ba310d.tar.gz libvpx-e094e151de32659fae15b3567e5dead4a5ba310d.tar.bz2 libvpx-e094e151de32659fae15b3567e5dead4a5ba310d.zip | |
Merge "vp9: fix compilation for g++ 6.2.x"
| -rw-r--r-- | vp9/common/vp9_entropymv.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h index a8cc7e93a..e2fe37a32 100644 --- a/vp9/common/vp9_entropymv.h +++ b/vp9/common/vp9_entropymv.h @@ -27,12 +27,9 @@ void vp9_init_mv_probs(struct VP9Common *cm); void vp9_adapt_mv_probs(struct VP9Common *cm, int usehp); -// Integer pel reference mv threshold for use of high-precision 1/8 mv -#define COMPANDED_MVREF_THRESH 8 - static INLINE int use_mv_hp(const MV *ref) { - return (abs(ref->row) >> 3) < COMPANDED_MVREF_THRESH && - (abs(ref->col) >> 3) < COMPANDED_MVREF_THRESH; + const int kMvRefThresh = 64; // threshold for use of high-precision 1/8 mv + return abs(ref->row) < kMvRefThresh && abs(ref->col) < kMvRefThresh; } #define MV_UPDATE_PROB 252 |