Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_drawbox: reindent

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
pull/178/head
Paul B Mahol 9 years ago
parent 5589698e0b
commit 4dc5880381
1 changed files with 42 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      libavfilter/vf_drawbox.c

84
libavfilter/vf_drawbox.c
Unescape View File

@ -240,32 +240,32 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
} }
} }
} else { } else {
for (y = FFMAX(yb, 0); y < frame->height && y < (yb + s->h); y++) { for (y = FFMAX(yb, 0); y < frame->height && y < (yb + s->h); y++) {
row[0] = frame->data[0] + y * frame->linesize[0]; row[0] = frame->data[0] + y * frame->linesize[0];
for (plane = 1; plane < 3; plane++) for (plane = 1; plane < 3; plane++)
row[plane] = frame->data[plane] + row[plane] = frame->data[plane] +
frame->linesize[plane] * (y >> s->vsub); frame->linesize[plane] * (y >> s->vsub);
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 ((y - yb < s->thickness) || (yb + s->h - 1 - y < s->thickness) ||
(x - xb < s->thickness) || (xb + s->w - 1 - x < s->thickness)) (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 ((y - yb < s->thickness) || (yb + s->h - 1 - y < s->thickness) ||
(x - xb < s->thickness) || (xb + s->w - 1 - x < s->thickness)) { (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];
}
} }
} }
} }
} }
}
return ff_filter_frame(inlink->dst->outputs[0], frame); return ff_filter_frame(inlink->dst->outputs[0], frame);
} }
@ -379,30 +379,30 @@ static int drawgrid_filter_frame(AVFilterLink *inlink, AVFrame *frame)
} }
} }
} else { } else {
for (y = 0; y < frame->height; y++) { for (y = 0; y < frame->height; y++) {
row[0] = frame->data[0] + y * frame->linesize[0]; row[0] = frame->data[0] + y * frame->linesize[0];
for (plane = 1; plane < 3; plane++) for (plane = 1; plane < 3; plane++)
row[plane] = frame->data[plane] + row[plane] = frame->data[plane] +
frame->linesize[plane] * (y >> drawgrid->vsub); frame->linesize[plane] * (y >> drawgrid->vsub);
if (drawgrid->invert_color) { if (drawgrid->invert_color) {
for (x = 0; x < frame->width; x++) for (x = 0; x < frame->width; x++)
if (pixel_belongs_to_grid(drawgrid, x, y)) if (pixel_belongs_to_grid(drawgrid, x, y))
row[0][x] = 0xff - row[0][x]; row[0][x] = 0xff - row[0][x];
} else { } else {
for (x = 0; x < frame->width; x++) { for (x = 0; x < frame->width; x++) {
double alpha = (double)drawgrid->yuv_color[A] / 255; double alpha = (double)drawgrid->yuv_color[A] / 255;
if (pixel_belongs_to_grid(drawgrid, x, y)) { if (pixel_belongs_to_grid(drawgrid, x, y)) {
row[0][x ] = (1 - alpha) * row[0][x ] + alpha * drawgrid->yuv_color[Y]; row[0][x ] = (1 - alpha) * row[0][x ] + alpha * drawgrid->yuv_color[Y];
row[1][x >> drawgrid->hsub] = (1 - alpha) * row[1][x >> drawgrid->hsub] + alpha * drawgrid->yuv_color[U]; row[1][x >> drawgrid->hsub] = (1 - alpha) * row[1][x >> drawgrid->hsub] + alpha * drawgrid->yuv_color[U];
row[2][x >> drawgrid->hsub] = (1 - alpha) * row[2][x >> drawgrid->hsub] + alpha * drawgrid->yuv_color[V]; row[2][x >> drawgrid->hsub] = (1 - alpha) * row[2][x >> drawgrid->hsub] + alpha * drawgrid->yuv_color[V];
}
} }
} }
} }
} }
}
return ff_filter_frame(inlink->dst->outputs[0], frame); return ff_filter_frame(inlink->dst->outputs[0], frame);
} }

Write Preview
Loading…
Cancel
Save