RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-27 17:53:13 +00:00
Code Issues Projects Releases Wiki Activity

vf_gradfun: switch to filter_frame, this filter did not support slices

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Anton Khirnov 2012-11-28 19:53:50 +01:00 committed by Michael Niedermayer
parent 6325957b28
commit 2a06bc10e7
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libavfilter/vf_gradfun.c
View File

@ -182,20 +182,29 @@ static int config_input(AVFilterLink *inlink)
return 0; return 0;
} }
static int null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
{
return 0;
}
static int end_frame(AVFilterLink *inlink)
{ {
GradFunContext *gf = inlink->dst->priv; GradFunContext *gf = inlink->dst->priv;
AVFilterBufferRef *inpic = inlink->cur_buf;
AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterLink *outlink = inlink->dst->outputs[0];
AVFilterBufferRef *outpic = outlink->out_buf; AVFilterBufferRef *out;
int p, ret; int p, direct;
for (p = 0; p < 4 && inpic->data[p]; p++) { if ((in->perms & AV_PERM_WRITE) && !(in->perms & AV_PERM_PRESERVE)) {
direct = 1;
out = in;
} else {
out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
if (!out) {
avfilter_unref_bufferp(&in);
return AVERROR(ENOMEM);
}
avfilter_copy_buffer_ref_props(out, in);
out->video->w = outlink->w;
out->video->h = outlink->h;
}
for (p = 0; p < 4 && in->data[p]; p++) {
int w = inlink->w; int w = inlink->w;
int h = inlink->h; int h = inlink->h;
int r = gf->radius; int r = gf->radius;
@ -206,15 +215,15 @@ static int end_frame(AVFilterLink *inlink)
} }
if (FFMIN(w, h) > 2 * r) if (FFMIN(w, h) > 2 * r)
filter(gf, outpic->data[p], inpic->data[p], w, h, outpic->linesize[p], inpic->linesize[p], r); filter(gf, out->data[p], in->data[p], w, h, out->linesize[p], in->linesize[p], r);
else if (outpic->data[p] != inpic->data[p]) else if (out->data[p] != in->data[p])
av_image_copy_plane(outpic->data[p], outpic->linesize[p], inpic->data[p], inpic->linesize[p], w, h); av_image_copy_plane(out->data[p], out->linesize[p], in->data[p], in->linesize[p], w, h);
} }
if ((ret = ff_draw_slice(outlink, 0, inlink->h, 1)) < 0 || if (!direct)
(ret = ff_end_frame(outlink)) < 0) avfilter_unref_bufferp(&in);
return ret;
return 0; return ff_filter_frame(outlink, out);
} }
static const AVFilterPad avfilter_vf_gradfun_inputs[] = { static const AVFilterPad avfilter_vf_gradfun_inputs[] = {
@ -222,9 +231,7 @@ static const AVFilterPad avfilter_vf_gradfun_inputs[] = {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.config_props = config_input, .config_props = config_input,
.start_frame = ff_inplace_start_frame, .filter_frame = filter_frame,
.draw_slice = null_draw_slice,
.end_frame = end_frame,
.min_perms = AV_PERM_READ, .min_perms = AV_PERM_READ,
}, },
{ NULL } { NULL }