From patchwork Wed Oct 9 09:56:49 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: 15605 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 85BF044696F for ; Wed, 9 Oct 2019 12:57:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75B8F6881D9; Wed, 9 Oct 2019 12:57:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B67F6881B7 for ; Wed, 9 Oct 2019 12:57:11 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id j11so2078243wrp.1 for ; Wed, 09 Oct 2019 02:57: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=TqMLumrXuqbalZxMwGpgz09gzrEv8he7KUf7gKPNxLY=; b=S3kro0y5l9jZOki0pMmQWQnkeXOs4xzFHYt7W2dO/+fTrY3Erf16GTQ59x5twcKuK8 s6PsZAK8qEQ7Tc35G+O2zaypwrdilsEb8z9sCu+Qpnd2+fjsfSQ4aE1WBknMf0YtQWs/ Dq4KNWV10AdkvOpCtleVeb34DBP3g1iIf9ne++hFAGQz5riL7IAN0n+d1ddJbIw4eNxD 4PYoHKyR7OSykr671BbucOb7fgpzxhGfoquyiyPkMIYM5l4VVi8FS9DPhQf2YpZo/j7p +gEytLjVWYDh3zS5qJyBb7L70oBNQbIoDLG06N9zymTWpOVeO8zmFq99rLT5H1kxQkWW QAjg== 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=TqMLumrXuqbalZxMwGpgz09gzrEv8he7KUf7gKPNxLY=; b=ATq2mSy/Rr7w95rtPUkRvgWcwSVu88WFPRCTp0aPY+ynm1z0wUhZ+LNMWCSgAtPGo1 wIF77qMKqalUJWJ1Wx3zf619sK7xf2d8o5d5d7/ak5PggrSs7TAHW/j3x6hFAdDtwuid AeEl2yCUA13wmZgGxEKjkb6YkFo9U0EAvAhyM2BgmwqmaB2HAkqdYGprYCOgAumK9L0h C+64lyO3ydDChC5Zsf7tk+WzbrdsEkt0lWjvTzgdsnjwLA3QjQ39cksSZ34iLIfhBWk1 grQWd9uEE+H5haBW0Kxhclxo9BBn3xBcS6QCKeh3d908qzhHEggMnlBmpD/nZI3ASZCj /tlA== X-Gm-Message-State: APjAAAXo3xAmRsHTgPlZjZ0mLb+ZJNRgPZfUG3dmQQce9Avpzj1djTuH uHMqBEsZ5mmi9SSNKpekSgE6YMGo X-Google-Smtp-Source: APXvYqzPefuQlQZzyBbJU7GF7L/r7adLzpIudQnRF0E1N1UOUX9qgfLOxszZNegQgWPplb74G1tUCQ== X-Received: by 2002:a5d:628c:: with SMTP id k12mr2110996wru.29.1570615030565; Wed, 09 Oct 2019 02:57:10 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id s9sm1964315wme.36.2019.10.09.02.57.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 02:57:10 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Oct 2019 11:56:49 +0200 Message-Id: <20191009095651.2928-11-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191009095651.2928-1-onemda@gmail.com> References: <20191009095651.2928-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 11/13] 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..2a5cd2ac48 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_COMMAND_PARAM #if CONFIG_DRAWBOX_FILTER