From patchwork Thu Oct 10 11:38:48 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: 15683 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 E46BB44932D 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 D13C3688384; 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-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3150C68836A for ; Thu, 10 Oct 2019 14:39:13 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id q9so7463705wrm.8 for ; Thu, 10 Oct 2019 04:39:13 -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=idTzCI1x/EvU7Rofe+OMALaXDtRz6nmeuVKb8WdA0x0=; b=t+SDbyd6cCP5BXXy5KSHt5En70vMDziFUcjOLc4TkVgpW/AFGUvz/DZTWKWVCwqGK2 I51K3jJa8f9AadOnGMXvk5UQs6PHDWh6qDWNwLfvpihsx5XKiYhBWiUr5bmud3Ro3Z/3 k1NFSWtldYNm/TrFLBZguW/sCR8DI5oQBHVWyg1k76p0B/fXeqQM5sijSMhm58FbAjo7 mqsXPHa21muwG9n/I59X4+W7cSsQ20Pl/V/eH4Gj6uQz1UsjNJJqWidqZX/qJ2mdcWjN XmnZKOTLZA+fXsWTaSPiniChhHurnpvCmpbj2i/LIDlKBaT6ImCL+eIWnXMvMKAfRb+D wkCw== 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=idTzCI1x/EvU7Rofe+OMALaXDtRz6nmeuVKb8WdA0x0=; b=GKrRvC5ny603RPqAb2avon7CYvQJdn5qnCDmtZQfXXDYEyI251Kkl56z5/Gj6meyg4 ZVmMhsejC1RqeMh2VSr2L9fO7tnvz05nq2cPvpFizxywuW/7l660YMA4IPArF9ta3RIt BjCXbEQbFGX+kN1yue0RHJXqlRlTOZ3lCr9TrvPM4GWiRrXHMcbnfi3ATO3Mlkhq/JIc l4rOx2zwQTFpo68ggqoWMhCxgSnidbgrA6f9eqD0xmOXZzcP15ktxuRaS9b0eRKwkwAd VFUBsML1wb1QlhJJcyI8YuKy6KGdNVJo5WoMAm0sENUJRk57+rHRRZSABHw/0+umGWvY qN3A== X-Gm-Message-State: APjAAAV1tCabSOXrqNRabiJf8yWX4MnBi+fFO4lDLPxfrz0gGxxNJpsu YwjlLGfVb2QBrm6R0JqVtu2XB/d+ X-Google-Smtp-Source: APXvYqwKJYNo24Y74Q9RGhmQ8gIQ05bJRjdoM0m5RQn+URcVqiYqjBcJ6z/BUbU8yjiKmp2wiR+99Q== X-Received: by 2002:adf:e401:: with SMTP id g1mr6428517wrm.211.1570707552388; Thu, 10 Oct 2019 04:39:12 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id w4sm5442214wrv.66.2019.10.10.04.39.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 04:39:11 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Oct 2019 13:38:48 +0200 Message-Id: <20191010113851.27196-11-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 11/14] avfilter/vf_drawbox: use ff_filter_process_command() 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_drawbox.c | 55 ++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index e5f5351b9d..d71e3af397 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -275,46 +275,39 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, char *res, int res_len, int flags) { + AVFilterLink *inlink = ctx->inputs[0]; DrawBoxContext *s = ctx->priv; + int old_x = s->x; + int old_y = s->y; + int old_w = s->w; + int old_h = s->h; + int old_t = s->thickness; + int old_r = s->replace; int ret; - if ( !strcmp(cmd, "w") || !strcmp(cmd, "width") - || !strcmp(cmd, "h") || !strcmp(cmd, "height") - || !strcmp(cmd, "x") || !strcmp(cmd, "y") - || !strcmp(cmd, "t") || !strcmp(cmd, "thickness") - || !strcmp(cmd, "c") || !strcmp(cmd, "color") - || !strcmp(cmd, "replace")) { - - int old_x = s->x; - int old_y = s->y; - int old_w = s->w; - int old_h = s->h; - int old_t = s->thickness; - int old_r = s->replace; - - AVFilterLink *inlink = ctx->inputs[0]; - - av_opt_set(s, cmd, args, 0); - init(ctx); - - if ((ret = config_input(inlink)) < 0) { - s->x = old_x; - s->y = old_y; - s->w = old_w; - s->h = old_h; - s->thickness = old_t; - s->replace = old_r; - return ret; - } - } else { - ret = AVERROR(ENOSYS); + ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags); + if (ret < 0) + return ret; + + ret = init(ctx); + if (ret < 0) + goto end; + ret = config_input(inlink);; +end: + if (ret < 0) { + s->x = old_x; + s->y = old_y; + s->w = old_w; + s->h = old_h; + s->thickness = old_t; + s->replace = old_r; } return ret; } #define OFFSET(x) offsetof(DrawBoxContext, x) -#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM +#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM #if CONFIG_DRAWBOX_FILTER