From patchwork Thu Oct 10 11:38:47 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: 15682 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 2EC7244932D for ; Thu, 10 Oct 2019 14:39:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E0DD6883DB; Thu, 10 Oct 2019 14:39:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0219368833D for ; Thu, 10 Oct 2019 14:39:11 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id h4so7474455wrv.7 for ; Thu, 10 Oct 2019 04:39:11 -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=bfKga/vG4QgQA5KbxL0I/hHZJGkYGs2X4MNm7IAtRQo=; b=kvlVuwTTo2uHhF7VM1OsjdF1GHcmDbHNSZwaZrYuPIz0HJQbmSCl1gEAc16wGF5OTa xm34ZPGtS4LcGfFKae+DXM71Fs6HM/KZ6/ZfZC9LYGGIe0M3atw8ZLl/9GJ2NI4SlaZ1 3yf7YU2RadFz0kZtOM4WyHXQQVVD1LxGWw3prUSN+xutoWECt+siWxv+PjVe/C97U16c Em7WnZ0FqXl0o6NsMVJzp/oyR5pZYyXsAigmV3OnIGSKiYUsfAtKISSnt3BQ4sptqRDB DENZoZlF1+XYdY2Ggy03qxYyXGPFzb4miW7TkPGL0EKG4vIk4d/17DMhTSTtm5pTBvGG IExQ== 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=bfKga/vG4QgQA5KbxL0I/hHZJGkYGs2X4MNm7IAtRQo=; b=an3LtsjMaWkDfiDQiL7mS7ebvbhVplmNRx9LO1C+uqMLaYayoH3aDrafmGqaL9DpdK euT0H2hAzpiBSEPxXh4rXIlX/3eFgxDg59LvqwR7PTFhBZpHrC/ZJeksSmsNZ/rKm86+ M+hgDS2QL5/Q1M0ImSDh2tFKxoqh9CPQFjOkUJgqALO24bKchcinqFrmearjFf9tVvCh Pk2VgY+nV9fCjdebVrpksFoCMlSZ5Fo4zIcbSScMPRocadRkxpTsN4707wi3YcwGRRtY phDHDZvkBBh8U8rmkTX94FyDXMMoIa7NiSATSkVT9u+usIuWH3H8hSlUX5Oms4uJteD1 Z8LQ== X-Gm-Message-State: APjAAAUMuW8s712f+Q+Q4H/W4oN1dSidde08mDH8roBHIcXL/Y51R6w/ DSZlxFsNYqQ1QAyvQ24LbfqgCymb X-Google-Smtp-Source: APXvYqyBv7HOS5tMkwJA9pdzAdfs2qi48zY3XSmCeLPOlFSyjGtAdX/FASOdRAXWQ48eAS4TrrObjA== X-Received: by 2002:adf:e286:: with SMTP id v6mr2954462wri.226.1570707551283; Thu, 10 Oct 2019 04:39:11 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id w4sm5442214wrv.66.2019.10.10.04.39.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 04:39:10 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Oct 2019 13:38:47 +0200 Message-Id: <20191010113851.27196-10-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191010113851.27196-1-onemda@gmail.com> References: <20191010113851.27196-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..e6c6fe3c5d 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_RUNTIME_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, };