diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-21 10:17:29 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-21 10:17:29 -0800 |
| commit | 575a083bcc74b8768924da0a823637b9b44f7393 (patch) | |
| tree | 220822c7f6c79bf4aebabdf734874ebf885ee82e /vp9/encoder | |
| parent | 16954cb327279be100e815eadb1454dfc85c8a4c (diff) | |
| parent | 67246764a20ec3f598e94ffcaa02f13ed16db85d (diff) | |
| download | libvpx-575a083bcc74b8768924da0a823637b9b44f7393.tar libvpx-575a083bcc74b8768924da0a823637b9b44f7393.tar.gz libvpx-575a083bcc74b8768924da0a823637b9b44f7393.tar.bz2 libvpx-575a083bcc74b8768924da0a823637b9b44f7393.zip | |
Merge "Replacing macros with inline functions."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_mcomp.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index 88d527a22..e81dd0db7 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -174,8 +174,10 @@ void vp9_init3smotion_compensation(MACROBLOCK *x, int stride) { error_per_bit + 4096) >> 13 : 0) -#define SP(x) (((x) & 7) << 1) // convert motion vector component to offset - // for svf calc +// convert motion vector component to offset for svf calc +static INLINE int sp(int x) { + return (x & 7) << 1; +} #define IFMVCV(r, c, s, e) \ if (c >= minc && c <= maxc && r >= minr && r <= maxr) \ @@ -183,12 +185,14 @@ void vp9_init3smotion_compensation(MACROBLOCK *x, int stride) { else \ e; -/* pointer to predictor base of a motionvector */ -#define PRE(r, c) (y + (((r) >> 3) * y_stride + ((c) >> 3) -(offset))) +static INLINE uint8_t *pre(uint8_t *buf, int stride, int r, int c, int offset) { + return &buf[(r >> 3) * stride + (c >> 3) - offset]; +} /* returns subpixel variance error function */ #define DIST(r, c) \ - vfp->svf(PRE(r, c), y_stride, SP(c), SP(r), z, src_stride, &sse) + vfp->svf(pre(y, y_stride, r, c, offset), y_stride, sp(c), sp(r), z, \ + src_stride, &sse) /* checks if (r, c) has better score than previous best */ #define CHECK_BETTER(v, r, c) \ @@ -358,7 +362,7 @@ int vp9_find_best_sub_pixel_tree(MACROBLOCK *x, #undef DIST /* returns subpixel variance error function */ #define DIST(r, c) \ - vfp->svaf(PRE(r, c), y_stride, SP(c), SP(r), \ + vfp->svaf(pre(y, y_stride, r, c, offset), y_stride, sp(c), sp(r), \ z, src_stride, &sse, second_pred) int vp9_find_best_sub_pixel_comp_tree(MACROBLOCK *x, |