RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-02 10:41:16 +00:00
Code Issues Projects Releases Wiki Activity

lavfi/decimate: switch to ff_filter_frame() API

Browse Source
This commit is contained in:
Stefano Sabatini 2012-12-02 01:20:31 +01:00
parent 217163eb98
commit 3d72820722
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavfilter/vf_decimate.c
View File

@ -187,14 +187,9 @@ static int config_input(AVFilterLink *inlink)
return 0; return 0;
} }
static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) { return 0; } static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *cur)
static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) { return 0; }
static int end_frame(AVFilterLink *inlink)
{ {
DecimateContext *decimate = inlink->dst->priv; DecimateContext *decimate = inlink->dst->priv;
AVFilterBufferRef *cur = inlink->cur_buf;
AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterLink *outlink = inlink->dst->outputs[0];
int ret; int ret;
@ -206,10 +201,7 @@ static int end_frame(AVFilterLink *inlink)
inlink->cur_buf = NULL; inlink->cur_buf = NULL;
decimate->drop_count = FFMIN(-1, decimate->drop_count-1); decimate->drop_count = FFMIN(-1, decimate->drop_count-1);
if ((ret = ff_start_frame(outlink, if (ret = ff_filter_frame(outlink, avfilter_ref_buffer(cur, ~AV_PERM_WRITE)) < 0)
avfilter_ref_buffer(cur, ~AV_PERM_WRITE)) < 0) ||
(ret = ff_draw_slice(outlink, 0, inlink->h, 1)) < 0 ||
(ret = ff_end_frame(outlink)) < 0)
return ret; return ret;
} }
@ -219,6 +211,9 @@ static int end_frame(AVFilterLink *inlink)
av_ts2str(cur->pts), av_ts2timestr(cur->pts, &inlink->time_base), av_ts2str(cur->pts), av_ts2timestr(cur->pts, &inlink->time_base),
decimate->drop_count); decimate->drop_count);
if (decimate->drop_count > 0)
avfilter_unref_buffer(cur);
return 0; return 0;
} }
@ -241,9 +236,7 @@ static const AVFilterPad decimate_inputs[] = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer = ff_null_get_video_buffer, .get_video_buffer = ff_null_get_video_buffer,
.config_props = config_input, .config_props = config_input,
.start_frame = start_frame, .filter_frame = filter_frame,
.draw_slice = draw_slice,
.end_frame = end_frame,
.min_perms = AV_PERM_READ | AV_PERM_PRESERVE, .min_perms = AV_PERM_READ | AV_PERM_PRESERVE,
}, },
{ NULL } { NULL }