History

avfilter: use ptrdiff_t instead of int for linesize

Paul B Mahol committed 3 years ago

Commit 1242d171 parent c192ebc13 files · +124 −124Browse files

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

Unified · Split

13 files
  1. libavfilter/vf_codecview.c +6 −6
  2. libavfilter/vf_colorcontrast.c +8 −8
  3. libavfilter/vf_colorcorrect.c +18 −18
  4. libavfilter/vf_colorize.c +6 −6
  5. libavfilter/vf_colortemperature.c +8 −8
  6. libavfilter/vf_fillborders.c +14 −14
  7. libavfilter/vf_huesaturation.c +1 −1
  8. libavfilter/vf_lut3d.c +7 −7
  9. libavfilter/vf_monochrome.c +10 −10
  10. libavfilter/vf_paletteuse.c +1 −1
  11. libavfilter/vf_vibrance.c +20 −20
  12. libavfilter/vsrc_gradients.c +6 −6
  13. libavfilter/vsrc_testsrc.c +19 −19
libavfilter/vf_codecview.c+6−6
@@ -111,7 +111,7 @@ static int clip_line(int *sx, int *sy, int *ex, int *ey, int maxx) · 110 unmodified lines
111111 * @param color color of the arrow
112112 */
113113 static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey,
114− int w, int h, int stride, int color)
114+ int w, int h, ptrdiff_t stride, int color)
115115 {
116116 int x, y, fr, f;
117117
@@ -169,7 +169,7 @@ static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, · 51 unmodified lines
169169 * @param color color of the arrow
170170 */
171171 static void draw_arrow(uint8_t *buf, int sx, int sy, int ex,
172− int ey, int w, int h, int stride, int color, int tail, int direction)
172+ int ey, int w, int h, ptrdiff_t stride, int color, int tail, int direction)
173173 {
174174 int dx,dy;
175175
@@ -206,7 +206,7 @@ static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, · 30 unmodified lines
206206 draw_line(buf, sx, sy, ex, ey, w, h, stride, color);
207207 }
208208
209−static void draw_block_rectangle(uint8_t *buf, int sx, int sy, int w, int h, int stride, int color)
209+static void draw_block_rectangle(uint8_t *buf, int sx, int sy, int w, int h, ptrdiff_t stride, int color)
210210 {
211211 for (int x = sx; x < sx + w; x++)
212212 buf[x] = color;
@@ -244,8 +244,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 31 unmodified lines
244244 const int h = AV_CEIL_RSHIFT(frame->height, s->vsub);
245245 uint8_t *pu = frame->data[1];
246246 uint8_t *pv = frame->data[2];
247− const int lzu = frame->linesize[1];
248− const int lzv = frame->linesize[2];
247+ const ptrdiff_t lzu = frame->linesize[1];
248+ const ptrdiff_t lzv = frame->linesize[2];
249249
250250 for (y = 0; y < h; y++) {
251251 for (x = 0; x < w; x++) {
@@ -263,7 +263,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 11 unmodified lines
263263 AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_VIDEO_ENC_PARAMS);
264264 if (sd) {
265265 AVVideoEncParams *par = (AVVideoEncParams*)sd->data;
266− const int stride = frame->linesize[0];
266+ const ptrdiff_t stride = frame->linesize[0];
267267
268268 if (par->nb_blocks) {
269269 for (int block_idx = 0; block_idx < par->nb_blocks; block_idx++) {
libavfilter/vf_colorcontrast.c+8−8
@@ -96,9 +96,9 @@ static int colorcontrast_slice8(AVFilterContext *ctx, void *arg, int jobnr, int · 95 unmodified lines
9696 const int height = frame->height;
9797 const int slice_start = (height * jobnr) / nb_jobs;
9898 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
99− const int glinesize = frame->linesize[0];
100− const int blinesize = frame->linesize[1];
101− const int rlinesize = frame->linesize[2];
99+ const ptrdiff_t glinesize = frame->linesize[0];
100+ const ptrdiff_t blinesize = frame->linesize[1];
101+ const ptrdiff_t rlinesize = frame->linesize[2];
102102 uint8_t *gptr = frame->data[0] + slice_start * glinesize;
103103 uint8_t *bptr = frame->data[1] + slice_start * blinesize;
104104 uint8_t *rptr = frame->data[2] + slice_start * rlinesize;
@@ -150,9 +150,9 @@ static int colorcontrast_slice16(AVFilterContext *ctx, void *arg, int jobnr, int · 45 unmodified lines
150150 const int height = frame->height;
151151 const int slice_start = (height * jobnr) / nb_jobs;
152152 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
153− const int glinesize = frame->linesize[0] / 2;
154− const int blinesize = frame->linesize[1] / 2;
155− const int rlinesize = frame->linesize[2] / 2;
153+ const ptrdiff_t glinesize = frame->linesize[0] / 2;
154+ const ptrdiff_t blinesize = frame->linesize[1] / 2;
155+ const ptrdiff_t rlinesize = frame->linesize[2] / 2;
156156 uint16_t *gptr = (uint16_t *)frame->data[0] + slice_start * glinesize;
157157 uint16_t *bptr = (uint16_t *)frame->data[1] + slice_start * blinesize;
158158 uint16_t *rptr = (uint16_t *)frame->data[2] + slice_start * rlinesize;
@@ -203,7 +203,7 @@ static int colorcontrast_slice8p(AVFilterContext *ctx, void *arg, int jobnr, int · 44 unmodified lines
203203 const int height = frame->height;
204204 const int slice_start = (height * jobnr) / nb_jobs;
205205 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
206− const int linesize = frame->linesize[0];
206+ const ptrdiff_t linesize = frame->linesize[0];
207207 const uint8_t roffset = s->rgba_map[R];
208208 const uint8_t goffset = s->rgba_map[G];
209209 const uint8_t boffset = s->rgba_map[B];
@@ -255,7 +255,7 @@ static int colorcontrast_slice16p(AVFilterContext *ctx, void *arg, int jobnr, in · 45 unmodified lines
255255 const int height = frame->height;
256256 const int slice_start = (height * jobnr) / nb_jobs;
257257 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
258− const int linesize = frame->linesize[0] / 2;
258+ const ptrdiff_t linesize = frame->linesize[0] / 2;
259259 const uint8_t roffset = s->rgba_map[R];
260260 const uint8_t goffset = s->rgba_map[G];
261261 const uint8_t boffset = s->rgba_map[B];
libavfilter/vf_colorcorrect.c+18−18
@@ -69,8 +69,8 @@ static int average_slice8(AVFilterContext *ctx, void *arg, int jobnr, int nb_job · 68 unmodified lines
6969 const int height = s->planeheight[1];
7070 const int slice_start = (height * jobnr) / nb_jobs;
7171 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
72− const int ulinesize = frame->linesize[1];
73− const int vlinesize = frame->linesize[2];
72+ const ptrdiff_t ulinesize = frame->linesize[1];
73+ const ptrdiff_t vlinesize = frame->linesize[2];
7474 const uint8_t *uptr = (const uint8_t *)frame->data[1] + slice_start * ulinesize;
7575 const uint8_t *vptr = (const uint8_t *)frame->data[2] + slice_start * vlinesize;
7676 int sum_u = 0, sum_v = 0;
@@ -100,8 +100,8 @@ static int average_slice16(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo · 23 unmodified lines
100100 const int height = s->planeheight[1];
101101 const int slice_start = (height * jobnr) / nb_jobs;
102102 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
103− const int ulinesize = frame->linesize[1] / 2;
104− const int vlinesize = frame->linesize[2] / 2;
103+ const ptrdiff_t ulinesize = frame->linesize[1] / 2;
104+ const ptrdiff_t vlinesize = frame->linesize[2] / 2;
105105 const uint16_t *uptr = (const uint16_t *)frame->data[1] + slice_start * ulinesize;
106106 const uint16_t *vptr = (const uint16_t *)frame->data[2] + slice_start * vlinesize;
107107 int64_t sum_u = 0, sum_v = 0;
@@ -131,8 +131,8 @@ static int minmax_slice8(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs · 23 unmodified lines
131131 const int height = s->planeheight[1];
132132 const int slice_start = (height * jobnr) / nb_jobs;
133133 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
134− const int ulinesize = frame->linesize[1];
135− const int vlinesize = frame->linesize[2];
134+ const ptrdiff_t ulinesize = frame->linesize[1];
135+ const ptrdiff_t vlinesize = frame->linesize[2];
136136 const uint8_t *uptr = (const uint8_t *)frame->data[1] + slice_start * ulinesize;
137137 const uint8_t *vptr = (const uint8_t *)frame->data[2] + slice_start * vlinesize;
138138 int min_u = 255, min_v = 255;
@@ -167,8 +167,8 @@ static int minmax_slice16(AVFilterContext *ctx, void *arg, int jobnr, int nb_job · 28 unmodified lines
167167 const int height = s->planeheight[1];
168168 const int slice_start = (height * jobnr) / nb_jobs;
169169 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
170− const int ulinesize = frame->linesize[1] / 2;
171− const int vlinesize = frame->linesize[2] / 2;
170+ const ptrdiff_t ulinesize = frame->linesize[1] / 2;
171+ const ptrdiff_t vlinesize = frame->linesize[2] / 2;
172172 const uint16_t *uptr = (const uint16_t *)frame->data[1] + slice_start * ulinesize;
173173 const uint16_t *vptr = (const uint16_t *)frame->data[2] + slice_start * vlinesize;
174174 int min_u = INT_MAX, min_v = INT_MAX;
@@ -201,8 +201,8 @@ static int median_8(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) · 26 unmodified lines
201201 const float imax = s->imax;
202202 const int width = s->planewidth[1];
203203 const int height = s->planeheight[1];
204− const int ulinesize = frame->linesize[1];
205− const int vlinesize = frame->linesize[2];
204+ const ptrdiff_t ulinesize = frame->linesize[1];
205+ const ptrdiff_t vlinesize = frame->linesize[2];
206206 const uint8_t *uptr = (const uint8_t *)frame->data[1];
207207 const uint8_t *vptr = (const uint8_t *)frame->data[2];
208208 unsigned *uhistogram = s->uhistogram;
@@ -255,8 +255,8 @@ static int median_16(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) · 46 unmodified lines
255255 const float imax = s->imax;
256256 const int width = s->planewidth[1];
257257 const int height = s->planeheight[1];
258− const int ulinesize = frame->linesize[1] / 2;
259− const int vlinesize = frame->linesize[2] / 2;
258+ const ptrdiff_t ulinesize = frame->linesize[1] / 2;
259+ const ptrdiff_t vlinesize = frame->linesize[2] / 2;
260260 const uint16_t *uptr = (const uint16_t *)frame->data[1];
261261 const uint16_t *vptr = (const uint16_t *)frame->data[2];
262262 unsigned *uhistogram = s->uhistogram;
@@ -323,9 +323,9 @@ static int colorcorrect_slice8(AVFilterContext *ctx, void *arg, int jobnr, int n · 60 unmodified lines
323323 const int height = s->planeheight[1];
324324 const int slice_start = (height * jobnr) / nb_jobs;
325325 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
326− const int ylinesize = frame->linesize[0];
327− const int ulinesize = frame->linesize[1];
328− const int vlinesize = frame->linesize[2];
326+ const ptrdiff_t ylinesize = frame->linesize[0];
327+ const ptrdiff_t ulinesize = frame->linesize[1];
328+ const ptrdiff_t vlinesize = frame->linesize[2];
329329 uint8_t *yptr = frame->data[0] + slice_start * chroma_h * ylinesize;
330330 uint8_t *uptr = frame->data[1] + slice_start * ulinesize;
331331 uint8_t *vptr = frame->data[2] + slice_start * vlinesize;
@@ -364,9 +364,9 @@ static int colorcorrect_slice16(AVFilterContext *ctx, void *arg, int jobnr, int · 32 unmodified lines
364364 const int height = s->planeheight[1];
365365 const int slice_start = (height * jobnr) / nb_jobs;
366366 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
367− const int ylinesize = frame->linesize[0] / 2;
368− const int ulinesize = frame->linesize[1] / 2;
369− const int vlinesize = frame->linesize[2] / 2;
367+ const ptrdiff_t ylinesize = frame->linesize[0] / 2;
368+ const ptrdiff_t ulinesize = frame->linesize[1] / 2;
369+ const ptrdiff_t vlinesize = frame->linesize[2] / 2;
370370 uint16_t *yptr = (uint16_t *)frame->data[0] + slice_start * chroma_h * ylinesize;
371371 uint16_t *uptr = (uint16_t *)frame->data[1] + slice_start * ulinesize;
372372 uint16_t *vptr = (uint16_t *)frame->data[2] + slice_start * vlinesize;
libavfilter/vf_colorize.c+6−6
@@ -52,7 +52,7 @@ static int colorizey_slice8(AVFilterContext *ctx, void *arg, int jobnr, int nb_j · 51 unmodified lines
5252 const int height = s->planeheight[0];
5353 const int slice_start = (height * jobnr) / nb_jobs;
5454 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
55− const int ylinesize = frame->linesize[0];
55+ const ptrdiff_t ylinesize = frame->linesize[0];
5656 uint8_t *yptr = frame->data[0] + slice_start * ylinesize;
5757 const int yv = s->c[0];
5858 const float mix = s->mix;
@@ -75,7 +75,7 @@ static int colorizey_slice16(AVFilterContext *ctx, void *arg, int jobnr, int nb_ · 16 unmodified lines
7575 const int height = s->planeheight[0];
7676 const int slice_start = (height * jobnr) / nb_jobs;
7777 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
78− const int ylinesize = frame->linesize[0] / 2;
78+ const ptrdiff_t ylinesize = frame->linesize[0] / 2;
7979 uint16_t *yptr = (uint16_t *)frame->data[0] + slice_start * ylinesize;
8080 const int yv = s->c[0];
8181 const float mix = s->mix;
@@ -98,8 +98,8 @@ static int colorize_slice8(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo · 16 unmodified lines
9898 const int height = s->planeheight[1];
9999 const int slice_start = (height * jobnr) / nb_jobs;
100100 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
101− const int ulinesize = frame->linesize[1];
102− const int vlinesize = frame->linesize[2];
101+ const ptrdiff_t ulinesize = frame->linesize[1];
102+ const ptrdiff_t vlinesize = frame->linesize[2];
103103 uint8_t *uptr = frame->data[1] + slice_start * ulinesize;
104104 uint8_t *vptr = frame->data[2] + slice_start * vlinesize;
105105 const int u = s->c[1];
@@ -126,8 +126,8 @@ static int colorize_slice16(AVFilterContext *ctx, void *arg, int jobnr, int nb_j · 20 unmodified lines
126126 const int height = s->planeheight[1];
127127 const int slice_start = (height * jobnr) / nb_jobs;
128128 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
129− const int ulinesize = frame->linesize[1] / 2;
130− const int vlinesize = frame->linesize[2] / 2;
129+ const ptrdiff_t ulinesize = frame->linesize[1] / 2;
130+ const ptrdiff_t vlinesize = frame->linesize[2] / 2;
131131 uint16_t *uptr = (uint16_t *)frame->data[1] + slice_start * ulinesize;
132132 uint16_t *vptr = (uint16_t *)frame->data[2] + slice_start * vlinesize;
133133 const int u = s->c[1];
libavfilter/vf_colortemperature.c+8−8
@@ -111,9 +111,9 @@ static int temperature_slice8(AVFilterContext *ctx, void *arg, int jobnr, int nb · 110 unmodified lines
111111 const float *color = s->color;
112112 const int slice_start = (height * jobnr) / nb_jobs;
113113 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
114− const int glinesize = frame->linesize[0];
115− const int blinesize = frame->linesize[1];
116− const int rlinesize = frame->linesize[2];
114+ const ptrdiff_t glinesize = frame->linesize[0];
115+ const ptrdiff_t blinesize = frame->linesize[1];
116+ const ptrdiff_t rlinesize = frame->linesize[2];
117117 uint8_t *gptr = frame->data[0] + slice_start * glinesize;
118118 uint8_t *bptr = frame->data[1] + slice_start * blinesize;
119119 uint8_t *rptr = frame->data[2] + slice_start * rlinesize;
@@ -153,9 +153,9 @@ static int temperature_slice16(AVFilterContext *ctx, void *arg, int jobnr, int n · 33 unmodified lines
153153 const float *color = s->color;
154154 const int slice_start = (height * jobnr) / nb_jobs;
155155 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
156− const int glinesize = frame->linesize[0] / sizeof(uint16_t);
157− const int blinesize = frame->linesize[1] / sizeof(uint16_t);
158− const int rlinesize = frame->linesize[2] / sizeof(uint16_t);
156+ const ptrdiff_t glinesize = frame->linesize[0] / sizeof(uint16_t);
157+ const ptrdiff_t blinesize = frame->linesize[1] / sizeof(uint16_t);
158+ const ptrdiff_t rlinesize = frame->linesize[2] / sizeof(uint16_t);
159159 uint16_t *gptr = (uint16_t *)frame->data[0] + slice_start * glinesize;
160160 uint16_t *bptr = (uint16_t *)frame->data[1] + slice_start * blinesize;
161161 uint16_t *rptr = (uint16_t *)frame->data[2] + slice_start * rlinesize;
@@ -198,7 +198,7 @@ static int temperature_slice8p(AVFilterContext *ctx, void *arg, int jobnr, int n · 36 unmodified lines
198198 const uint8_t boffset = s->rgba_map[B];
199199 const int slice_start = (height * jobnr) / nb_jobs;
200200 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
201− const int linesize = frame->linesize[0];
201+ const ptrdiff_t linesize = frame->linesize[0];
202202 uint8_t *ptr = frame->data[0] + slice_start * linesize;
203203
204204 for (int y = slice_start; y < slice_end; y++) {
@@ -238,7 +238,7 @@ static int temperature_slice16p(AVFilterContext *ctx, void *arg, int jobnr, int · 33 unmodified lines
238238 const uint8_t boffset = s->rgba_map[B];
239239 const int slice_start = (height * jobnr) / nb_jobs;
240240 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
241− const int linesize = frame->linesize[0] / sizeof(uint16_t);
241+ const ptrdiff_t linesize = frame->linesize[0] / sizeof(uint16_t);
242242 uint16_t *ptr = (uint16_t *)frame->data[0] + slice_start * linesize;
243243
244244 for (int y = slice_start; y < slice_end; y++) {
libavfilter/vf_fillborders.c+14−14
@@ -82,7 +82,7 @@ static void smear_borders8(FillBordersContext *s, AVFrame *frame) · 81 unmodified lines
8282
8383 for (p = 0; p < s->nb_planes; p++) {
8484 uint8_t *ptr = frame->data[p];
85− int linesize = frame->linesize[p];
85+ ptrdiff_t linesize = frame->linesize[p];
8686
8787 for (y = s->borders[p].top; y < s->planeheight[p] - s->borders[p].bottom; y++) {
8888 memset(ptr + y * linesize,
@@ -112,7 +112,7 @@ static void smear_borders16(FillBordersContext *s, AVFrame *frame) · 23 unmodified lines
112112
113113 for (p = 0; p < s->nb_planes; p++) {
114114 uint16_t *ptr = (uint16_t *)frame->data[p];
115− int linesize = frame->linesize[p] / 2;
115+ ptrdiff_t linesize = frame->linesize[p] / 2;
116116
117117 for (y = s->borders[p].top; y < s->planeheight[p] - s->borders[p].bottom; y++) {
118118 for (x = 0; x < s->borders[p].left; x++) {
@@ -144,7 +144,7 @@ static void mirror_borders8(FillBordersContext *s, AVFrame *frame) · 25 unmodified lines
144144
145145 for (p = 0; p < s->nb_planes; p++) {
146146 uint8_t *ptr = frame->data[p];
147− int linesize = frame->linesize[p];
147+ ptrdiff_t linesize = frame->linesize[p];
148148
149149 for (y = s->borders[p].top; y < s->planeheight[p] - s->borders[p].bottom; y++) {
150150 for (x = 0; x < s->borders[p].left; x++) {
@@ -177,7 +177,7 @@ static void mirror_borders16(FillBordersContext *s, AVFrame *frame) · 26 unmodified lines
177177
178178 for (p = 0; p < s->nb_planes; p++) {
179179 uint16_t *ptr = (uint16_t *)frame->data[p];
180− int linesize = frame->linesize[p] / 2;
180+ ptrdiff_t linesize = frame->linesize[p] / 2;
181181
182182 for (y = s->borders[p].top; y < s->planeheight[p] - s->borders[p].bottom; y++) {
183183 for (x = 0; x < s->borders[p].left; x++) {
@@ -211,7 +211,7 @@ static void fixed_borders8(FillBordersContext *s, AVFrame *frame) · 27 unmodified lines
211211 for (p = 0; p < s->nb_planes; p++) {
212212 uint8_t *ptr = frame->data[p];
213213 uint8_t fill = s->fill[p];
214− int linesize = frame->linesize[p];
214+ ptrdiff_t linesize = frame->linesize[p];
215215
216216 for (y = s->borders[p].top; y < s->planeheight[p] - s->borders[p].bottom; y++) {
217217 memset(ptr + y * linesize, fill, s->borders[p].left);
@@ -236,7 +236,7 @@ static void fixed_borders16(FillBordersContext *s, AVFrame *frame) · 18 unmodified lines
236236 for (p = 0; p < s->nb_planes; p++) {
237237 uint16_t *ptr = (uint16_t *)frame->data[p];
238238 uint16_t fill = s->fill[p] << (s->depth - 8);
239− int linesize = frame->linesize[p] / 2;
239+ ptrdiff_t linesize = frame->linesize[p] / 2;
240240
241241 for (y = s->borders[p].top; y < s->planeheight[p] - s->borders[p].bottom; y++) {
242242 for (x = 0; x < s->borders[p].left; x++) {
@@ -268,7 +268,7 @@ static void reflect_borders8(FillBordersContext *s, AVFrame *frame) · 25 unmodified lines
268268
269269 for (p = 0; p < s->nb_planes; p++) {
270270 uint8_t *ptr = frame->data[p];
271− int linesize = frame->linesize[p];
271+ ptrdiff_t linesize = frame->linesize[p];
272272
273273 for (y = s->borders[p].top; y < s->planeheight[p] - s->borders[p].bottom; y++) {
274274 for (x = 0; x < s->borders[p].left; x++) {
@@ -301,7 +301,7 @@ static void reflect_borders16(FillBordersContext *s, AVFrame *frame) · 26 unmodified lines
301301
302302 for (p = 0; p < s->nb_planes; p++) {
303303 uint16_t *ptr = (uint16_t *)frame->data[p];
304− int linesize = frame->linesize[p] / 2;
304+ ptrdiff_t linesize = frame->linesize[p] / 2;
305305
306306 for (y = s->borders[p].top; y < s->planeheight[p] - s->borders[p].bottom; y++) {
307307 for (x = 0; x < s->borders[p].left; x++) {
@@ -334,7 +334,7 @@ static void wrap_borders8(FillBordersContext *s, AVFrame *frame) · 26 unmodified lines
334334
335335 for (p = 0; p < s->nb_planes; p++) {
336336 uint8_t *ptr = frame->data[p];
337− int linesize = frame->linesize[p];
337+ ptrdiff_t linesize = frame->linesize[p];
338338
339339 for (y = s->borders[p].top; y < s->planeheight[p] - s->borders[p].bottom; y++) {
340340 for (x = 0; x < s->borders[p].left; x++) {
@@ -367,7 +367,7 @@ static void wrap_borders16(FillBordersContext *s, AVFrame *frame) · 26 unmodified lines
367367
368368 for (p = 0; p < s->nb_planes; p++) {
369369 uint16_t *ptr = (uint16_t *)frame->data[p];
370− int linesize = frame->linesize[p] / 2;
370+ ptrdiff_t linesize = frame->linesize[p] / 2;
371371
372372 for (y = s->borders[p].top; y < s->planeheight[p] - s->borders[p].bottom; y++) {
373373 for (x = 0; x < s->borders[p].left; x++) {
@@ -411,7 +411,7 @@ static void fade_borders8(FillBordersContext *s, AVFrame *frame) · 37 unmodified lines
411411 for (p = 0; p < s->nb_planes; p++) {
412412 uint8_t *ptr = frame->data[p];
413413 const uint8_t fill = s->fill[p];
414− const int linesize = frame->linesize[p];
414+ const ptrdiff_t linesize = frame->linesize[p];
415415 const int start_left = s->borders[p].left;
416416 const int start_right = s->planewidth[p] - s->borders[p].right;
417417 const int start_top = s->borders[p].top;
@@ -453,7 +453,7 @@ static void fade_borders16(FillBordersContext *s, AVFrame *frame) · 35 unmodified lines
453453 for (p = 0; p < s->nb_planes; p++) {
454454 uint16_t *ptr = (uint16_t *)frame->data[p];
455455 const uint16_t fill = s->fill[p] << (depth - 8);
456− const int linesize = frame->linesize[p] / 2;
456+ const ptrdiff_t linesize = frame->linesize[p] / 2;
457457 const int start_left = s->borders[p].left;
458458 const int start_right = s->planewidth[p] - s->borders[p].right;
459459 const int start_top = s->borders[p].top;
@@ -491,7 +491,7 @@ static void margins_borders8(FillBordersContext *s, AVFrame *frame) · 31 unmodified lines
491491 {
492492 for (int p = 0; p < s->nb_planes; p++) {
493493 uint8_t *ptr = (uint8_t *)frame->data[p];
494− const int linesize = frame->linesize[p];
494+ const ptrdiff_t linesize = frame->linesize[p];
495495 const int left = s->borders[p].left;
496496 const int right = s->borders[p].right;
497497 const int top = s->borders[p].top;
@@ -536,7 +536,7 @@ static void margins_borders16(FillBordersContext *s, AVFrame *frame) · 38 unmodified lines
536536 {
537537 for (int p = 0; p < s->nb_planes; p++) {
538538 uint16_t *ptr = (uint16_t *)frame->data[p];
539− const int linesize = frame->linesize[p] / 2;
539+ const ptrdiff_t linesize = frame->linesize[p] / 2;
540540 const int left = s->borders[p].left;
541541 const int right = s->borders[p].right;
542542 const int top = s->borders[p].top;
libavfilter/vf_huesaturation.c+1−1
@@ -105,7 +105,7 @@ static int do_slice_##name##_##xall(AVFilterContext *ctx, \ · 104 unmodified lines
105105 const int process_h = frame->height; \
106106 const int slice_start = (process_h * jobnr ) / nb_jobs; \
107107 const int slice_end = (process_h * (jobnr+1)) / nb_jobs; \
108− const int linesize = frame->linesize[0] / sizeof(type); \
108+ const ptrdiff_t linesize = frame->linesize[0] / sizeof(type); \
109109 type *row = (type *)frame->data[0] + linesize * slice_start; \
110110 const uint8_t offset_r = s->rgba_map[R]; \
111111 const uint8_t offset_g = s->rgba_map[G]; \
libavfilter/vf_lut3d.c+7−7
@@ -1321,7 +1321,7 @@ const AVFilter ff_vf_lut3d = { · 1320 unmodified lines
13211321 static void update_clut_packed(LUT3DContext *lut3d, const AVFrame *frame)
13221322 {
13231323 const uint8_t *data = frame->data[0];
1324− const int linesize = frame->linesize[0];
1324+ const ptrdiff_t linesize = frame->linesize[0];
13251325 const int w = lut3d->clut_width;
13261326 const int step = lut3d->clut_step;
13271327 const uint8_t *rgba_map = lut3d->clut_rgba_map;
@@ -1360,9 +1360,9 @@ static void update_clut_planar(LUT3DContext *lut3d, const AVFrame *frame) · 32 unmodified lines
13601360 const uint8_t *datag = frame->data[0];
13611361 const uint8_t *datab = frame->data[1];
13621362 const uint8_t *datar = frame->data[2];
1363− const int glinesize = frame->linesize[0];
1364− const int blinesize = frame->linesize[1];
1365− const int rlinesize = frame->linesize[2];
1363+ const ptrdiff_t glinesize = frame->linesize[0];
1364+ const ptrdiff_t blinesize = frame->linesize[1];
1365+ const ptrdiff_t rlinesize = frame->linesize[2];
13661366 const int w = lut3d->clut_width;
13671367 const int level = lut3d->lutsize;
13681368 const int level2 = lut3d->lutsize2;
@@ -1407,9 +1407,9 @@ static void update_clut_float(LUT3DContext *lut3d, const AVFrame *frame) · 38 unmodified lines
14071407 const uint8_t *datag = frame->data[0];
14081408 const uint8_t *datab = frame->data[1];
14091409 const uint8_t *datar = frame->data[2];
1410− const int glinesize = frame->linesize[0];
1411− const int blinesize = frame->linesize[1];
1412− const int rlinesize = frame->linesize[2];
1410+ const ptrdiff_t glinesize = frame->linesize[0];
1411+ const ptrdiff_t blinesize = frame->linesize[1];
1412+ const ptrdiff_t rlinesize = frame->linesize[2];
14131413 const int w = lut3d->clut_width;
14141414 const int level = lut3d->lutsize;
14151415 const int level2 = lut3d->lutsize2;
libavfilter/vf_monochrome.c+10−10
@@ -89,9 +89,9 @@ static int monochrome_slice8(AVFilterContext *ctx, void *arg, int jobnr, int nb_ · 88 unmodified lines
8989 const int height = frame->height;
9090 const int slice_start = (height * jobnr) / nb_jobs;
9191 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
92− const int ylinesize = frame->linesize[0];
93− const int ulinesize = frame->linesize[1];
94− const int vlinesize = frame->linesize[2];
92+ const ptrdiff_t ylinesize = frame->linesize[0];
93+ const ptrdiff_t ulinesize = frame->linesize[1];
94+ const ptrdiff_t vlinesize = frame->linesize[2];
9595 uint8_t *yptr = frame->data[0] + slice_start * ylinesize;
9696 const float ihigh = 1.f - s->high;
9797 const float size = 1.f / s->size;
@@ -128,9 +128,9 @@ static int monochrome_slice16(AVFilterContext *ctx, void *arg, int jobnr, int nb · 30 unmodified lines
128128 const int height = frame->height;
129129 const int slice_start = (height * jobnr) / nb_jobs;
130130 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
131− const int ylinesize = frame->linesize[0] / 2;
132− const int ulinesize = frame->linesize[1] / 2;
133− const int vlinesize = frame->linesize[2] / 2;
131+ const ptrdiff_t ylinesize = frame->linesize[0] / 2;
132+ const ptrdiff_t ulinesize = frame->linesize[1] / 2;
133+ const ptrdiff_t vlinesize = frame->linesize[2] / 2;
134134 uint16_t *yptr = (uint16_t *)frame->data[0] + slice_start * ylinesize;
135135 const float ihigh = 1.f - s->high;
136136 const float size = 1.f / s->size;
@@ -166,8 +166,8 @@ static int clear_slice8(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) · 29 unmodified lines
166166 const int height = AV_CEIL_RSHIFT(frame->height, subh);
167167 const int slice_start = (height * jobnr) / nb_jobs;
168168 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
169− const int ulinesize = frame->linesize[1];
170− const int vlinesize = frame->linesize[2];
169+ const ptrdiff_t ulinesize = frame->linesize[1];
170+ const ptrdiff_t vlinesize = frame->linesize[2];
171171
172172 for (int y = slice_start; y < slice_end; y++) {
173173 uint8_t *uptr = frame->data[1] + y * ulinesize;
@@ -192,8 +192,8 @@ static int clear_slice16(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs · 18 unmodified lines
192192 const int height = AV_CEIL_RSHIFT(frame->height, subh);
193193 const int slice_start = (height * jobnr) / nb_jobs;
194194 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
195− const int ulinesize = frame->linesize[1] / 2;
196− const int vlinesize = frame->linesize[2] / 2;
195+ const ptrdiff_t ulinesize = frame->linesize[1] / 2;
196+ const ptrdiff_t vlinesize = frame->linesize[2] / 2;
197197
198198 for (int y = slice_start; y < slice_end; y++) {
199199 uint16_t *uptr = (uint16_t *)frame->data[1] + y * ulinesize;
libavfilter/vf_paletteuse.c+1−1
@@ -845,7 +845,7 @@ static void load_palette(PaletteUseContext *s, const AVFrame *palette_frame) · 844 unmodified lines
845845 {
846846 int i, x, y;
847847 const uint32_t *p = (const uint32_t *)palette_frame->data[0];
848− const int p_linesize = palette_frame->linesize[0] >> 2;
848+ const ptrdiff_t p_linesize = palette_frame->linesize[0] >> 2;
849849
850850 s->transparency_index = -1;
851851
libavfilter/vf_vibrance.c+20−20
@@ -77,14 +77,14 @@ static int vibrance_slice8(AVFilterContext *avctx, void *arg, int jobnr, int nb_ · 76 unmodified lines
7777 const float srintensity = alternate * FFSIGN(rintensity);
7878 const int slice_start = (height * jobnr) / nb_jobs;
7979 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
80− const int glinesize = frame->linesize[0];
81− const int blinesize = frame->linesize[1];
82− const int rlinesize = frame->linesize[2];
83− const int alinesize = frame->linesize[3];
84− const int gslinesize = in->linesize[0];
85− const int bslinesize = in->linesize[1];
86− const int rslinesize = in->linesize[2];
87− const int aslinesize = in->linesize[3];
80+ const ptrdiff_t glinesize = frame->linesize[0];
81+ const ptrdiff_t blinesize = frame->linesize[1];
82+ const ptrdiff_t rlinesize = frame->linesize[2];
83+ const ptrdiff_t alinesize = frame->linesize[3];
84+ const ptrdiff_t gslinesize = in->linesize[0];
85+ const ptrdiff_t bslinesize = in->linesize[1];
86+ const ptrdiff_t rslinesize = in->linesize[2];
87+ const ptrdiff_t aslinesize = in->linesize[3];
8888 const uint8_t *gsrc = in->data[0] + slice_start * glinesize;
8989 const uint8_t *bsrc = in->data[1] + slice_start * blinesize;
9090 const uint8_t *rsrc = in->data[2] + slice_start * rlinesize;
@@ -154,14 +154,14 @@ static int vibrance_slice16(AVFilterContext *avctx, void *arg, int jobnr, int nb · 63 unmodified lines
154154 const float srintensity = alternate * FFSIGN(rintensity);
155155 const int slice_start = (height * jobnr) / nb_jobs;
156156 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
157− const int gslinesize = in->linesize[0] / 2;
158− const int bslinesize = in->linesize[1] / 2;
159− const int rslinesize = in->linesize[2] / 2;
160− const int aslinesize = in->linesize[3] / 2;
161− const int glinesize = frame->linesize[0] / 2;
162− const int blinesize = frame->linesize[1] / 2;
163− const int rlinesize = frame->linesize[2] / 2;
164− const int alinesize = frame->linesize[3] / 2;
157+ const ptrdiff_t gslinesize = in->linesize[0] / 2;
158+ const ptrdiff_t bslinesize = in->linesize[1] / 2;
159+ const ptrdiff_t rslinesize = in->linesize[2] / 2;
160+ const ptrdiff_t aslinesize = in->linesize[3] / 2;
161+ const ptrdiff_t glinesize = frame->linesize[0] / 2;
162+ const ptrdiff_t blinesize = frame->linesize[1] / 2;
163+ const ptrdiff_t rlinesize = frame->linesize[2] / 2;
164+ const ptrdiff_t alinesize = frame->linesize[3] / 2;
165165 const uint16_t *gsrc = (const uint16_t *)in->data[0] + slice_start * gslinesize;
166166 const uint16_t *bsrc = (const uint16_t *)in->data[1] + slice_start * bslinesize;
167167 const uint16_t *rsrc = (const uint16_t *)in->data[2] + slice_start * rslinesize;
@@ -234,8 +234,8 @@ static int vibrance_slice8p(AVFilterContext *avctx, void *arg, int jobnr, int nb · 66 unmodified lines
234234 const float srintensity = alternate * FFSIGN(rintensity);
235235 const int slice_start = (height * jobnr) / nb_jobs;
236236 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
237− const int linesize = frame->linesize[0];
238− const int slinesize = in->linesize[0];
237+ const ptrdiff_t linesize = frame->linesize[0];
238+ const ptrdiff_t slinesize = in->linesize[0];
239239 const uint8_t *src = in->data[0] + slice_start * slinesize;
240240 uint8_t *ptr = frame->data[0] + slice_start * linesize;
241241
@@ -300,8 +300,8 @@ static int vibrance_slice16p(AVFilterContext *avctx, void *arg, int jobnr, int n · 58 unmodified lines
300300 const float srintensity = alternate * FFSIGN(rintensity);
301301 const int slice_start = (height * jobnr) / nb_jobs;
302302 const int slice_end = (height * (jobnr + 1)) / nb_jobs;
303− const int linesize = frame->linesize[0] / 2;
304− const int slinesize = in->linesize[0] / 2;
303+ const ptrdiff_t linesize = frame->linesize[0] / 2;
304+ const ptrdiff_t slinesize = in->linesize[0] / 2;
305305 const uint16_t *src = (const uint16_t *)in->data[0] + slice_start * slinesize;
306306 uint16_t *ptr = (uint16_t *)frame->data[0] + slice_start * linesize;
307307
libavfilter/vsrc_gradients.c+6−6
@@ -248,7 +248,7 @@ static int draw_gradients_slice(AVFilterContext *ctx, void *arg, int job, int nb · 247 unmodified lines
248248 const int height = frame->height;
249249 const int start = (height * job ) / nb_jobs;
250250 const int end = (height * (job+1)) / nb_jobs;
251− const int linesize = frame->linesize[0] / 4;
251+ const ptrdiff_t linesize = frame->linesize[0] / 4;
252252 uint32_t *dst = (uint32_t *)frame->data[0] + start * linesize;
253253 const int type = s->type;
254254
@@ -272,7 +272,7 @@ static int draw_gradients_slice16(AVFilterContext *ctx, void *arg, int job, int · 17 unmodified lines
272272 const int height = frame->height;
273273 const int start = (height * job ) / nb_jobs;
274274 const int end = (height * (job+1)) / nb_jobs;
275− const int linesize = frame->linesize[0] / 8;
275+ const ptrdiff_t linesize = frame->linesize[0] / 8;
276276 uint64_t *dst = (uint64_t *)frame->data[0] + start * linesize;
277277 const int type = s->type;
278278
@@ -296,10 +296,10 @@ static int draw_gradients_slice32_planar(AVFilterContext *ctx, void *arg, int jo · 17 unmodified lines
296296 const int height = frame->height;
297297 const int start = (height * job ) / nb_jobs;
298298 const int end = (height * (job+1)) / nb_jobs;
299− const int linesize_g = frame->linesize[0] / 4;
300− const int linesize_b = frame->linesize[1] / 4;
301− const int linesize_r = frame->linesize[2] / 4;
302− const int linesize_a = frame->linesize[3] / 4;
299+ const ptrdiff_t linesize_g = frame->linesize[0] / 4;
300+ const ptrdiff_t linesize_b = frame->linesize[1] / 4;
301+ const ptrdiff_t linesize_r = frame->linesize[2] / 4;
302+ const ptrdiff_t linesize_a = frame->linesize[3] / 4;
303303 float *dst_g = (float *)frame->data[0] + start * linesize_g;
304304 float *dst_b = (float *)frame->data[1] + start * linesize_b;
305305 float *dst_r = (float *)frame->data[2] + start * linesize_r;
libavfilter/vsrc_testsrc.c+19−19
@@ -328,7 +328,7 @@ static void haldclutsrc_fill_picture(AVFilterContext *ctx, AVFrame *frame) · 327 unmodified lines
328328 const int w = frame->width;
329329 const int h = frame->height;
330330 uint8_t *data = frame->data[0];
331− const int linesize = frame->linesize[0];
331+ const ptrdiff_t linesize = frame->linesize[0];
332332 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
333333 const int depth = desc->comp[0].depth;
334334 const int planar = desc->flags & AV_PIX_FMT_FLAG_PLANAR;
@@ -510,7 +510,7 @@ AVFILTER_DEFINE_CLASS(testsrc); · 175 unmodified lines
510510 * @param w width of the rectangle to draw, expressed as a number of segment_width units
511511 * @param h height of the rectangle to draw, expressed as a number of segment_width units
512512 */
513−static void draw_rectangle(unsigned val, uint8_t *dst, int dst_linesize, int segment_width,
513+static void draw_rectangle(unsigned val, uint8_t *dst, ptrdiff_t dst_linesize, int segment_width,
514514 int x, int y, int w, int h)
515515 {
516516 int i;
@@ -525,7 +525,7 @@ static void draw_rectangle(unsigned val, uint8_t *dst, int dst_linesize, int seg · 8 unmodified lines
525525 }
526526 }
527527
528−static void draw_digit(int digit, uint8_t *dst, int dst_linesize,
528+static void draw_digit(int digit, uint8_t *dst, ptrdiff_t dst_linesize,
529529 int segment_width)
530530 {
531531 #define TOP_HBAR 1
@@ -1004,7 +1004,7 @@ static void rgbtest_put_pixel(uint8_t *dstp[4], int dst_linesizep[4], · 472 unmodified lines
10041004 uint8_t rgba_map[4])
10051005 {
10061006 uint8_t *dst = dstp[0];
1007− int dst_linesize = dst_linesizep[0];
1007+ ptrdiff_t dst_linesize = dst_linesizep[0];
10081008 uint32_t v;
10091009 uint8_t *p;
10101010 uint16_t *p16;
@@ -1031,7 +1031,7 @@ static void rgbtest_put_pixel(uint8_t *dstp[4], int dst_linesizep[4], · 20 unmodified lines
10311031 AV_WL32(p, v);
10321032 break;
10331033 case AV_PIX_FMT_GBRP:
1034− p = dstp[0] + x + y * dst_linesizep[0];
1034+ p = dstp[0] + x + y * dst_linesize;
10351035 p[0] = g;
10361036 p = dstp[1] + x + y * dst_linesizep[1];
10371037 p[0] = b;
@@ -1160,9 +1160,9 @@ static void yuvtest_fill_picture8(AVFilterContext *ctx, AVFrame *frame) · 122 unmodified lines
11601160 uint8_t *ydst = frame->data[0];
11611161 uint8_t *udst = frame->data[1];
11621162 uint8_t *vdst = frame->data[2];
1163− int ylinesize = frame->linesize[0];
1164− int ulinesize = frame->linesize[1];
1165− int vlinesize = frame->linesize[2];
1163+ ptrdiff_t ylinesize = frame->linesize[0];
1164+ ptrdiff_t ulinesize = frame->linesize[1];
1165+ ptrdiff_t vlinesize = frame->linesize[2];
11661166
11671167 for (y = 0; y < h; y++) {
11681168 for (x = 0; x < w; x++) {
@@ -1217,9 +1217,9 @@ static void yuvtest_fill_picture16(AVFilterContext *ctx, AVFrame *frame) · 48 unmodified lines
12171217 uint16_t *ydst = (uint16_t *)frame->data[0];
12181218 uint16_t *udst = (uint16_t *)frame->data[1];
12191219 uint16_t *vdst = (uint16_t *)frame->data[2];
1220− int ylinesize = frame->linesize[0] / 2;
1221− int ulinesize = frame->linesize[1] / 2;
1222− int vlinesize = frame->linesize[2] / 2;
1220+ ptrdiff_t ylinesize = frame->linesize[0] / 2;
1221+ ptrdiff_t ulinesize = frame->linesize[1] / 2;
1222+ ptrdiff_t vlinesize = frame->linesize[2] / 2;
12231223
12241224 for (y = 0; y < h; y++) {
12251225 for (x = 0; x < w; x++) {
@@ -1394,7 +1394,7 @@ static void draw_bar(TestSourceContext *test, const uint8_t color[4], · 168 unmodified lines
13941394
13951395 for (plane = 0; frame->data[plane]; plane++) {
13961396 const int c = color[plane];
1397− const int linesize = frame->linesize[plane];
1397+ const ptrdiff_t linesize = frame->linesize[plane];
13981398 int i, px, py, pw, ph;
13991399
14001400 if (plane == 1 || plane == 2) {
@@ -1702,9 +1702,9 @@ AVFILTER_DEFINE_CLASS_EXT(allyuv_allrgb, "allyuv/allrgb", · 301 unmodified lines
17021702
17031703 static void allyuv_fill_picture(AVFilterContext *ctx, AVFrame *frame)
17041704 {
1705− const int ys = frame->linesize[0];
1706− const int us = frame->linesize[1];
1707− const int vs = frame->linesize[2];
1705+ const ptrdiff_t ys = frame->linesize[0];
1706+ const ptrdiff_t us = frame->linesize[1];
1707+ const ptrdiff_t vs = frame->linesize[2];
17081708 int x, y, j;
17091709
17101710 for (y = 0; y < 4096; y++) {
@@ -1763,7 +1763,7 @@ const AVFilter ff_vsrc_allyuv = { · 52 unmodified lines
17631763 static void allrgb_fill_picture(AVFilterContext *ctx, AVFrame *frame)
17641764 {
17651765 unsigned x, y;
1766− const int linesize = frame->linesize[0];
1766+ const ptrdiff_t linesize = frame->linesize[0];
17671767 uint8_t *line = frame->data[0];
17681768
17691769 for (y = 0; y < 4096; y++) {
@@ -2102,9 +2102,9 @@ static int zoneplate_fill_slice_##name(AVFilterContext *ctx, \ · 332 unmodified lines
21022102 const int nkt2t = kt2 * t * t, nktt = kt * t; \
21032103 const int start = (h * job ) / nb_jobs; \
21042104 const int end = (h * (job+1)) / nb_jobs; \
2105− const int ylinesize = frame->linesize[0] / sizeof(type); \
2106− const int ulinesize = frame->linesize[1] / sizeof(type); \
2107− const int vlinesize = frame->linesize[2] / sizeof(type); \
2105+ const ptrdiff_t ylinesize = frame->linesize[0] / sizeof(type); \
2106+ const ptrdiff_t ulinesize = frame->linesize[1] / sizeof(type); \
2107+ const ptrdiff_t vlinesize = frame->linesize[2] / sizeof(type); \
21082108 const int xreset = -(w / 2) - test->xo; \
21092109 const int yreset = -(h / 2) - test->yo + start; \
21102110 const int kU = test->kU, kV = test->kV; \

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