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

Replacing macros with inline functions.

Browse Source 
Change-Id: Ibde8fb45594cd259fc3281d7874de8fc877fd4f2
This commit is contained in:
Dmitry Kovalev
2014-01-16 18:00:44 -08:00
parent d2bb0c51d3
commit 67246764a2
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vp9/encoder/vp9_mcomp.c
View File

@@ -174,8 +174,10 @@ void vp9_init3smotion_compensation(MACROBLOCK *x, int stride) {
error_per_bit + 4096) >> 13 : 0) error_per_bit + 4096) >> 13 : 0)
#define SP(x) (((x) & 7) << 1) // convert motion vector component to offset // convert motion vector component to offset for svf calc
// for svf calc static INLINE int sp(int x) {
return (x & 7) << 1;
}
#define IFMVCV(r, c, s, e) \ #define IFMVCV(r, c, s, e) \
if (c >= minc && c <= maxc && r >= minr && r <= maxr) \ if (c >= minc && c <= maxc && r >= minr && r <= maxr) \
@@ -183,12 +185,14 @@ void vp9_init3smotion_compensation(MACROBLOCK *x, int stride) {
else \ else \
e; e;
/* pointer to predictor base of a motionvector */ static INLINE uint8_t *pre(uint8_t *buf, int stride, int r, int c, int offset) {
#define PRE(r, c) (y + (((r) >> 3) * y_stride + ((c) >> 3) -(offset))) return &buf[(r >> 3) * stride + (c >> 3) - offset];
}
/* returns subpixel variance error function */ /* returns subpixel variance error function */
#define DIST(r, c) \ #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 */ /* checks if (r, c) has better score than previous best */
#define CHECK_BETTER(v, r, c) \ #define CHECK_BETTER(v, r, c) \
@@ -358,7 +362,7 @@ int vp9_find_best_sub_pixel_tree(MACROBLOCK *x,
#undef DIST #undef DIST
/* returns subpixel variance error function */ /* returns subpixel variance error function */
#define DIST(r, c) \ #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) z, src_stride, &sse, second_pred)
int vp9_find_best_sub_pixel_comp_tree(MACROBLOCK *x, int vp9_find_best_sub_pixel_comp_tree(MACROBLOCK *x,