1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
--- src/modules/motion_est/filter_motion_est.c.orig 2006-06-26 00:29:36.000000000 +0200
+++ src/modules/motion_est/filter_motion_est.c 2006-06-26 00:29:51.000000000 +0200
@@ -160,7 +160,7 @@
/** /brief Reference Sum of Absolute Differences comparison function
*
*/
-inline static int sad_reference( uint8_t *block1, uint8_t *block2, const int xstride, const int ystride, const int w, const int h )
+static int sad_reference( uint8_t *block1, uint8_t *block2, const int xstride, const int ystride, const int w, const int h )
{
int i, j, score = 0;
for ( j = 0; j < h; j++ ){
--- src/modules/motion_est/sad_sse.h.orig 2006-06-26 00:29:43.000000000 +0200
+++ src/modules/motion_est/sad_sse.h 2006-06-26 00:29:57.000000000 +0200
@@ -41,7 +41,7 @@
SAD_SSE_INIT
#define ROW SAD_SSE_SUM_8(0) SAD_SSE_NEXTROW
asm volatile ( ROW ROW ROW ROW
- :: "r" (block1), "r" (block2), "r" (ystride));
+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride)));
SAD_SSE_FINISH(result)
return result;
@@ -55,7 +55,7 @@
SAD_SSE_INIT
#define ROW SAD_SSE_SUM_8(0) SAD_SSE_NEXTROW
asm volatile ( ROW ROW ROW ROW ROW ROW ROW ROW
- :: "r" (block1), "r" (block2), "r" (ystride));
+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride)));
SAD_SSE_FINISH(result)
return result;
@@ -70,7 +70,7 @@
#define ROW SAD_SSE_SUM_8(0) SAD_SSE_SUM_8(8) SAD_SSE_NEXTROW
asm volatile ( ROW ROW ROW ROW ROW ROW ROW ROW
ROW ROW ROW ROW ROW ROW ROW ROW
- :: "r" (block1), "r" (block2), "r" (ystride));
+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride)));
SAD_SSE_FINISH(result)
return result;
@@ -89,7 +89,7 @@
ROW ROW ROW ROW ROW ROW ROW ROW
ROW ROW ROW ROW ROW ROW ROW ROW
ROW ROW ROW ROW ROW ROW ROW ROW
- :: "r" (block1), "r" (block2), "r" (ystride));
+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride)));
SAD_SSE_FINISH(result)
return result;
@@ -219,8 +219,8 @@
static __attribute__((used)) __attribute__((aligned(8))) uint64_t sad_sse_422_mask_chroma = 0x00ff00ff00ff00ffULL;
#define SAD_SSE_422_LUMA_INIT \
- asm volatile ( "movq sad_sse_422_mask_chroma,%%mm7\n\t"\
- "pxor %%mm6,%%mm6\n\t" :: );\
+ asm volatile ( "movq %0,%%mm7\n\t"\
+ "pxor %%mm6,%%mm6\n\t" :: "m" (sad_sse_422_mask_chroma) );\
// Sum two 4x1 pixel blocks
#define SAD_SSE_422_LUMA_SUM_4(OFFSET) \
@@ -231,13 +231,13 @@
"psadbw %%mm1,%%mm0 \n\t"\
"paddw %%mm0,%%mm6 \n\t"\
-inline static int sad_sse_422_luma_4x4( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
+static int sad_sse_422_luma_4x4( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
{
int result;
SAD_SSE_422_LUMA_INIT
#define ROW SAD_SSE_422_LUMA_SUM_4(0) SAD_SSE_NEXTROW
asm volatile ( ROW ROW ROW ROW
- :: "r" (block1), "r" (block2), "r" (ystride));
+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride)));
SAD_SSE_FINISH(result)
return result;
@@ -245,13 +245,13 @@
}
-inline static int sad_sse_422_luma_8x8( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
+static int sad_sse_422_luma_8x8( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
{
int result;
SAD_SSE_422_LUMA_INIT
#define ROW SAD_SSE_422_LUMA_SUM_4(0) SAD_SSE_422_LUMA_SUM_4(8) SAD_SSE_NEXTROW
asm volatile ( ROW ROW ROW ROW ROW ROW ROW ROW
- :: "r" (block1), "r" (block2), "r" (ystride));
+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride)));
SAD_SSE_FINISH(result)
return result;
@@ -259,14 +259,14 @@
}
-inline static int sad_sse_422_luma_16x16( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
+static int sad_sse_422_luma_16x16( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
{
int result;
SAD_SSE_422_LUMA_INIT
#define ROW SAD_SSE_422_LUMA_SUM_4(0) SAD_SSE_422_LUMA_SUM_4(8) SAD_SSE_422_LUMA_SUM_4(16) SAD_SSE_422_LUMA_SUM_4(24) SAD_SSE_NEXTROW
asm volatile ( ROW ROW ROW ROW ROW ROW ROW ROW
ROW ROW ROW ROW ROW ROW ROW ROW
- :: "r" (block1), "r" (block2), "r" (ystride));
+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride)));
SAD_SSE_FINISH(result)
return result;
@@ -274,7 +274,7 @@
}
-inline static int sad_sse_422_luma_32x32( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
+static int sad_sse_422_luma_32x32( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
{
int result;
SAD_SSE_422_LUMA_INIT
@@ -286,7 +286,7 @@
ROW ROW ROW ROW ROW ROW ROW ROW
ROW ROW ROW ROW ROW ROW ROW ROW
ROW ROW ROW ROW ROW ROW ROW ROW
- :: "r" (block1), "r" (block2), "r" (ystride));
+ :: "r" (block1), "r" (block2), "r" ((long int)(ystride)));
SAD_SSE_FINISH(result)
return result;
@@ -294,7 +294,7 @@
}
-inline static int sad_sse_422_luma_4w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
+static int sad_sse_422_luma_4w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
{
int result;
@@ -315,7 +315,7 @@
}
-inline static int sad_sse_422_luma_8w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
+static int sad_sse_422_luma_8w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
{
int result;
@@ -338,7 +338,7 @@
}
-inline static int sad_sse_422_luma_16w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
+static int sad_sse_422_luma_16w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
{
int result;
@@ -363,7 +363,7 @@
}
-inline static int sad_sse_422_luma_32w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
+static int sad_sse_422_luma_32w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
{
int result;
@@ -392,7 +392,7 @@
}
-inline static int sad_sse_422_luma_64w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
+static int sad_sse_422_luma_64w( uint8_t *block1, uint8_t *block2, int xstride, int ystride, int w, int h )
{
int result;
|
GitWeb