History

avfilter/bwdifdsp: Constify

Andreas Rheinhardt committed 3 years ago

Commit fa06f481 parent 1db884c4 files · +48 −48Browse files

Showing the changes to libavfilter (4 of 4 files). Show all

Unified · Split

4 files
  1. libavfilter/aarch64/vf_bwdif_init_aarch64.c +6 −6
  2. libavfilter/bwdifdsp.c +30 −30
  3. libavfilter/bwdifdsp.h +6 −6
  4. libavfilter/x86/vf_bwdif_init.c +6 −6
libavfilter/aarch64/vf_bwdif_init_aarch64.c+6−6
@@ -24,14 +24,14 @@ · 23 unmodified lines
24#include "libavfilter/bwdifdsp.h"24#include "libavfilter/bwdifdsp.h"
25#include "libavutil/aarch64/cpu.h"25#include "libavutil/aarch64/cpu.h"
26 26
27void ff_bwdif_filter_edge_neon(void *dst1, void *prev1, void *cur1, void *next1,27void ff_bwdif_filter_edge_neon(void *dst1, const void *prev1, const void *cur1, const void *next1,
28 int w, int prefs, int mrefs, int prefs2, int mrefs2,28 int w, int prefs, int mrefs, int prefs2, int mrefs2,
29 int parity, int clip_max, int spat);29 int parity, int clip_max, int spat);
30 30
31void ff_bwdif_filter_intra_neon(void *dst1, void *cur1, int w, int prefs, int mrefs,31void ff_bwdif_filter_intra_neon(void *dst1, const void *cur1, int w, int prefs, int mrefs,
32 int prefs3, int mrefs3, int parity, int clip_max);32 int prefs3, int mrefs3, int parity, int clip_max);
33 33
34void ff_bwdif_filter_line_neon(void *dst1, void *prev1, void *cur1, void *next1,34void ff_bwdif_filter_line_neon(void *dst1, const void *prev1, const void *cur1, const void *next1,
35 int w, int prefs, int mrefs, int prefs2, int mrefs2,35 int w, int prefs, int mrefs, int prefs2, int mrefs2,
36 int prefs3, int mrefs3, int prefs4, int mrefs4,36 int prefs3, int mrefs3, int prefs4, int mrefs4,
37 int parity, int clip_max);37 int parity, int clip_max);
@@ -64,7 +64,7 @@ static void filter_line3_helper(void * dst1, int d_stride, · 26 unmodified lines
64 w - w0, parity, clip_max);64 w - w0, parity, clip_max);
65}65}
66 66
67static void filter_line_helper(void *dst1, void *prev1, void *cur1, void *next1,67static void filter_line_helper(void *dst1, const void *prev1, const void *cur1, const void *next1,
68 int w, int prefs, int mrefs, int prefs2, int mrefs2,68 int w, int prefs, int mrefs, int prefs2, int mrefs2,
69 int prefs3, int mrefs3, int prefs4, int mrefs4,69 int prefs3, int mrefs3, int prefs4, int mrefs4,
70 int parity, int clip_max)70 int parity, int clip_max)
@@ -79,7 +79,7 @@ static void filter_line_helper(void *dst1, void *prev1, void *cur1, void *next1, · 8 unmodified lines
79 w - w0, prefs, mrefs, prefs2, mrefs2, prefs3, mrefs3, prefs4, mrefs4, parity, clip_max);79 w - w0, prefs, mrefs, prefs2, mrefs2, prefs3, mrefs3, prefs4, mrefs4, parity, clip_max);
80}80}
81 81
82static void filter_edge_helper(void *dst1, void *prev1, void *cur1, void *next1,82static void filter_edge_helper(void *dst1, const void *prev1, const void *cur1, const void *next1,
83 int w, int prefs, int mrefs, int prefs2, int mrefs2,83 int w, int prefs, int mrefs, int prefs2, int mrefs2,
84 int parity, int clip_max, int spat)84 int parity, int clip_max, int spat)
85{85{
@@ -94,7 +94,7 @@ static void filter_edge_helper(void *dst1, void *prev1, void *cur1, void *next1, · 8 unmodified lines
94 parity, clip_max, spat);94 parity, clip_max, spat);
95}95}
96 96
97static void filter_intra_helper(void *dst1, void *cur1, int w, int prefs, int mrefs,97static void filter_intra_helper(void *dst1, const void *cur1, int w, int prefs, int mrefs,
98 int prefs3, int mrefs3, int parity, int clip_max)98 int prefs3, int mrefs3, int parity, int clip_max)
99{99{
100 const int w0 = clip_max != 255 ? 0 : w & ~15;100 const int w0 = clip_max != 255 ? 0 : w & ~15;
libavfilter/bwdifdsp.c+30−30
@@ -115,27 +115,27 @@ static const uint16_t coef_sp[2] = { 5077, 981 }; · 114 unmodified lines
115 next2++; \115 next2++; \
116 }116 }
117 117
118void ff_bwdif_filter_intra_c(void *dst1, void *cur1, int w, int prefs, int mrefs,118void ff_bwdif_filter_intra_c(void *dst1, const void *cur1, int w, int prefs, int mrefs,
119 int prefs3, int mrefs3, int parity, int clip_max)119 int prefs3, int mrefs3, int parity, int clip_max)
120{120{
121 uint8_t *dst = dst1;121 uint8_t *dst = dst1;
122 uint8_t *cur = cur1;122 const uint8_t *cur = cur1;
123 int interpol, x;123 int interpol, x;
124 124
125 FILTER_INTRA()125 FILTER_INTRA()
126}126}
127 127
128void ff_bwdif_filter_line_c(void *dst1, void *prev1, void *cur1, void *next1,128void ff_bwdif_filter_line_c(void *dst1, const void *prev1, const void *cur1, const void *next1,
129 int w, int prefs, int mrefs, int prefs2, int mrefs2,129 int w, int prefs, int mrefs, int prefs2, int mrefs2,
130 int prefs3, int mrefs3, int prefs4, int mrefs4,130 int prefs3, int mrefs3, int prefs4, int mrefs4,
131 int parity, int clip_max)131 int parity, int clip_max)
132{132{
133 uint8_t *dst = dst1;133 uint8_t *dst = dst1;
134 uint8_t *prev = prev1;134 const uint8_t *prev = prev1;
135 uint8_t *cur = cur1;135 const uint8_t *cur = cur1;
136 uint8_t *next = next1;136 const uint8_t *next = next1;
137 uint8_t *prev2 = parity ? prev : cur ;137 const uint8_t *prev2 = parity ? prev : cur ;
138 uint8_t *next2 = parity ? cur : next;138 const uint8_t *next2 = parity ? cur : next;
139 int interpol, x;139 int interpol, x;
140 140
141 FILTER1()141 FILTER1()
@@ -159,25 +159,25 @@ void ff_bwdif_filter_line3_c(void * dst1, int d_stride, · 17 unmodified lines
159 const uint8_t * cur = cur1;159 const uint8_t * cur = cur1;
160 const uint8_t * next = next1;160 const uint8_t * next = next1;
161 161
162 ff_bwdif_filter_line_c(dst, (void*)prev, (void*)cur, (void*)next, w,162 ff_bwdif_filter_line_c(dst, prev, cur, next, w,
163 prefs, -prefs, prefs * 2, - prefs * 2, prefs * 3, -prefs * 3, prefs * 4, -prefs * 4, parity, clip_max);163 prefs, -prefs, prefs * 2, - prefs * 2, prefs * 3, -prefs * 3, prefs * 4, -prefs * 4, parity, clip_max);
164 NEXT_LINE();164 NEXT_LINE();
165 memcpy(dst, cur, w);165 memcpy(dst, cur, w);
166 NEXT_LINE();166 NEXT_LINE();
167 ff_bwdif_filter_line_c(dst, (void*)prev, (void*)cur, (void*)next, w,167 ff_bwdif_filter_line_c(dst, prev, cur, next, w,
168 prefs, -prefs, prefs * 2, - prefs * 2, prefs * 3, -prefs * 3, prefs * 4, -prefs * 4, parity, clip_max);168 prefs, -prefs, prefs * 2, - prefs * 2, prefs * 3, -prefs * 3, prefs * 4, -prefs * 4, parity, clip_max);
169}169}
170 170
171void ff_bwdif_filter_edge_c(void *dst1, void *prev1, void *cur1, void *next1,171void ff_bwdif_filter_edge_c(void *dst1, const void *prev1, const void *cur1, const void *next1,
172 int w, int prefs, int mrefs, int prefs2, int mrefs2,172 int w, int prefs, int mrefs, int prefs2, int mrefs2,
173 int parity, int clip_max, int spat)173 int parity, int clip_max, int spat)
174{174{
175 uint8_t *dst = dst1;175 uint8_t *dst = dst1;
176 uint8_t *prev = prev1;176 const uint8_t *prev = prev1;
177 uint8_t *cur = cur1;177 const uint8_t *cur = cur1;
178 uint8_t *next = next1;178 const uint8_t *next = next1;
179 uint8_t *prev2 = parity ? prev : cur ;179 const uint8_t *prev2 = parity ? prev : cur ;
180 uint8_t *next2 = parity ? cur : next;180 const uint8_t *next2 = parity ? cur : next;
181 int interpol, x;181 int interpol, x;
182 182
183 FILTER1()183 FILTER1()
@@ -185,27 +185,27 @@ void ff_bwdif_filter_edge_c(void *dst1, void *prev1, void *cur1, void *next1, · 1 unmodified line
185 FILTER2()185 FILTER2()
186}186}
187 187
188static void filter_intra_16bit(void *dst1, void *cur1, int w, int prefs, int mrefs,188static void filter_intra_16bit(void *dst1, const void *cur1, int w, int prefs, int mrefs,
189 int prefs3, int mrefs3, int parity, int clip_max)189 int prefs3, int mrefs3, int parity, int clip_max)
190{190{
191 uint16_t *dst = dst1;191 uint16_t *dst = dst1;
192 uint16_t *cur = cur1;192 const uint16_t *cur = cur1;
193 int interpol, x;193 int interpol, x;
194 194
195 FILTER_INTRA()195 FILTER_INTRA()
196}196}
197 197
198static void filter_line_c_16bit(void *dst1, void *prev1, void *cur1, void *next1,198static void filter_line_c_16bit(void *dst1, const void *prev1, const void *cur1, const void *next1,
199 int w, int prefs, int mrefs, int prefs2, int mrefs2,199 int w, int prefs, int mrefs, int prefs2, int mrefs2,
200 int prefs3, int mrefs3, int prefs4, int mrefs4,200 int prefs3, int mrefs3, int prefs4, int mrefs4,
201 int parity, int clip_max)201 int parity, int clip_max)
202{202{
203 uint16_t *dst = dst1;203 uint16_t *dst = dst1;
204 uint16_t *prev = prev1;204 const uint16_t *prev = prev1;
205 uint16_t *cur = cur1;205 const uint16_t *cur = cur1;
206 uint16_t *next = next1;206 const uint16_t *next = next1;
207 uint16_t *prev2 = parity ? prev : cur ;207 const uint16_t *prev2 = parity ? prev : cur ;
208 uint16_t *next2 = parity ? cur : next;208 const uint16_t *next2 = parity ? cur : next;
209 int interpol, x;209 int interpol, x;
210 210
211 FILTER1()211 FILTER1()
@@ -213,16 +213,16 @@ static void filter_line_c_16bit(void *dst1, void *prev1, void *cur1, void *next1 · 1 unmodified line
213 FILTER2()213 FILTER2()
214}214}
215 215
216static void filter_edge_16bit(void *dst1, void *prev1, void *cur1, void *next1,216static void filter_edge_16bit(void *dst1, const void *prev1, const void *cur1, const void *next1,
217 int w, int prefs, int mrefs, int prefs2, int mrefs2,217 int w, int prefs, int mrefs, int prefs2, int mrefs2,
218 int parity, int clip_max, int spat)218 int parity, int clip_max, int spat)
219{219{
220 uint16_t *dst = dst1;220 uint16_t *dst = dst1;
221 uint16_t *prev = prev1;221 const uint16_t *prev = prev1;
222 uint16_t *cur = cur1;222 const uint16_t *cur = cur1;
223 uint16_t *next = next1;223 const uint16_t *next = next1;
224 uint16_t *prev2 = parity ? prev : cur ;224 const uint16_t *prev2 = parity ? prev : cur ;
225 uint16_t *next2 = parity ? cur : next;225 const uint16_t *next2 = parity ? cur : next;
226 int interpol, x;226 int interpol, x;
227 227
228 FILTER1()228 FILTER1()
libavfilter/bwdifdsp.h+6−6
@@ -20,13 +20,13 @@ · 19 unmodified lines
20#define AVFILTER_BWDIFDSP_H20#define AVFILTER_BWDIFDSP_H
21 21
22typedef struct BWDIFDSPContext {22typedef struct BWDIFDSPContext {
23 void (*filter_intra)(void *dst1, void *cur1, int w, int prefs, int mrefs,23 void (*filter_intra)(void *dst1, const void *cur1, int w, int prefs, int mrefs,
24 int prefs3, int mrefs3, int parity, int clip_max);24 int prefs3, int mrefs3, int parity, int clip_max);
25 void (*filter_line)(void *dst, void *prev, void *cur, void *next,25 void (*filter_line)(void *dst, const void *prev, const void *cur, const void *next,
26 int w, int prefs, int mrefs, int prefs2, int mrefs2,26 int w, int prefs, int mrefs, int prefs2, int mrefs2,
27 int prefs3, int mrefs3, int prefs4, int mrefs4,27 int prefs3, int mrefs3, int prefs4, int mrefs4,
28 int parity, int clip_max);28 int parity, int clip_max);
29 void (*filter_edge)(void *dst, void *prev, void *cur, void *next,29 void (*filter_edge)(void *dst, const void *prev, const void *cur, const void *next,
30 int w, int prefs, int mrefs, int prefs2, int mrefs2,30 int w, int prefs, int mrefs, int prefs2, int mrefs2,
31 int parity, int clip_max, int spat);31 int parity, int clip_max, int spat);
32 void (*filter_line3)(void *dst, int dstride,32 void (*filter_line3)(void *dst, int dstride,
@@ -38,14 +38,14 @@ void ff_bwdif_init_filter_line(BWDIFDSPContext *bwdif, int bit_depth); · 5 unmodified lines
38void ff_bwdif_init_x86(BWDIFDSPContext *bwdif, int bit_depth);38void ff_bwdif_init_x86(BWDIFDSPContext *bwdif, int bit_depth);
39void ff_bwdif_init_aarch64(BWDIFDSPContext *bwdif, int bit_depth);39void ff_bwdif_init_aarch64(BWDIFDSPContext *bwdif, int bit_depth);
40 40
41void ff_bwdif_filter_edge_c(void *dst1, void *prev1, void *cur1, void *next1,41void ff_bwdif_filter_edge_c(void *dst1, const void *prev1, const void *cur1, const void *next1,
42 int w, int prefs, int mrefs, int prefs2, int mrefs2,42 int w, int prefs, int mrefs, int prefs2, int mrefs2,
43 int parity, int clip_max, int spat);43 int parity, int clip_max, int spat);
44 44
45void ff_bwdif_filter_intra_c(void *dst1, void *cur1, int w, int prefs, int mrefs,45void ff_bwdif_filter_intra_c(void *dst1, const void *cur1, int w, int prefs, int mrefs,
46 int prefs3, int mrefs3, int parity, int clip_max);46 int prefs3, int mrefs3, int parity, int clip_max);
47 47
48void ff_bwdif_filter_line_c(void *dst1, void *prev1, void *cur1, void *next1,48void ff_bwdif_filter_line_c(void *dst1, const void *prev1, const void *cur1, const void *next1,
49 int w, int prefs, int mrefs, int prefs2, int mrefs2,49 int w, int prefs, int mrefs, int prefs2, int mrefs2,
50 int prefs3, int mrefs3, int prefs4, int mrefs4,50 int prefs3, int mrefs3, int prefs4, int mrefs4,
51 int parity, int clip_max);51 int parity, int clip_max);
libavfilter/x86/vf_bwdif_init.c+6−6
@@ -24,28 +24,28 @@ · 23 unmodified lines
24#include "libavutil/x86/cpu.h"24#include "libavutil/x86/cpu.h"
25#include "libavfilter/bwdifdsp.h"25#include "libavfilter/bwdifdsp.h"
26 26
27void ff_bwdif_filter_line_sse2(void *dst, void *prev, void *cur, void *next,27void ff_bwdif_filter_line_sse2(void *dst, const void *prev, const void *cur, const void *next,
28 int w, int prefs, int mrefs, int prefs2,28 int w, int prefs, int mrefs, int prefs2,
29 int mrefs2, int prefs3, int mrefs3, int prefs4,29 int mrefs2, int prefs3, int mrefs3, int prefs4,
30 int mrefs4, int parity, int clip_max);30 int mrefs4, int parity, int clip_max);
31void ff_bwdif_filter_line_ssse3(void *dst, void *prev, void *cur, void *next,31void ff_bwdif_filter_line_ssse3(void *dst, const void *prev, const void *cur, const void *next,
32 int w, int prefs, int mrefs, int prefs2,32 int w, int prefs, int mrefs, int prefs2,
33 int mrefs2, int prefs3, int mrefs3, int prefs4,33 int mrefs2, int prefs3, int mrefs3, int prefs4,
34 int mrefs4, int parity, int clip_max);34 int mrefs4, int parity, int clip_max);
35void ff_bwdif_filter_line_avx2(void *dst, void *prev, void *cur, void *next,35void ff_bwdif_filter_line_avx2(void *dst, const void *prev, const void *cur, const void *next,
36 int w, int prefs, int mrefs, int prefs2,36 int w, int prefs, int mrefs, int prefs2,
37 int mrefs2, int prefs3, int mrefs3, int prefs4,37 int mrefs2, int prefs3, int mrefs3, int prefs4,
38 int mrefs4, int parity, int clip_max);38 int mrefs4, int parity, int clip_max);
39 39
40void ff_bwdif_filter_line_12bit_sse2(void *dst, void *prev, void *cur, void *next,40void ff_bwdif_filter_line_12bit_sse2(void *dst, const void *prev, const void *cur, const void *next,
41 int w, int prefs, int mrefs, int prefs2,41 int w, int prefs, int mrefs, int prefs2,
42 int mrefs2, int prefs3, int mrefs3, int prefs4,42 int mrefs2, int prefs3, int mrefs3, int prefs4,
43 int mrefs4, int parity, int clip_max);43 int mrefs4, int parity, int clip_max);
44void ff_bwdif_filter_line_12bit_ssse3(void *dst, void *prev, void *cur, void *next,44void ff_bwdif_filter_line_12bit_ssse3(void *dst, const void *prev, const void *cur, const void *next,
45 int w, int prefs, int mrefs, int prefs2,45 int w, int prefs, int mrefs, int prefs2,
46 int mrefs2, int prefs3, int mrefs3, int prefs4,46 int mrefs2, int prefs3, int mrefs3, int prefs4,
47 int mrefs4, int parity, int clip_max);47 int mrefs4, int parity, int clip_max);
48void ff_bwdif_filter_line_12bit_avx2(void *dst, void *prev, void *cur, void *next,48void ff_bwdif_filter_line_12bit_avx2(void *dst, const void *prev, const void *cur, const void *next,
49 int w, int prefs, int mrefs, int prefs2,49 int w, int prefs, int mrefs, int prefs2,
50 int mrefs2, int prefs3, int mrefs3, int prefs4,50 int mrefs2, int prefs3, int mrefs3, int prefs4,
51 int mrefs4, int parity, int clip_max);51 int mrefs4, int parity, int clip_max);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t