generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/tile: remove usage of link->{cur,out}_buf.

Browse Source
This commit is contained in:
Clément Bœsch 2012-12-26 20:19:30 +01:00
parent 3b870f973e
commit 4cd724daee
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavfilter/vf_tile.c
View File

@ -40,6 +40,7 @@ typedef struct {
unsigned nb_frames; unsigned nb_frames;
FFDrawContext draw; FFDrawContext draw;
FFDrawColor blank; FFDrawColor blank;
AVFilterBufferRef *out_ref;
} TileContext; } TileContext;
#define REASONABLE_SIZE 1024 #define REASONABLE_SIZE 1024
@ -153,10 +154,9 @@ static int 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; AVFilterBufferRef *out_buf = tile->out_ref;
int ret; int ret;
outlink->out_buf = NULL;
while (tile->current < tile->nb_frames) while (tile->current < tile->nb_frames)
draw_blank_frame(ctx, out_buf); draw_blank_frame(ctx, out_buf);
ret = ff_filter_frame(outlink, out_buf); ret = ff_filter_frame(outlink, out_buf);
@ -176,29 +176,29 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
unsigned x0, y0; unsigned x0, y0;
if (!tile->current) { if (!tile->current) {
outlink->out_buf = ff_get_video_buffer(outlink, AV_PERM_WRITE, tile->out_ref = ff_get_video_buffer(outlink, AV_PERM_WRITE,
outlink->w, outlink->h); outlink->w, outlink->h);
if (!outlink->out_buf) if (!tile->out_ref)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
avfilter_copy_buffer_ref_props(outlink->out_buf, picref); avfilter_copy_buffer_ref_props(tile->out_ref, picref);
outlink->out_buf->video->w = outlink->w; tile->out_ref->video->w = outlink->w;
outlink->out_buf->video->h = outlink->h; tile->out_ref->video->h = outlink->h;
/* fill surface once for margin/padding */ /* fill surface once for margin/padding */
if (tile->margin || tile->padding) if (tile->margin || tile->padding)
ff_fill_rectangle(&tile->draw, &tile->blank, ff_fill_rectangle(&tile->draw, &tile->blank,
outlink->out_buf->data, tile->out_ref->data,
outlink->out_buf->linesize, tile->out_ref->linesize,
0, 0, outlink->w, outlink->h); 0, 0, outlink->w, outlink->h);
} }
get_current_tile_pos(ctx, &x0, &y0); get_current_tile_pos(ctx, &x0, &y0);
ff_copy_rectangle2(&tile->draw, ff_copy_rectangle2(&tile->draw,
outlink->out_buf->data, outlink->out_buf->linesize, tile->out_ref->data, tile->out_ref->linesize,
inlink ->cur_buf->data, inlink ->cur_buf->linesize, picref->data, picref->linesize,
x0, y0, 0, 0, inlink->w, inlink->h); x0, y0, 0, 0, inlink->w, inlink->h);
avfilter_unref_bufferp(&inlink->cur_buf); avfilter_unref_bufferp(&picref);
if (++tile->current == tile->nb_frames) if (++tile->current == tile->nb_frames)
return end_last_frame(ctx); return end_last_frame(ctx);