highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_drawbox: reduce code duplication

Browse Source
This commit is contained in:
Paul B Mahol
2019-10-01 19:22:17 +02:00
parent a650e8c8e9
commit 027a53dc49
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavfilter/vf_drawbox.c
View File

@ -208,6 +208,12 @@ fail:
return ret; return ret;
} }
static av_pure av_always_inline int pixel_belongs_to_box(DrawBoxContext *s, int x, int y)
{
return (y - s->y < s->thickness) || (s->y + s->h - 1 - y < s->thickness) ||
(x - s->x < s->thickness) || (s->x + s->w - 1 - x < s->thickness);
}
static int filter_frame(AVFilterLink *inlink, AVFrame *frame) static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
{ {
DrawBoxContext *s = inlink->dst->priv; DrawBoxContext *s = inlink->dst->priv;
@ -225,13 +231,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
if (s->invert_color) { if (s->invert_color) {
for (x = FFMAX(xb, 0); x < xb + s->w && x < frame->width; x++) for (x = FFMAX(xb, 0); x < xb + s->w && x < frame->width; x++)
if ((y - yb < s->thickness) || (yb + s->h - 1 - y < s->thickness) || if (pixel_belongs_to_box(s, x, y))
(x - xb < s->thickness) || (xb + s->w - 1 - x < s->thickness))
row[0][x] = 0xff - row[0][x]; row[0][x] = 0xff - row[0][x];
} else { } else {
for (x = FFMAX(xb, 0); x < xb + s->w && x < frame->width; x++) { for (x = FFMAX(xb, 0); x < xb + s->w && x < frame->width; x++) {
if ((y - yb < s->thickness) || (yb + s->h - 1 - y < s->thickness) || if (pixel_belongs_to_box(s, x, y)) {
(x - xb < s->thickness) || (xb + s->w - 1 - x < s->thickness)) {
row[0][x ] = s->yuv_color[Y]; row[0][x ] = s->yuv_color[Y];
row[1][x >> s->hsub] = s->yuv_color[U]; row[1][x >> s->hsub] = s->yuv_color[U];
row[2][x >> s->hsub] = s->yuv_color[V]; row[2][x >> s->hsub] = s->yuv_color[V];
@ -250,15 +254,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
if (s->invert_color) { if (s->invert_color) {
for (x = FFMAX(xb, 0); x < xb + s->w && x < frame->width; x++) for (x = FFMAX(xb, 0); x < xb + s->w && x < frame->width; x++)
if ((y - yb < s->thickness) || (yb + s->h - 1 - y < s->thickness) || if (pixel_belongs_to_box(s, x, y))
(x - xb < s->thickness) || (xb + s->w - 1 - x < s->thickness))
row[0][x] = 0xff - row[0][x]; row[0][x] = 0xff - row[0][x];
} else { } else {
for (x = FFMAX(xb, 0); x < xb + s->w && x < frame->width; x++) { for (x = FFMAX(xb, 0); x < xb + s->w && x < frame->width; x++) {
double alpha = (double)s->yuv_color[A] / 255; double alpha = (double)s->yuv_color[A] / 255;
if ((y - yb < s->thickness) || (yb + s->h - 1 - y < s->thickness) || if (pixel_belongs_to_box(s, x, y)) {
(x - xb < s->thickness) || (xb + s->w - 1 - x < s->thickness)) {
row[0][x ] = (1 - alpha) * row[0][x ] + alpha * s->yuv_color[Y]; row[0][x ] = (1 - alpha) * row[0][x ] + alpha * s->yuv_color[Y];
row[1][x >> s->hsub] = (1 - alpha) * row[1][x >> s->hsub] + alpha * s->yuv_color[U]; row[1][x >> s->hsub] = (1 - alpha) * row[1][x >> s->hsub] + alpha * s->yuv_color[U];
row[2][x >> s->hsub] = (1 - alpha) * row[2][x >> s->hsub] + alpha * s->yuv_color[V]; row[2][x >> s->hsub] = (1 - alpha) * row[2][x >> s->hsub] + alpha * s->yuv_color[V];