har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vf_tile: fix output buffer ownership.

Browse Source 
There is no need to start_frame immediately on the output link
since the rest is only done with the last frame of the tile.
link->out_buf is now automatically dereferenced; since we give
it away it must be cleared.

Fix an assert failure; found by Clément Bœsch.
This commit is contained in:
Nicolas George 2012-08-01 12:23:48 +02:00
parent 7ddf082f04
commit f952b23ed4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/vf_tile.c
View File

@ -109,7 +109,7 @@ static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
avfilter_copy_buffer_ref_props(outlink->out_buf, picref); avfilter_copy_buffer_ref_props(outlink->out_buf, picref);
outlink->out_buf->video->w = outlink->w; outlink->out_buf->video->w = outlink->w;
outlink->out_buf->video->h = outlink->h; outlink->out_buf->video->h = outlink->h;
return ff_start_frame(outlink, outlink->out_buf); return 0;
} }
static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
@ -129,16 +129,15 @@ static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
return 0; return 0;
} }
static void draw_blank_frame(AVFilterContext *ctx) static void draw_blank_frame(AVFilterContext *ctx, AVFilterBufferRef *out_buf)
{ {
TileContext *tile = ctx->priv; TileContext *tile = ctx->priv;
AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *inlink = ctx->inputs[0];
AVFilterLink *outlink = ctx->outputs[0];
unsigned x0 = inlink->w * (tile->current % tile->w); unsigned x0 = inlink->w * (tile->current % tile->w);
unsigned y0 = inlink->h * (tile->current / tile->w); unsigned y0 = inlink->h * (tile->current / tile->w);
ff_fill_rectangle(&tile->draw, &tile->blank, ff_fill_rectangle(&tile->draw, &tile->blank,
outlink->out_buf->data, outlink->out_buf->linesize, out_buf->data, out_buf->linesize,
x0, y0, inlink->w, inlink->h); x0, y0, inlink->w, inlink->h);
tile->current++; tile->current++;
} }
@ -146,10 +145,13 @@ static void end_last_frame(AVFilterContext *ctx)
{ {
TileContext *tile = ctx->priv; TileContext *tile = ctx->priv;
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
AVFilterBufferRef *out_buf = outlink->out_buf;
outlink->out_buf = NULL;
ff_start_frame(outlink, out_buf);
while (tile->current < tile->w * tile->h) while (tile->current < tile->w * tile->h)
draw_blank_frame(ctx); draw_blank_frame(ctx, out_buf);
ff_draw_slice(outlink, 0, outlink->out_buf->video->h, 1); ff_draw_slice(outlink, 0, out_buf->video->h, 1);
ff_end_frame(outlink); ff_end_frame(outlink);
tile->current = 0; tile->current = 0;
} }