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

vf_unsharp: 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 21:47:39 +01:00 committed by Michael Niedermayer
parent afded1816b
commit 45eed9b197
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavfilter/vf_unsharp.c
View File

@ -214,36 +214,34 @@ static av_cold void uninit(AVFilterContext *ctx)
free_filter_param(&unsharp->chroma); free_filter_param(&unsharp->chroma);
} }
static int end_frame(AVFilterLink *link) static int filter_frame(AVFilterLink *link, AVFilterBufferRef *in)
{ {
UnsharpContext *unsharp = link->dst->priv; UnsharpContext *unsharp = link->dst->priv;
AVFilterBufferRef *in = link->cur_buf; AVFilterLink *outlink = link->dst->outputs[0];
AVFilterBufferRef *out = link->dst->outputs[0]->out_buf; AVFilterBufferRef *out;
int cw = SHIFTUP(link->w, unsharp->hsub); int cw = SHIFTUP(link->w, unsharp->hsub);
int ch = SHIFTUP(link->h, unsharp->vsub); int ch = SHIFTUP(link->h, unsharp->vsub);
int ret;
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);
apply_unsharp(out->data[0], out->linesize[0], in->data[0], in->linesize[0], link->w, link->h, &unsharp->luma); apply_unsharp(out->data[0], out->linesize[0], in->data[0], in->linesize[0], link->w, link->h, &unsharp->luma);
apply_unsharp(out->data[1], out->linesize[1], in->data[1], in->linesize[1], cw, ch, &unsharp->chroma); apply_unsharp(out->data[1], out->linesize[1], in->data[1], in->linesize[1], cw, ch, &unsharp->chroma);
apply_unsharp(out->data[2], out->linesize[2], in->data[2], in->linesize[2], cw, ch, &unsharp->chroma); apply_unsharp(out->data[2], out->linesize[2], in->data[2], in->linesize[2], cw, ch, &unsharp->chroma);
if ((ret = ff_draw_slice(link->dst->outputs[0], 0, link->h, 1)) < 0 || avfilter_unref_bufferp(&in);
(ret = ff_end_frame(link->dst->outputs[0])) < 0) return ff_filter_frame(outlink, out);
return ret;
return 0;
}
static int draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
{
return 0;
} }
static const AVFilterPad avfilter_vf_unsharp_inputs[] = { static const AVFilterPad avfilter_vf_unsharp_inputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.draw_slice = draw_slice, .filter_frame = filter_frame,
.end_frame = end_frame,
.config_props = config_props, .config_props = config_props,
.min_perms = AV_PERM_READ, .min_perms = AV_PERM_READ,
}, },