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

vf_hqdn3d: switch to filter_frame

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Anton Khirnov 2012-11-28 16:41:17 +01:00 committed by Michael Niedermayer
parent 8227a0b7df
commit 1b43fc127c
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libavfilter/vf_hqdn3d.c
View File

@ -321,46 +321,55 @@ 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)
{ {
HQDN3DContext *hqdn3d = inlink->dst->priv; HQDN3DContext *hqdn3d = inlink->dst->priv;
AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterLink *outlink = inlink->dst->outputs[0];
AVFilterBufferRef *inpic = inlink ->cur_buf;
AVFilterBufferRef *outpic = outlink->out_buf; AVFilterBufferRef *out;
int ret, c; int direct, c;
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 (c = 0; c < 3; c++) { for (c = 0; c < 3; c++) {
denoise(hqdn3d, inpic->data[c], outpic->data[c], denoise(hqdn3d, in->data[c], out->data[c],
hqdn3d->line, &hqdn3d->frame_prev[c], hqdn3d->line, &hqdn3d->frame_prev[c],
inpic->video->w >> (!!c * hqdn3d->hsub), in->video->w >> (!!c * hqdn3d->hsub),
inpic->video->h >> (!!c * hqdn3d->vsub), in->video->h >> (!!c * hqdn3d->vsub),
inpic->linesize[c], outpic->linesize[c], in->linesize[c], out->linesize[c],
hqdn3d->coefs[c?2:0], hqdn3d->coefs[c?3:1]); hqdn3d->coefs[c?2:0], hqdn3d->coefs[c?3:1]);
} }
if ((ret = ff_draw_slice(outlink, 0, inpic->video->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_hqdn3d_inputs[] = { static const AVFilterPad avfilter_vf_hqdn3d_inputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.start_frame = ff_inplace_start_frame,
.draw_slice = null_draw_slice,
.config_props = config_input, .config_props = config_input,
.end_frame = end_frame .filter_frame = filter_frame,
}, },
{ NULL } { NULL }
}; };
static const AVFilterPad avfilter_vf_hqdn3d_outputs[] = { static const AVFilterPad avfilter_vf_hqdn3d_outputs[] = {
{ {
.name = "default", .name = "default",