MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/vf_alphamerge: switch to activate

Browse Source
This commit is contained in:
Paul B Mahol 2018-11-11 12:29:03 +01:00
parent 43cc2e39c0
commit 29f2893318
1 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
libavfilter/vf_alphamerge.c
View File

@ -28,9 +28,9 @@
#include "libavutil/imgutils.h"
#include "libavutil/pixfmt.h"
#include "avfilter.h"
#include "bufferqueue.h"
#include "drawutils.h"
#include "formats.h"
#include "filters.h"
#include "internal.h"
#include "video.h"
@ -39,17 +39,10 @@ enum { Y, U, V, A };
typedef struct AlphaMergeContext {
int is_packed_rgb;
uint8_t rgba_map[4];
struct FFBufQueue queue_main;
struct FFBufQueue queue_alpha;
AVFrame *main_frame;
AVFrame *alpha_frame;
} AlphaMergeContext;
static av_cold void uninit(AVFilterContext *ctx)
{
AlphaMergeContext *merge = ctx->priv;
ff_bufqueue_discard_all(&merge->queue_main);
ff_bufqueue_discard_all(&merge->queue_alpha);
}
static int query_formats(AVFilterContext *ctx)
{
static const enum AVPixelFormat main_fmts[] = {
@ -140,44 +133,54 @@ static void draw_frame(AVFilterContext *ctx,
}
}
static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
static int activate(AVFilterContext *ctx)
{
AVFilterContext *ctx = inlink->dst;
AlphaMergeContext *merge = ctx->priv;
AVFilterLink *outlink = ctx->outputs[0];
AlphaMergeContext *s = ctx->priv;
int ret;
int ret = 0;
int is_alpha = (inlink == ctx->inputs[1]);
struct FFBufQueue *queue =
(is_alpha ? &merge->queue_alpha : &merge->queue_main);
ff_bufqueue_add(ctx, queue, buf);
FF_FILTER_FORWARD_STATUS_BACK_ALL(outlink, ctx);
do {
AVFrame *main_buf, *alpha_buf;
if (!s->main_frame) {
ret = ff_inlink_consume_frame(ctx->inputs[0], &s->main_frame);
if (ret < 0)
return ret;
}
if (!ff_bufqueue_peek(&merge->queue_main, 0) ||
!ff_bufqueue_peek(&merge->queue_alpha, 0)) break;
if (!s->alpha_frame) {
ret = ff_inlink_consume_frame(ctx->inputs[1], &s->alpha_frame);
if (ret < 0)
return ret;
}
main_buf = ff_bufqueue_get(&merge->queue_main);
alpha_buf = ff_bufqueue_get(&merge->queue_alpha);
if (s->main_frame && s->alpha_frame) {
if (ret > 0) {
draw_frame(ctx, s->main_frame, s->alpha_frame);
ret = ff_filter_frame(outlink, s->main_frame);
av_frame_free(&s->alpha_frame);
s->main_frame = NULL;
return ret;
}
}
draw_frame(ctx, main_buf, alpha_buf);
ret = ff_filter_frame(ctx->outputs[0], main_buf);
av_frame_free(&alpha_buf);
} while (ret >= 0);
return ret;
}
FF_FILTER_FORWARD_STATUS(ctx->inputs[0], outlink);
FF_FILTER_FORWARD_STATUS(ctx->inputs[1], outlink);
static int request_frame(AVFilterLink *outlink)
{
AVFilterContext *ctx = outlink->src;
AlphaMergeContext *merge = ctx->priv;
int in, ret;
if (ff_outlink_frame_wanted(ctx->outputs[0]) &&
!ff_outlink_get_status(ctx->inputs[0]) &&
!s->main_frame) {
ff_inlink_request_frame(ctx->inputs[0]);
return 0;
}
in = ff_bufqueue_peek(&merge->queue_main, 0) ? 1 : 0;
ret = ff_request_frame(ctx->inputs[in]);
if (ret < 0)
return ret;
return 0;
if (ff_outlink_frame_wanted(ctx->outputs[0]) &&
!ff_outlink_get_status(ctx->inputs[1]) &&
!s->alpha_frame) {
ff_inlink_request_frame(ctx->inputs[1]);
return 0;
}
return FFERROR_NOT_READY;
}
static const AVFilterPad alphamerge_inputs[] = {
@ -185,12 +188,10 @@ static const AVFilterPad alphamerge_inputs[] = {
.name = "main",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_input_main,
.filter_frame = filter_frame,
.needs_writable = 1,
},{
.name = "alpha",
.type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
},
{ NULL }
};
@ -200,7 +201,6 @@ static const AVFilterPad alphamerge_outputs[] = {
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_output,
.request_frame = request_frame,
},
{ NULL }
};
@ -209,9 +209,9 @@ AVFilter ff_vf_alphamerge = {
.name = "alphamerge",
.description = NULL_IF_CONFIG_SMALL("Copy the luma value of the second "
"input into the alpha channel of the first input."),
.uninit = uninit,
.priv_size = sizeof(AlphaMergeContext),
.query_formats = query_formats,
.inputs = alphamerge_inputs,
.outputs = alphamerge_outputs,
.activate = activate,
};