diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-11-27 07:49:45 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-11-28 08:50:19 +0100 |
| commit | 565e4993c63f797e2d50ad2f1e8f62fdbe299666 (patch) | |
| tree | bae5282b2ee875de4b01467f3cfaab54b0ab6ec0 /libavfilter/vf_drawbox.c | |
| parent | bb6c67bb36b136de10256f0999128df4a42f9ffc (diff) | |
| download | ffmpeg-565e4993c63f797e2d50ad2f1e8f62fdbe299666.tar.gz | |
lavfi: merge start_frame/draw_slice/end_frame
Any alleged performance benefits gained from the split are purely
mythological and do not justify added code complexity.
Diffstat (limited to 'libavfilter/vf_drawbox.c')
| -rw-r--r-- | libavfilter/vf_drawbox.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index fbae0ee841..c47422ef1b 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -96,21 +96,20 @@ static int config_input(AVFilterLink *inlink) return 0; } -static int draw_slice(AVFilterLink *inlink, int y0, int h, int slice_dir) +static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame) { DrawBoxContext *drawbox = inlink->dst->priv; int plane, x, y, xb = drawbox->x, yb = drawbox->y; unsigned char *row[4]; - AVFilterBufferRef *picref = inlink->cur_buf; - for (y = FFMAX(yb, y0); y < (y0 + h) && y < (yb + drawbox->h); y++) { - row[0] = picref->data[0] + y * picref->linesize[0]; + for (y = FFMAX(yb, 0); y < frame->video->h && y < (yb + drawbox->h); y++) { + row[0] = frame->data[0] + y * frame->linesize[0]; for (plane = 1; plane < 3; plane++) - row[plane] = picref->data[plane] + - picref->linesize[plane] * (y >> drawbox->vsub); + row[plane] = frame->data[plane] + + frame->linesize[plane] * (y >> drawbox->vsub); - for (x = FFMAX(xb, 0); x < (xb + drawbox->w) && x < picref->video->w; x++) { + for (x = FFMAX(xb, 0); x < (xb + drawbox->w) && x < frame->video->w; x++) { double alpha = (double)drawbox->yuv_color[A] / 255; if ((y - yb < 3) || (yb + drawbox->h - y < 4) || @@ -122,7 +121,7 @@ static int draw_slice(AVFilterLink *inlink, int y0, int h, int slice_dir) } } - return ff_draw_slice(inlink->dst->outputs[0], y0, h, 1); + return ff_filter_frame(inlink->dst->outputs[0], frame); } static const AVFilterPad avfilter_vf_drawbox_inputs[] = { @@ -131,9 +130,7 @@ static const AVFilterPad avfilter_vf_drawbox_inputs[] = { .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input, .get_video_buffer = ff_null_get_video_buffer, - .start_frame = ff_null_start_frame, - .draw_slice = draw_slice, - .end_frame = ff_null_end_frame, + .filter_frame = filter_frame, .min_perms = AV_PERM_WRITE | AV_PERM_READ, .rej_perms = AV_PERM_PRESERVE }, |