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

lavfi/vf_tile: forward errors.

Browse Source
This commit is contained in:
Nicolas George
2012-11-29 17:13:06 +01:00
parent 3b316247fb
commit 24cb1f9718
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/vf_tile.c
View File

@@ -149,17 +149,19 @@ static void draw_blank_frame(AVFilterContext *ctx, AVFilterBufferRef *out_buf)
x0, y0, inlink->w, inlink->h); x0, y0, inlink->w, inlink->h);
tile->current++; tile->current++;
} }
static void end_last_frame(AVFilterContext *ctx) 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 = outlink->out_buf;
int ret;
outlink->out_buf = NULL; 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);
ff_filter_frame(outlink, out_buf); ret = ff_filter_frame(outlink, out_buf);
tile->current = 0; tile->current = 0;
return ret;
} }
/* Note: direct rendering is not possible since there is no guarantee that /* Note: direct rendering is not possible since there is no guarantee that
@@ -198,7 +200,7 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
avfilter_unref_bufferp(&inlink->cur_buf); avfilter_unref_bufferp(&inlink->cur_buf);
if (++tile->current == tile->nb_frames) if (++tile->current == tile->nb_frames)
end_last_frame(ctx); return end_last_frame(ctx);
return 0; return 0;
} }
@@ -214,15 +216,13 @@ static int request_frame(AVFilterLink *outlink)
r = ff_request_frame(inlink); r = ff_request_frame(inlink);
if (r < 0) { if (r < 0) {
if (r == AVERROR_EOF && tile->current) if (r == AVERROR_EOF && tile->current)
end_last_frame(ctx); r = end_last_frame(ctx);
else
return r;
break; break;
} }
if (!tile->current) /* done */ if (!tile->current) /* done */
break; break;
} }
return 0; return r;
} }
static const AVFilterPad tile_inputs[] = { static const AVFilterPad tile_inputs[] = {