Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
fd9df44a
Commit
fd9df44a
authored
Mar 21, 2012
by
James Berry
Committed by
Gerrit Code Review
Mar 21, 2012
Browse files
Options
Browse Files
Download
Plain Diff
Merge "remove __inline for compiler compatibility"
parents
3c021e1d
451ab0c0
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
22 additions
and
22 deletions
+22
-22
vp8/common/loopfilter_filters.c
vp8/common/loopfilter_filters.c
+9
-9
vp8/common/onyx.h
vp8/common/onyx.h
+1
-1
vp8/common/sad_c.c
vp8/common/sad_c.c
+1
-1
vp8/encoder/denoising.c
vp8/encoder/denoising.c
+1
-1
vp8/encoder/encodemv.c
vp8/encoder/encodemv.c
+1
-1
vp8/encoder/rdopt.c
vp8/encoder/rdopt.c
+1
-1
vp8/encoder/tokenize.c
vp8/encoder/tokenize.c
+3
-3
vp8/encoder/treewriter.h
vp8/encoder/treewriter.h
+5
-5
No files found.
vp8/common/loopfilter_filters.c
View file @
fd9df44a
...
...
@@ -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 @@ static __inline signed char vp8_signed_char_clamp(int t)
/* 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 @@ static __inline signed char vp8_filter_mask(uc limit, uc blimit,
}
/* 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 @@ static __inline signed char vp8_hevmask(uc thresh, uc p1, uc p0, uc q0, uc q1)
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 @@ void vp8_loop_filter_vertical_edge_c
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 @@ void vp8_mbloop_filter_vertical_edge_c
}
/* 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 @@ static __inline signed char vp8_simple_filter_mask(uc blimit, uc p1, uc p0, uc q
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
;
...
...
vp8/common/onyx.h
View file @
fd9df44a
...
...
@@ -72,7 +72,7 @@ extern "C"
#include <assert.h>
static
__inline
void
Scale2Ratio
(
int
mode
,
int
*
hr
,
int
*
hs
)
static
void
Scale2Ratio
(
int
mode
,
int
*
hr
,
int
*
hs
)
{
switch
(
mode
)
{
...
...
vp8/common/sad_c.c
View file @
fd9df44a
...
...
@@ -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
,
...
...
vp8/encoder/denoising.c
View file @
fd9df44a
...
...
@@ -21,7 +21,7 @@ const unsigned int NOISE_DIFF2_THRESHOLD = 75;
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
...
...
vp8/encoder/encodemv.c
View file @
fd9df44a
...
...
@@ -186,7 +186,7 @@ void vp8_build_component_cost_table(int *mvcost[2], const MV_CONTEXT *mvc, int m
#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
];
...
...
vp8/encoder/rdopt.c
View file @
fd9df44a
...
...
@@ -1349,7 +1349,7 @@ static void rd_check_segment(VP8_COMP *cpi, MACROBLOCK *x,
}
}
static
__inline
static
void
vp8_cal_step_param
(
int
sr
,
int
*
sp
)
{
int
step
=
0
;
...
...
vp8/encoder/tokenize.c
View file @
fd9df44a
...
...
@@ -482,7 +482,7 @@ void vp8_tokenize_initialize()
}
static
__inline
void
stuff2nd_order_b
static
void
stuff2nd_order_b
(
TOKENEXTRA
**
tp
,
ENTROPY_CONTEXT
*
a
,
...
...
@@ -506,7 +506,7 @@ static __inline void stuff2nd_order_b
}
static
__inline
void
stuff1st_order_b
static
void
stuff1st_order_b
(
TOKENEXTRA
**
tp
,
ENTROPY_CONTEXT
*
a
,
...
...
@@ -530,7 +530,7 @@ static __inline void stuff1st_order_b
*
a
=
*
l
=
pt
;
}
static
__inline
static
void
stuff1st_order_buv
(
TOKENEXTRA
**
tp
,
...
...
vp8/encoder/treewriter.h
View file @
fd9df44a
...
...
@@ -42,7 +42,7 @@ typedef BOOL_CODER vp8_writer;
/* 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 @@ static __inline unsigned int vp8_cost_branch(const unsigned int ct[2], vp8_prob
/* 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 @@ static __inline void vp8_treed_write
}
while
(
n
);
}
static
__inline
void
vp8_write_token
static
void
vp8_write_token
(
vp8_writer
*
const
w
,
vp8_tree
t
,
...
...
@@ -83,7 +83,7 @@ static __inline void vp8_write_token
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 @@ static __inline int vp8_treed_cost(
return
c
;
}
static
__inline
int
vp8_cost_token
static
int
vp8_cost_token
(
vp8_tree
t
,
const
vp8_prob
*
const
p
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment