Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
14624333
Commit
14624333
authored
Aug 16, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Aug 16, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Renaming d27 predictor to d207."
parents
d514b778
81d7bd50
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
25 deletions
+25
-25
vp9/common/vp9_entropymode.c
vp9/common/vp9_entropymode.c
+13
-13
vp9/common/vp9_reconintra.c
vp9/common/vp9_reconintra.c
+4
-4
vp9/common/vp9_rtcd_defs.sh
vp9/common/vp9_rtcd_defs.sh
+8
-8
No files found.
vp9/common/vp9_entropymode.c
View file @
14624333
...
...
@@ -23,7 +23,7 @@ const vp9_prob vp9_kf_uv_mode_prob[VP9_INTRA_MODES]
{
113
,
9
,
36
,
155
,
111
,
157
,
32
,
44
,
161
}
/* y = d135 */
,
{
116
,
9
,
55
,
176
,
76
,
96
,
37
,
61
,
149
}
/* y = d117 */
,
{
115
,
9
,
28
,
141
,
161
,
167
,
21
,
25
,
193
}
/* y = d153 */
,
{
120
,
12
,
32
,
145
,
195
,
142
,
32
,
38
,
86
}
/* y = d27 */
,
{
120
,
12
,
32
,
145
,
195
,
142
,
32
,
38
,
86
}
/* y = d2
0
7 */
,
{
116
,
12
,
64
,
120
,
140
,
125
,
49
,
115
,
121
}
/* y = d63 */
,
{
102
,
19
,
66
,
162
,
182
,
122
,
35
,
59
,
128
}
/* y = tm */
};
...
...
@@ -45,7 +45,7 @@ static const vp9_prob default_if_uv_probs[VP9_INTRA_MODES]
{
83
,
5
,
42
,
156
,
111
,
152
,
26
,
49
,
152
}
/* y = d135 */
,
{
80
,
5
,
58
,
178
,
74
,
83
,
33
,
62
,
145
}
/* y = d117 */
,
{
86
,
5
,
32
,
154
,
192
,
168
,
14
,
22
,
163
}
/* y = d153 */
,
{
85
,
5
,
32
,
156
,
216
,
148
,
19
,
29
,
73
}
/* y = d27 */
,
{
85
,
5
,
32
,
156
,
216
,
148
,
19
,
29
,
73
}
/* y = d2
0
7 */
,
{
77
,
7
,
64
,
116
,
132
,
122
,
37
,
126
,
120
}
/* y = d63 */
,
{
101
,
21
,
107
,
181
,
192
,
103
,
19
,
67
,
125
}
/* y = tm */
};
...
...
@@ -109,7 +109,7 @@ const vp9_prob vp9_kf_y_mode_prob[VP9_INTRA_MODES]
{
72
,
35
,
36
,
149
,
68
,
206
,
68
,
63
,
105
}
/* left = d135 */
,
{
73
,
31
,
28
,
138
,
57
,
124
,
55
,
122
,
151
}
/* left = d117 */
,
{
67
,
23
,
21
,
140
,
126
,
197
,
40
,
37
,
171
}
/* left = d153 */
,
{
86
,
27
,
28
,
128
,
154
,
212
,
45
,
43
,
53
}
/* left = d27 */
,
{
86
,
27
,
28
,
128
,
154
,
212
,
45
,
43
,
53
}
/* left = d2
0
7 */
,
{
74
,
32
,
27
,
107
,
86
,
160
,
63
,
134
,
102
}
/* left = d63 */
,
{
59
,
67
,
44
,
140
,
161
,
202
,
78
,
67
,
119
}
/* left = tm */
},
{
/* above = v */
...
...
@@ -120,7 +120,7 @@ const vp9_prob vp9_kf_y_mode_prob[VP9_INTRA_MODES]
{
46
,
41
,
76
,
140
,
63
,
184
,
69
,
112
,
57
}
/* left = d135 */
,
{
38
,
32
,
85
,
140
,
46
,
112
,
54
,
151
,
133
}
/* left = d117 */
,
{
39
,
27
,
61
,
131
,
110
,
175
,
44
,
75
,
136
}
/* left = d153 */
,
{
52
,
30
,
74
,
113
,
130
,
175
,
51
,
64
,
58
}
/* left = d27 */
,
{
52
,
30
,
74
,
113
,
130
,
175
,
51
,
64
,
58
}
/* left = d2
0
7 */
,
{
47
,
35
,
80
,
100
,
74
,
143
,
64
,
163
,
74
}
/* left = d63 */
,
{
36
,
61
,
116
,
114
,
128
,
162
,
80
,
125
,
82
}
/* left = tm */
},
{
/* above = h */
...
...
@@ -131,7 +131,7 @@ const vp9_prob vp9_kf_y_mode_prob[VP9_INTRA_MODES]
{
58
,
50
,
25
,
139
,
115
,
232
,
39
,
52
,
118
}
/* left = d135 */
,
{
50
,
35
,
33
,
153
,
104
,
162
,
64
,
59
,
131
}
/* left = d117 */
,
{
44
,
24
,
16
,
150
,
177
,
202
,
33
,
19
,
156
}
/* left = d153 */
,
{
55
,
27
,
12
,
153
,
203
,
218
,
26
,
27
,
49
}
/* left = d27 */
,
{
55
,
27
,
12
,
153
,
203
,
218
,
26
,
27
,
49
}
/* left = d2
0
7 */
,
{
53
,
49
,
21
,
110
,
116
,
168
,
59
,
80
,
76
}
/* left = d63 */
,
{
38
,
72
,
19
,
168
,
203
,
212
,
50
,
50
,
107
}
/* left = tm */
},
{
/* above = d45 */
...
...
@@ -142,7 +142,7 @@ const vp9_prob vp9_kf_y_mode_prob[VP9_INTRA_MODES]
{
60
,
32
,
33
,
112
,
71
,
220
,
64
,
89
,
104
}
/* left = d135 */
,
{
53
,
26
,
34
,
130
,
56
,
149
,
84
,
120
,
103
}
/* left = d117 */
,
{
53
,
21
,
23
,
133
,
109
,
210
,
56
,
77
,
172
}
/* left = d153 */
,
{
77
,
19
,
29
,
112
,
142
,
228
,
55
,
66
,
36
}
/* left = d27 */
,
{
77
,
19
,
29
,
112
,
142
,
228
,
55
,
66
,
36
}
/* left = d2
0
7 */
,
{
61
,
29
,
29
,
93
,
97
,
165
,
83
,
175
,
162
}
/* left = d63 */
,
{
47
,
47
,
43
,
114
,
137
,
181
,
100
,
99
,
95
}
/* left = tm */
},
{
/* above = d135 */
...
...
@@ -153,7 +153,7 @@ const vp9_prob vp9_kf_y_mode_prob[VP9_INTRA_MODES]
{
52
,
31
,
22
,
158
,
40
,
209
,
58
,
62
,
89
}
/* left = d135 */
,
{
44
,
31
,
29
,
147
,
46
,
158
,
56
,
102
,
198
}
/* left = d117 */
,
{
35
,
19
,
12
,
135
,
87
,
209
,
41
,
45
,
167
}
/* left = d153 */
,
{
55
,
25
,
21
,
118
,
95
,
215
,
38
,
39
,
66
}
/* left = d27 */
,
{
55
,
25
,
21
,
118
,
95
,
215
,
38
,
39
,
66
}
/* left = d2
0
7 */
,
{
51
,
38
,
25
,
113
,
58
,
164
,
70
,
93
,
97
}
/* left = d63 */
,
{
47
,
54
,
34
,
146
,
108
,
203
,
72
,
103
,
151
}
/* left = tm */
},
{
/* above = d117 */
...
...
@@ -164,7 +164,7 @@ const vp9_prob vp9_kf_y_mode_prob[VP9_INTRA_MODES]
{
40
,
26
,
35
,
154
,
40
,
185
,
51
,
97
,
123
}
/* left = d135 */
,
{
35
,
19
,
34
,
179
,
19
,
97
,
48
,
129
,
124
}
/* left = d117 */
,
{
36
,
20
,
26
,
136
,
62
,
164
,
33
,
77
,
154
}
/* left = d153 */
,
{
45
,
18
,
32
,
130
,
90
,
157
,
40
,
79
,
91
}
/* left = d27 */
,
{
45
,
18
,
32
,
130
,
90
,
157
,
40
,
79
,
91
}
/* left = d2
0
7 */
,
{
45
,
26
,
28
,
129
,
45
,
129
,
49
,
147
,
123
}
/* left = d63 */
,
{
38
,
44
,
51
,
136
,
74
,
162
,
57
,
97
,
121
}
/* left = tm */
},
{
/* above = d153 */
...
...
@@ -175,10 +175,10 @@ const vp9_prob vp9_kf_y_mode_prob[VP9_INTRA_MODES]
{
47
,
29
,
17
,
153
,
64
,
220
,
59
,
51
,
114
}
/* left = d135 */
,
{
46
,
16
,
24
,
136
,
76
,
147
,
41
,
64
,
172
}
/* left = d117 */
,
{
34
,
17
,
11
,
108
,
152
,
187
,
13
,
15
,
209
}
/* left = d153 */
,
{
51
,
24
,
14
,
115
,
133
,
209
,
32
,
26
,
104
}
/* left = d27 */
,
{
51
,
24
,
14
,
115
,
133
,
209
,
32
,
26
,
104
}
/* left = d2
0
7 */
,
{
55
,
30
,
18
,
122
,
79
,
179
,
44
,
88
,
116
}
/* left = d63 */
,
{
37
,
49
,
25
,
129
,
168
,
164
,
41
,
54
,
148
}
/* left = tm */
},
{
/* above = d27 */
},
{
/* above = d2
0
7 */
{
82
,
22
,
32
,
127
,
143
,
213
,
39
,
41
,
70
}
/* left = dc */
,
{
62
,
44
,
61
,
123
,
105
,
189
,
48
,
57
,
64
}
/* left = v */
,
{
47
,
25
,
17
,
175
,
222
,
220
,
24
,
30
,
86
}
/* left = h */
,
...
...
@@ -186,7 +186,7 @@ const vp9_prob vp9_kf_y_mode_prob[VP9_INTRA_MODES]
{
57
,
39
,
23
,
151
,
68
,
216
,
55
,
63
,
58
}
/* left = d135 */
,
{
49
,
30
,
35
,
141
,
70
,
168
,
82
,
40
,
115
}
/* left = d117 */
,
{
51
,
25
,
15
,
136
,
129
,
202
,
38
,
35
,
139
}
/* left = d153 */
,
{
68
,
26
,
16
,
111
,
141
,
215
,
29
,
28
,
28
}
/* left = d27 */
,
{
68
,
26
,
16
,
111
,
141
,
215
,
29
,
28
,
28
}
/* left = d2
0
7 */
,
{
59
,
39
,
19
,
114
,
75
,
180
,
77
,
104
,
42
}
/* left = d63 */
,
{
40
,
61
,
26
,
126
,
152
,
206
,
61
,
59
,
93
}
/* left = tm */
},
{
/* above = d63 */
...
...
@@ -197,7 +197,7 @@ const vp9_prob vp9_kf_y_mode_prob[VP9_INTRA_MODES]
{
48
,
31
,
27
,
114
,
63
,
183
,
82
,
116
,
56
}
/* left = d135 */
,
{
43
,
28
,
37
,
121
,
63
,
123
,
61
,
192
,
169
}
/* left = d117 */
,
{
42
,
17
,
24
,
109
,
97
,
177
,
56
,
76
,
122
}
/* left = d153 */
,
{
58
,
18
,
28
,
105
,
139
,
182
,
70
,
92
,
63
}
/* left = d27 */
,
{
58
,
18
,
28
,
105
,
139
,
182
,
70
,
92
,
63
}
/* left = d2
0
7 */
,
{
46
,
23
,
32
,
74
,
86
,
150
,
67
,
183
,
88
}
/* left = d63 */
,
{
36
,
38
,
48
,
92
,
122
,
165
,
88
,
137
,
91
}
/* left = tm */
},
{
/* above = tm */
...
...
@@ -208,7 +208,7 @@ const vp9_prob vp9_kf_y_mode_prob[VP9_INTRA_MODES]
{
49
,
50
,
35
,
144
,
95
,
205
,
63
,
78
,
59
}
/* left = d135 */
,
{
41
,
53
,
52
,
148
,
71
,
142
,
65
,
128
,
51
}
/* left = d117 */
,
{
40
,
36
,
28
,
143
,
143
,
202
,
40
,
55
,
137
}
/* left = d153 */
,
{
52
,
34
,
29
,
129
,
183
,
227
,
42
,
35
,
43
}
/* left = d27 */
,
{
52
,
34
,
29
,
129
,
183
,
227
,
42
,
35
,
43
}
/* left = d2
0
7 */
,
{
42
,
44
,
44
,
104
,
105
,
164
,
64
,
130
,
80
}
/* left = d63 */
,
{
43
,
81
,
53
,
140
,
169
,
204
,
68
,
84
,
72
}
/* left = tm */
}
...
...
vp9/common/vp9_reconintra.c
View file @
14624333
...
...
@@ -49,8 +49,8 @@ const TX_TYPE mode2txfm_map[MB_MODE_COUNT] = {
intra_pred_sized(type, 16) \
intra_pred_sized(type, 32)
static
INLINE
void
d27_predictor
(
uint8_t
*
dst
,
ptrdiff_t
stride
,
int
bs
,
const
uint8_t
*
above
,
const
uint8_t
*
left
)
{
static
INLINE
void
d2
0
7_predictor
(
uint8_t
*
dst
,
ptrdiff_t
stride
,
int
bs
,
const
uint8_t
*
above
,
const
uint8_t
*
left
)
{
int
r
,
c
;
// first column
...
...
@@ -76,7 +76,7 @@ static INLINE void d27_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
for
(
c
=
0
;
c
<
bs
-
2
;
++
c
)
dst
[
r
*
stride
+
c
]
=
dst
[(
r
+
1
)
*
stride
+
c
-
2
];
}
intra_pred_allsizes
(
d27
)
intra_pred_allsizes
(
d2
0
7
)
static
INLINE
void
d63_predictor
(
uint8_t
*
dst
,
ptrdiff_t
stride
,
int
bs
,
const
uint8_t
*
above
,
const
uint8_t
*
left
)
{
...
...
@@ -297,7 +297,7 @@ static void init_intra_pred_fn_ptrs(void) {
intra_pred_allsizes
(
pred
[
V_PRED
],
v
);
intra_pred_allsizes
(
pred
[
H_PRED
],
h
);
intra_pred_allsizes
(
pred
[
D27_PRED
],
d27
);
intra_pred_allsizes
(
pred
[
D27_PRED
],
d2
0
7
);
intra_pred_allsizes
(
pred
[
D45_PRED
],
d45
);
intra_pred_allsizes
(
pred
[
D63_PRED
],
d63
);
intra_pred_allsizes
(
pred
[
D117_PRED
],
d117
);
...
...
vp9/common/vp9_rtcd_defs.sh
View file @
14624333
...
...
@@ -46,8 +46,8 @@ specialize vp9_idct_add_32x32
#
# RECON
#
prototype void vp9_d27_predictor_4x4
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d27_predictor_4x4
prototype void vp9_d2
0
7_predictor_4x4
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d2
0
7_predictor_4x4
prototype void vp9_d45_predictor_4x4
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d45_predictor_4x4
$ssse3_x86inc
...
...
@@ -85,8 +85,8 @@ specialize vp9_dc_left_predictor_4x4
prototype void vp9_dc_128_predictor_4x4
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_128_predictor_4x4
prototype void vp9_d27_predictor_8x8
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d27_predictor_8x8
prototype void vp9_d2
0
7_predictor_8x8
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d2
0
7_predictor_8x8
prototype void vp9_d45_predictor_8x8
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d45_predictor_8x8
$ssse3_x86inc
...
...
@@ -124,8 +124,8 @@ specialize vp9_dc_left_predictor_8x8
prototype void vp9_dc_128_predictor_8x8
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_128_predictor_8x8
prototype void vp9_d27_predictor_16x16
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d27_predictor_16x16
prototype void vp9_d2
0
7_predictor_16x16
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d2
0
7_predictor_16x16
prototype void vp9_d45_predictor_16x16
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d45_predictor_16x16
$ssse3_x86inc
...
...
@@ -163,8 +163,8 @@ specialize vp9_dc_left_predictor_16x16
prototype void vp9_dc_128_predictor_16x16
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_dc_128_predictor_16x16
prototype void vp9_d27_predictor_32x32
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d27_predictor_32x32
prototype void vp9_d2
0
7_predictor_32x32
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d2
0
7_predictor_32x32
prototype void vp9_d45_predictor_32x32
"uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left"
specialize vp9_d45_predictor_32x32
$ssse3_x86inc
...
...
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