Commit cc914885 authored by Michael Niedermayer's avatar Michael Niedermayer

avfilter/vf_cropdetect: Factorize duplicated code using a macro

This simplifies subsequent changes
Reviewed-by: 's avatarBenoit Fouet <benoit.fouet@free.fr>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent ed96830a
...@@ -137,33 +137,19 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) ...@@ -137,33 +137,19 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
s->frame_nb = 1; s->frame_nb = 1;
} }
for (y = 0; y < s->y1; y++) { #define FIND(DST, FROM, NOEND, INC, STEP0, STEP1, LEN) \
if (checkline(ctx, frame->data[0] + frame->linesize[0] * y, bpp, frame->width, bpp) > s->limit) { for (y = FROM; NOEND; INC) {\
s->y1 = y; if (checkline(ctx, frame->data[0] + STEP0 * y, STEP1, LEN, bpp) > s->limit) {\
break; DST = y;\
} break;\
} }\
for (y = frame->height - 1; y > FFMAX(s->y2, s->y1); y--) {
if (checkline(ctx, frame->data[0] + frame->linesize[0] * y, bpp, frame->width, bpp) > s->limit) {
s->y2 = y;
break;
}
} }
for (y = 0; y < s->x1; y++) { FIND(s->y1, 0, y < s->y1, y++, frame->linesize[0], bpp, frame->width);
if (checkline(ctx, frame->data[0] + bpp*y, frame->linesize[0], frame->height, bpp) > s->limit) { FIND(s->y2, frame->height - 1, y > FFMAX(s->y2, s->y1), y--, frame->linesize[0], bpp, frame->width);
s->x1 = y; FIND(s->x1, 0, y < s->x1, y++, bpp, frame->linesize[0], frame->height);
break; FIND(s->x2, frame->width - 1, y > FFMAX(s->x2, s->x1), y--, bpp, frame->linesize[0], frame->height);
}
}
for (y = frame->width - 1; y > FFMAX(s->x2, s->x1); y--) {
if (checkline(ctx, frame->data[0] + bpp*y, frame->linesize[0], frame->height, bpp) > s->limit) {
s->x2 = y;
break;
}
}
// round x and y (up), important for yuv colorspaces // round x and y (up), important for yuv colorspaces
// make sure they stay rounded! // make sure they stay rounded!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment