From patchwork Wed Oct 9 10:17:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 15622 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1AC5C448B76 for ; Wed, 9 Oct 2019 13:17:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F02D76881F7; Wed, 9 Oct 2019 13:17:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 582A16881DC for ; Wed, 9 Oct 2019 13:17:25 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id q9so2130681wrm.8 for ; Wed, 09 Oct 2019 03:17:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=IVeNUvu5ohUJ50d60sSPUigChq5uvKf6IG4oJOMFTWM=; b=kNBGKRDhf+ysEHDIcezbtf1irOmY2s+A5t0547W0IYaDxoSyyEe2UVrvepoHipa9ZJ dkJPNLy5I/DXQfpLvWuBzCIVtEc9a4wUuB8bLpF3BkwxMHuS5AJW+XM8hEnK+GWBVEXj GBzKUUeoSydqmNhET65LVg31UTm4jnAy4f4OarougcbCDLEmZAL1TiaUmvXFd0BVhefl NMbkO5tI77JPHi6UG6v9l3r1pLG5fFORsD0b4J/MkMjM6Px2iILgH1nU9o4MOlS5HkC8 ugT0zCjfI01oF7USL+3L7Ror4SyGuPE/1tEBdPNIFReor3Xch2pM2pQGAgLX0aQnuiZX ropg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=IVeNUvu5ohUJ50d60sSPUigChq5uvKf6IG4oJOMFTWM=; b=DhjDfMpojPxYVP7fa+oHXJoQtU2YO/JUaD023mfMh7jSEsYHmGM9N8NZBzSZua76wS ElRa3JV89uWuK3CaERNbqy3dNMSk91N4iNteUaa45lszHHZbBQoq9JIgtqirIdX33bcX JRg5CTKqjqk5tQNmPxsI2vPB1nTZE0j8eDSiofEzKtFPeowlylM6v2d3Qk06to2Vc0Qj B6plrCMXpQCao1/5OGYVs/+2svPe+clQbkLFtEpRF8yhl8ZqvKs5gzIDDoIe8dz7I1RT bpxAP/pLCx21Cnnn0UT4mqyLqp542bb105pufqkxiERxUiu/PVCUGsnfcIbrGibSaAn9 7gcA== X-Gm-Message-State: APjAAAUvka3KIsaJQ/2FYkk5kRzhU3HISbvH5EMjc3Z1wYWak2Oh1Rkw upD4iN/ZK4GjubfQwzkkoqIO8Q3x X-Google-Smtp-Source: APXvYqzelQ6IEb2QB7jCRSuwxPsbz3yQZUdTLUu5zewwXOyIdB5MyHcMLvL0gOP0lGiWhbc7kdTJgw== X-Received: by 2002:adf:c98b:: with SMTP id f11mr2365021wrh.274.1570616244690; Wed, 09 Oct 2019 03:17:24 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id z13sm1727117wrq.51.2019.10.09.03.17.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 03:17:24 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Oct 2019 12:17:01 +0200 Message-Id: <20191009101705.7072-10-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191009101705.7072-1-onemda@gmail.com> References: <20191009101705.7072-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 10/14] avfilter/vf_colorchannelmixer: add support for commands X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavfilter/vf_colorchannelmixer.c | 31 ++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/libavfilter/vf_colorchannelmixer.c b/libavfilter/vf_colorchannelmixer.c index 3a9cd37b78..074aa5e0f1 100644 --- a/libavfilter/vf_colorchannelmixer.c +++ b/libavfilter/vf_colorchannelmixer.c @@ -52,7 +52,8 @@ typedef struct ColorChannelMixerContext { } ColorChannelMixerContext; #define OFFSET(x) offsetof(ColorChannelMixerContext, x) -#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_COMMAND_PARAM + static const AVOption colorchannelmixer_options[] = { { "rr", "set the red gain for the red channel", OFFSET(rr), AV_OPT_TYPE_DOUBLE, {.dbl=1}, -2, 2, FLAGS }, { "rg", "set the green gain for the red channel", OFFSET(rg), AV_OPT_TYPE_DOUBLE, {.dbl=0}, -2, 2, FLAGS }, @@ -408,18 +409,20 @@ static int config_output(AVFilterLink *outlink) ColorChannelMixerContext *s = ctx->priv; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(outlink->format); const int depth = desc->comp[0].depth; - int i, j, size, *buffer; + int i, j, size, *buffer = s->buffer; ff_fill_rgba_map(s->rgba_map, outlink->format); size = 1 << depth; - s->buffer = buffer = av_malloc(16 * size * sizeof(*s->buffer)); - if (!s->buffer) - return AVERROR(ENOMEM); + if (!s->buffer) { + s->buffer = buffer = av_malloc(16 * size * sizeof(*s->buffer)); + if (!s->buffer) + return AVERROR(ENOMEM); - for (i = 0; i < 4; i++) - for (j = 0; j < 4; j++, buffer += size) - s->lut[i][j] = buffer; + for (i = 0; i < 4; i++) + for (j = 0; j < 4; j++, buffer += size) + s->lut[i][j] = buffer; + } for (i = 0; i < size; i++) { s->lut[R][R][i] = lrint(i * s->rr); @@ -531,6 +534,17 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) return ff_filter_frame(outlink, out); } +static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, + char *res, int res_len, int flags) +{ + int ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags); + + if (ret < 0) + return ret; + + return config_output(ctx->outputs[0]); +} + static av_cold void uninit(AVFilterContext *ctx) { ColorChannelMixerContext *s = ctx->priv; @@ -566,4 +580,5 @@ AVFilter ff_vf_colorchannelmixer = { .inputs = colorchannelmixer_inputs, .outputs = colorchannelmixer_outputs, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, + .process_command = process_command, };