[FFmpeg-devel] [PATCH] lavfi/idet: switch to filter_frame API
Matthieu Bouron
matthieu.bouron at gmail.com
Sat Dec 8 16:47:48 CET 2012
On Fri, Dec 07, 2012 at 07:36:58PM +0100, Stefano Sabatini wrote:
[...]
> This breaks fate-lavfi-idet. Any reason you're passing idet->next
> rather than idet->cur?
Sorry, it's a mistake, new pach updated.
-------------- next part --------------
>From edb964fe216b281b248c02e96eb8bd48f9de1090 Mon Sep 17 00:00:00 2001
From: Matthieu Bouron <matthieu.bouron at gmail.com>
Date: Thu, 6 Dec 2012 21:09:17 +0100
Subject: [PATCH] lavfi/idet: switch to filter_frame API
---
libavfilter/vf_idet.c | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)
diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c
index cc20fac..e56cff4 100644
--- a/libavfilter/vf_idet.c
+++ b/libavfilter/vf_idet.c
@@ -165,7 +165,7 @@ static void filter(AVFilterContext *ctx)
av_log(ctx, AV_LOG_DEBUG, "Single frame:%s, Multi frame:%s\n", type2str(type), type2str(idet->last_type));
}
-static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
+static int filter_frame(AVFilterLink *link, AVFilterBufferRef *picref)
{
AVFilterContext *ctx = link->dst;
IDETContext *idet = ctx->priv;
@@ -175,7 +175,6 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
idet->prev = idet->cur;
idet->cur = idet->next;
idet->next = picref;
- link->cur_buf = NULL;
if (!idet->cur)
return 0;
@@ -183,17 +182,6 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
if (!idet->prev)
idet->prev = avfilter_ref_buffer(idet->cur, ~0);
- return ff_start_frame(ctx->outputs[0], avfilter_ref_buffer(idet->cur, ~0));
-}
-
-static int end_frame(AVFilterLink *link)
-{
- AVFilterContext *ctx = link->dst;
- IDETContext *idet = ctx->priv;
-
- if (!idet->cur)
- return 0;
-
if (!idet->csp)
idet->csp = av_pix_fmt_desc_get(link->format);
if (idet->csp->comp[0].depth_minus1 / 8 == 1)
@@ -201,8 +189,7 @@ static int end_frame(AVFilterLink *link)
filter(ctx);
- ff_draw_slice(ctx->outputs[0], 0, link->h, 1);
- return ff_end_frame(ctx->outputs[0]);
+ return ff_filter_frame(ctx->outputs[0], avfilter_ref_buffer(idet->cur, ~0));
}
static int request_frame(AVFilterLink *link)
@@ -308,15 +295,12 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
return 0;
}
-static int null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) { return 0; }
static const AVFilterPad idet_inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
- .start_frame = start_frame,
- .draw_slice = null_draw_slice,
- .end_frame = end_frame,
+ .filter_frame = filter_frame,
.min_perms = AV_PERM_PRESERVE,
},
{ NULL }
--
1.8.0
More information about the ffmpeg-devel
mailing list