ref: fd9df44a054260aef0aaf3d8acda61d35e3b001b
parent: 3c021e1d79704d270c0b42d018166b119964fcff
parent: 451ab0c01ea5c26132502bcba3530b8cf5dd6d8c
author: James Berry <jamesberry@google.com>
date: Wed Mar 21 08:37:17 EDT 2012
Merge "remove __inline for compiler compatibility"
--- a/vp8/common/loopfilter_filters.c
+++ b/vp8/common/loopfilter_filters.c
@@ -15,7 +15,7 @@
typedef unsigned char uc;
-static __inline signed char vp8_signed_char_clamp(int t)
+static signed char vp8_signed_char_clamp(int t)
{t = (t < -128 ? -128 : t);
t = (t > 127 ? 127 : t);
@@ -24,9 +24,9 @@
/* should we apply any filter at all ( 11111111 yes, 00000000 no) */
-static __inline signed char vp8_filter_mask(uc limit, uc blimit,
- uc p3, uc p2, uc p1, uc p0,
- uc q0, uc q1, uc q2, uc q3)
+static signed char vp8_filter_mask(uc limit, uc blimit,
+ uc p3, uc p2, uc p1, uc p0,
+ uc q0, uc q1, uc q2, uc q3)
{signed char mask = 0;
mask |= (abs(p3 - p2) > limit);
@@ -40,7 +40,7 @@
}
/* is there high variance internal edge ( 11111111 yes, 00000000 no) */
-static __inline signed char vp8_hevmask(uc thresh, uc p1, uc p0, uc q0, uc q1)
+static signed char vp8_hevmask(uc thresh, uc p1, uc p0, uc q0, uc q1)
{signed char hev = 0;
hev |= (abs(p1 - p0) > thresh) * -1;
@@ -48,7 +48,7 @@
return hev;
}
-static __inline void vp8_filter(signed char mask, uc hev, uc *op1,
+static void vp8_filter(signed char mask, uc hev, uc *op1,
uc *op0, uc *oq0, uc *oq1)
{@@ -158,7 +158,7 @@
while (++i < count * 8);
}
-static __inline void vp8_mbfilter(signed char mask, uc hev,
+static void vp8_mbfilter(signed char mask, uc hev,
uc *op2, uc *op1, uc *op0, uc *oq0, uc *oq1, uc *oq2)
{signed char s, u;
@@ -279,7 +279,7 @@
}
/* should we apply any filter at all ( 11111111 yes, 00000000 no) */
-static __inline signed char vp8_simple_filter_mask(uc blimit, uc p1, uc p0, uc q0, uc q1)
+static signed char vp8_simple_filter_mask(uc blimit, uc p1, uc p0, uc q0, uc q1)
{/* Why does this cause problems for win32?
* error C2143: syntax error : missing ';' before 'type'
@@ -289,7 +289,7 @@
return mask;
}
-static __inline void vp8_simple_filter(signed char mask, uc *op1, uc *op0, uc *oq0, uc *oq1)
+static void vp8_simple_filter(signed char mask, uc *op1, uc *op0, uc *oq0, uc *oq1)
{signed char vp8_filter, Filter1, Filter2;
signed char p1 = (signed char) * op1 ^ 0x80;
--- a/vp8/common/onyx.h
+++ b/vp8/common/onyx.h
@@ -72,7 +72,7 @@
#include <assert.h>
- static __inline void Scale2Ratio(int mode, int *hr, int *hs)
+ static void Scale2Ratio(int mode, int *hr, int *hs)
{switch (mode)
{--- a/vp8/common/sad_c.c
+++ b/vp8/common/sad_c.c
@@ -13,7 +13,7 @@
#include "vpx_config.h"
#include "vpx/vpx_integer.h"
-static __inline
+static
unsigned int sad_mx_n_c(
const unsigned char *src_ptr,
int src_stride,
--- a/vp8/encoder/denoising.c
+++ b/vp8/encoder/denoising.c
@@ -21,7 +21,7 @@
const unsigned int SSE_DIFF_THRESHOLD = 16*16*20;
const unsigned int SSE_THRESHOLD = 16*16*40;
-static __inline uint8_t blend(uint8_t state, uint8_t sample, uint8_t factor_q8)
+static uint8_t blend(uint8_t state, uint8_t sample, uint8_t factor_q8)
{return (uint8_t)(
(((uint16_t)factor_q8 * ((uint16_t)state) + // Q8
--- a/vp8/encoder/encodemv.c
+++ b/vp8/encoder/encodemv.c
@@ -186,7 +186,7 @@
#define MV_PROB_UPDATE_CORRECTION -1
-__inline static void calc_prob(vp8_prob *p, const unsigned int ct[2])
+static void calc_prob(vp8_prob *p, const unsigned int ct[2])
{const unsigned int tot = ct[0] + ct[1];
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -1349,7 +1349,7 @@
}
}
-static __inline
+static
void vp8_cal_step_param(int sr, int *sp)
{int step = 0;
--- a/vp8/encoder/tokenize.c
+++ b/vp8/encoder/tokenize.c
@@ -482,7 +482,7 @@
}
-static __inline void stuff2nd_order_b
+static void stuff2nd_order_b
(
TOKENEXTRA **tp,
ENTROPY_CONTEXT *a,
@@ -506,7 +506,7 @@
}
-static __inline void stuff1st_order_b
+static void stuff1st_order_b
(
TOKENEXTRA **tp,
ENTROPY_CONTEXT *a,
@@ -530,7 +530,7 @@
*a = *l = pt;
}
-static __inline
+static
void stuff1st_order_buv
(
TOKENEXTRA **tp,
--- a/vp8/encoder/treewriter.h
+++ b/vp8/encoder/treewriter.h
@@ -42,7 +42,7 @@
/* Both of these return bits, not scaled bits. */
-static __inline unsigned int vp8_cost_branch(const unsigned int ct[2], vp8_prob p)
+static unsigned int vp8_cost_branch(const unsigned int ct[2], vp8_prob p)
{/* Imitate existing calculation */
@@ -53,7 +53,7 @@
/* Small functions to write explicit values and tokens, as well as
estimate their lengths. */
-static __inline void vp8_treed_write
+static void vp8_treed_write
(
vp8_writer *const w,
vp8_tree t,
@@ -72,7 +72,7 @@
}
while (n);
}
-static __inline void vp8_write_token
+static void vp8_write_token
(
vp8_writer *const w,
vp8_tree t,
@@ -83,7 +83,7 @@
vp8_treed_write(w, t, p, x->value, x->Len);
}
-static __inline int vp8_treed_cost(
+static int vp8_treed_cost(
vp8_tree t,
const vp8_prob *const p,
int v,
@@ -103,7 +103,7 @@
return c;
}
-static __inline int vp8_cost_token
+static int vp8_cost_token
(
vp8_tree t,
const vp8_prob *const p,
--
⑨