X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_alphamerge.c;h=9b01db6605239e25931b92b18a8cdba40df57ba3;hb=a04ad248a05e7b613abe09b3bb067f555108d794;hp=c5602b62278114d466c1399a5982692296d1f5db;hpb=5c363d3e595a9e5b7c42897b7aab91b91b154ac1;p=ffmpeg diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c index c5602b62278..9b01db66052 100644 --- a/libavfilter/vf_alphamerge.c +++ b/libavfilter/vf_alphamerge.c @@ -26,23 +26,71 @@ #include #include "libavutil/imgutils.h" +#include "libavutil/opt.h" #include "libavutil/pixfmt.h" #include "avfilter.h" #include "drawutils.h" #include "formats.h" #include "filters.h" +#include "framesync.h" #include "internal.h" #include "video.h" enum { Y, U, V, A }; typedef struct AlphaMergeContext { + const AVClass *class; + int is_packed_rgb; uint8_t rgba_map[4]; - AVFrame *main_frame; - AVFrame *alpha_frame; + + FFFrameSync fs; } AlphaMergeContext; +static int do_alphamerge(FFFrameSync *fs) +{ + AVFilterContext *ctx = fs->parent; + AlphaMergeContext *s = ctx->priv; + AVFrame *main_buf, *alpha_buf; + int ret; + + ret = ff_framesync_dualinput_get_writable(fs, &main_buf, &alpha_buf); + if (ret < 0) + return ret; + if (!alpha_buf) + return ff_filter_frame(ctx->outputs[0], main_buf); + + if (s->is_packed_rgb) { + int x, y; + uint8_t *pin, *pout; + for (y = 0; y < main_buf->height; y++) { + pin = alpha_buf->data[0] + y * alpha_buf->linesize[0]; + pout = main_buf->data[0] + y * main_buf->linesize[0] + s->rgba_map[A]; + for (x = 0; x < main_buf->width; x++) { + *pout = *pin; + pin += 1; + pout += 4; + } + } + } else { + const int main_linesize = main_buf->linesize[A]; + const int alpha_linesize = alpha_buf->linesize[Y]; + av_image_copy_plane(main_buf->data[A], main_linesize, + alpha_buf->data[Y], alpha_linesize, + FFMIN(main_linesize, alpha_linesize), alpha_buf->height); + } + + return ff_filter_frame(ctx->outputs[0], main_buf); +} + +static av_cold int init(AVFilterContext *ctx) +{ + AlphaMergeContext *s = ctx->priv; + + s->fs.on_event = do_alphamerge; + return 0; +} + static int query_formats(AVFilterContext *ctx) { static const enum AVPixelFormat main_fmts[] = { @@ -52,34 +100,22 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_NONE }; static const enum AVPixelFormat alpha_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }; - AVFilterFormats *main_formats = NULL, *alpha_formats = NULL; + AVFilterFormats *main_formats = ff_make_format_list(main_fmts); int ret; - if (!(main_formats = ff_make_format_list(main_fmts)) || - !(alpha_formats = ff_make_format_list(alpha_fmts))) { - ret = AVERROR(ENOMEM); - goto fail; - } - if ((ret = ff_formats_ref(main_formats , &ctx->inputs[0]->out_formats)) < 0 || - (ret = ff_formats_ref(alpha_formats, &ctx->inputs[1]->out_formats)) < 0 || - (ret = ff_formats_ref(main_formats , &ctx->outputs[0]->in_formats)) < 0) - goto fail; - return 0; -fail: - if (main_formats) - av_freep(&main_formats->formats); - av_freep(&main_formats); - if (alpha_formats) - av_freep(&alpha_formats->formats); - av_freep(&alpha_formats); - return ret; + if ((ret = ff_formats_ref(main_formats, &ctx->inputs[0]->outcfg.formats)) < 0 || + (ret = ff_formats_ref(main_formats, &ctx->outputs[0]->incfg.formats)) < 0) + return ret; + + return ff_formats_ref(ff_make_format_list(alpha_fmts), + &ctx->inputs[1]->outcfg.formats); } static int config_input_main(AVFilterLink *inlink) { - AlphaMergeContext *merge = inlink->dst->priv; - merge->is_packed_rgb = - ff_fill_rgba_map(merge->rgba_map, inlink->format) >= 0 && + AlphaMergeContext *s = inlink->dst->priv; + s->is_packed_rgb = + ff_fill_rgba_map(s->rgba_map, inlink->format) >= 0 && inlink->format != AV_PIX_FMT_GBRAP; return 0; } @@ -87,8 +123,11 @@ static int config_input_main(AVFilterLink *inlink) static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; + AlphaMergeContext *s = ctx->priv; AVFilterLink *mainlink = ctx->inputs[0]; AVFilterLink *alphalink = ctx->inputs[1]; + int ret; + if (mainlink->w != alphalink->w || mainlink->h != alphalink->h) { av_log(ctx, AV_LOG_ERROR, "Input frame sizes do not match (%dx%d vs %dx%d).\n", @@ -97,88 +136,29 @@ static int config_output(AVFilterLink *outlink) return AVERROR(EINVAL); } + if ((ret = ff_framesync_init_dualinput(&s->fs, ctx)) < 0) + return ret; + outlink->w = mainlink->w; outlink->h = mainlink->h; outlink->time_base = mainlink->time_base; outlink->sample_aspect_ratio = mainlink->sample_aspect_ratio; outlink->frame_rate = mainlink->frame_rate; - return 0; -} - -static void draw_frame(AVFilterContext *ctx, - AVFrame *main_buf, - AVFrame *alpha_buf) -{ - AlphaMergeContext *merge = ctx->priv; - int h = main_buf->height; - if (merge->is_packed_rgb) { - int x, y; - uint8_t *pin, *pout; - for (y = 0; y < h; y++) { - pin = alpha_buf->data[0] + y * alpha_buf->linesize[0]; - pout = main_buf->data[0] + y * main_buf->linesize[0] + merge->rgba_map[A]; - for (x = 0; x < main_buf->width; x++) { - *pout = *pin; - pin += 1; - pout += 4; - } - } - } else { - const int main_linesize = main_buf->linesize[A]; - const int alpha_linesize = alpha_buf->linesize[Y]; - av_image_copy_plane(main_buf->data[A], main_linesize, - alpha_buf->data[Y], alpha_linesize, - FFMIN(main_linesize, alpha_linesize), alpha_buf->height); - } + return ff_framesync_configure(&s->fs); } static int activate(AVFilterContext *ctx) { - AVFilterLink *outlink = ctx->outputs[0]; AlphaMergeContext *s = ctx->priv; - int ret; - - FF_FILTER_FORWARD_STATUS_BACK_ALL(outlink, ctx); - - if (!s->main_frame) { - ret = ff_inlink_consume_frame(ctx->inputs[0], &s->main_frame); - if (ret < 0) - return ret; - } - - if (!s->alpha_frame) { - ret = ff_inlink_consume_frame(ctx->inputs[1], &s->alpha_frame); - if (ret < 0) - return ret; - } - - if (s->main_frame && s->alpha_frame) { - 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; - } - - FF_FILTER_FORWARD_STATUS(ctx->inputs[0], outlink); - FF_FILTER_FORWARD_STATUS(ctx->inputs[1], outlink); - - 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; - } + return ff_framesync_activate(&s->fs); +} - 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; - } +static av_cold void uninit(AVFilterContext *ctx) +{ + AlphaMergeContext *s = ctx->priv; - return FFERROR_NOT_READY; + ff_framesync_uninit(&s->fs); } static const AVFilterPad alphamerge_inputs[] = { @@ -186,7 +166,6 @@ static const AVFilterPad alphamerge_inputs[] = { .name = "main", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input_main, - .needs_writable = 1, },{ .name = "alpha", .type = AVMEDIA_TYPE_VIDEO, @@ -203,13 +182,24 @@ static const AVFilterPad alphamerge_outputs[] = { { NULL } }; -AVFilter ff_vf_alphamerge = { +static const AVOption alphamerge_options[] = { + { NULL } +}; + +FRAMESYNC_DEFINE_CLASS(alphamerge, AlphaMergeContext, fs); + +const 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."), + .preinit = alphamerge_framesync_preinit, .priv_size = sizeof(AlphaMergeContext), + .priv_class = &alphamerge_class, + .init = init, .query_formats = query_formats, .inputs = alphamerge_inputs, .outputs = alphamerge_outputs, + .uninit = uninit, .activate = activate, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, };