har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_fieldmatch: switch to activate

Browse Source 
Unbreaks ppsrc filtering.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2018-04-29 14:57:53 +02:00
parent 889d858491
commit a5b2d85f18
1 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
libavfilter/vf_fieldmatch.c
View File

@ -37,6 +37,7 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/timestamp.h" #include "libavutil/timestamp.h"
#include "avfilter.h" #include "avfilter.h"
#include "filters.h"
#include "internal.h" #include "internal.h"
#define INPUT_MAIN 0 #define INPUT_MAIN 0
@ -697,9 +698,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
av_assert0(prv && src && nxt); \ av_assert0(prv && src && nxt); \
} while (0) } while (0)
if (FF_INLINK_IDX(inlink) == INPUT_MAIN) { if (FF_INLINK_IDX(inlink) == INPUT_MAIN) {
av_assert0(fm->got_frame[INPUT_MAIN] == 0);
SLIDING_FRAME_WINDOW(fm->prv, fm->src, fm->nxt); SLIDING_FRAME_WINDOW(fm->prv, fm->src, fm->nxt);
fm->got_frame[INPUT_MAIN] = 1; fm->got_frame[INPUT_MAIN] = 1;
} else { } else {
av_assert0(fm->got_frame[INPUT_CLEANSRC] == 0);
SLIDING_FRAME_WINDOW(fm->prv2, fm->src2, fm->nxt2); SLIDING_FRAME_WINDOW(fm->prv2, fm->src2, fm->nxt2);
fm->got_frame[INPUT_CLEANSRC] = 1; fm->got_frame[INPUT_CLEANSRC] = 1;
} }
@ -818,36 +821,53 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
return ff_filter_frame(outlink, dst); return ff_filter_frame(outlink, dst);
} }
static int request_inlink(AVFilterContext *ctx, int lid) static int activate(AVFilterContext *ctx)
{ {
int ret = 0;
FieldMatchContext *fm = ctx->priv; FieldMatchContext *fm = ctx->priv;
AVFrame *frame = NULL;
int ret = 0, status;
int64_t pts;
if (!fm->got_frame[lid]) { if ((fm->got_frame[INPUT_MAIN] == 0) &&
AVFilterLink *inlink = ctx->inputs[lid]; (ret = ff_inlink_consume_frame(ctx->inputs[INPUT_MAIN], &frame)) > 0) {
ret = ff_request_frame(inlink); ret = filter_frame(ctx->inputs[INPUT_MAIN], frame);
if (ret == AVERROR_EOF) { // flushing if (ret < 0)
fm->eof |= 1 << lid; return ret;
ret = filter_frame(inlink, NULL);
} }
if (ret < 0)
return ret;
if (fm->ppsrc &&
(fm->got_frame[INPUT_CLEANSRC] == 0) &&
(ret = ff_inlink_consume_frame(ctx->inputs[INPUT_CLEANSRC], &frame)) > 0) {
ret = filter_frame(ctx->inputs[INPUT_CLEANSRC], frame);
if (ret < 0)
return ret;
} }
if (ret < 0) {
return ret; return ret;
} } else if (ff_inlink_acknowledge_status(ctx->inputs[INPUT_MAIN], &status, &pts)) {
if (status == AVERROR_EOF) { // flushing
static int request_frame(AVFilterLink *outlink) fm->eof |= 1 << INPUT_MAIN;
{ ret = filter_frame(ctx->inputs[INPUT_MAIN], NULL);
int ret; }
AVFilterContext *ctx = outlink->src; ff_outlink_set_status(ctx->outputs[0], status, pts);
FieldMatchContext *fm = ctx->priv;
const uint32_t eof_mask = 1<<INPUT_MAIN | fm->ppsrc<<INPUT_CLEANSRC;
if ((fm->eof & eof_mask) == eof_mask) // flush done?
return AVERROR_EOF;
if ((ret = request_inlink(ctx, INPUT_MAIN)) < 0)
return ret; return ret;
if (fm->ppsrc && (ret = request_inlink(ctx, INPUT_CLEANSRC)) < 0) } else if (fm->ppsrc && ff_inlink_acknowledge_status(ctx->inputs[INPUT_CLEANSRC], &status, &pts)) {
if (status == AVERROR_EOF) { // flushing
fm->eof |= 1 << INPUT_CLEANSRC;
ret = filter_frame(ctx->inputs[INPUT_CLEANSRC], NULL);
}
ff_outlink_set_status(ctx->outputs[0], status, pts);
return ret; return ret;
} else {
if (ff_outlink_frame_wanted(ctx->outputs[0])) {
if (fm->got_frame[INPUT_MAIN] == 0)
ff_inlink_request_frame(ctx->inputs[INPUT_MAIN]);
if (fm->ppsrc && (fm->got_frame[INPUT_CLEANSRC] == 0))
ff_inlink_request_frame(ctx->inputs[INPUT_CLEANSRC]);
}
return 0; return 0;
}
} }
static int query_formats(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx)
@ -901,7 +921,6 @@ static av_cold int fieldmatch_init(AVFilterContext *ctx)
AVFilterPad pad = { AVFilterPad pad = {
.name = av_strdup("main"), .name = av_strdup("main"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
.config_props = config_input, .config_props = config_input,
}; };
int ret; int ret;
@ -975,7 +994,6 @@ static const AVFilterPad fieldmatch_outputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.request_frame = request_frame,
.config_props = config_output, .config_props = config_output,
}, },
{ NULL } { NULL }
@ -987,6 +1005,7 @@ AVFilter ff_vf_fieldmatch = {
.query_formats = query_formats, .query_formats = query_formats,
.priv_size = sizeof(FieldMatchContext), .priv_size = sizeof(FieldMatchContext),
.init = fieldmatch_init, .init = fieldmatch_init,
.activate = activate,
.uninit = fieldmatch_uninit, .uninit = fieldmatch_uninit,
.inputs = NULL, .inputs = NULL,
.outputs = fieldmatch_outputs, .outputs = fieldmatch_outputs,