highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/idet: switch to filter_frame API

Browse Source 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
This commit is contained in:
Matthieu Bouron
2012-12-06 21:09:17 +01:00
committed by Stefano Sabatini
parent 5c076205a6
commit 4cd40ef343
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libavfilter/vf_idet.c
View File

@@ -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)); 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; AVFilterContext *ctx = link->dst;
IDETContext *idet = ctx->priv; IDETContext *idet = ctx->priv;
@@ -175,7 +175,6 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
idet->prev = idet->cur; idet->prev = idet->cur;
idet->cur = idet->next; idet->cur = idet->next;
idet->next = picref; idet->next = picref;
link->cur_buf = NULL;
if (!idet->cur) if (!idet->cur)
return 0; return 0;
@@ -183,17 +182,6 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
if (!idet->prev) if (!idet->prev)
idet->prev = avfilter_ref_buffer(idet->cur, ~0); 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) if (!idet->csp)
idet->csp = av_pix_fmt_desc_get(link->format); idet->csp = av_pix_fmt_desc_get(link->format);
if (idet->csp->comp[0].depth_minus1 / 8 == 1) if (idet->csp->comp[0].depth_minus1 / 8 == 1)
@@ -201,8 +189,7 @@ static int end_frame(AVFilterLink *link)
filter(ctx); filter(ctx);
ff_draw_slice(ctx->outputs[0], 0, link->h, 1); return ff_filter_frame(ctx->outputs[0], avfilter_ref_buffer(idet->cur, ~0));
return ff_end_frame(ctx->outputs[0]);
} }
static int request_frame(AVFilterLink *link) static int request_frame(AVFilterLink *link)
@@ -308,15 +295,12 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
return 0; return 0;
} }
static int null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) { return 0; }
static const AVFilterPad idet_inputs[] = { static const AVFilterPad idet_inputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.start_frame = start_frame, .filter_frame = filter_frame,
.draw_slice = null_draw_slice,
.end_frame = end_frame,
.min_perms = AV_PERM_PRESERVE, .min_perms = AV_PERM_PRESERVE,
}, },
{ NULL } { NULL }