From patchwork Tue Mar 15 08:58:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 34740 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp2832077nkb; Tue, 15 Mar 2022 01:58:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwx6EihL4WumNJ3pjAxI21Z8Kb2gFm211/kAWgmkQ6iVOzRw57eVx9tXyMt8lnpleM98/P1 X-Received: by 2002:a17:906:3ac7:b0:6ce:c3a1:3dcf with SMTP id z7-20020a1709063ac700b006cec3a13dcfmr21655731ejd.182.1647334709240; Tue, 15 Mar 2022 01:58:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647334709; cv=none; d=google.com; s=arc-20160816; b=KYCIX3JRQczws7pEdVHtAFDnS7vFlJvDO0yOJwn0hFte+w+RHr08EKjOLaWs9Nf7YB P1X98bshrm4vl/p6BKJ29Y9Ro6X+w2r3MBBluwbBoNfKhnar9iPQbrRekpQ1HqKcwhQ1 VxF5GvDdoK1ujNdx73Z4nDAUx51cls+u4A1lshEfuVy0hDFzufG39WaauG8cz6Nhcz/o tsZL6N/LCLawBjnrQtc2sLAmHhpeKboo/i/QSO2Xu4NAMZA5IQ/hwpMrCgomfbdRQH7k s2W42vZRGRb9vebUpRrGMl/thM/d659/cqoIAesa/lZvcKpjTUCJ5fa4EEaszrTYbkmm A2Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=hPGzkjnZFI1KRC3tMZrczR+442GbgFuBUQu2uEjgDj4=; b=xX9Wxwqfs9G2NYn3aaRQuewT5ACl0Lj0lz7M/t5RL43CfKg29D9S1FzzxL7uMrs+JM TdL53RUToRKPjPuK/AkTqAxGGsAz7v09eqOjEyqTZHwu0VO1H9SpY5l5jJfcYUby9V3h r6x9J6BmkBJxbH6APoeGeD92CBtPMPn02npQ/XWL1ljgXbRik2sobyiYUkbIsYzx3lBn DzXpoP1LQpR9zI0KkPrg2p1eAD8E2zvbIeif6DgivVxlU+jW42HMEuaaXaR1in7FPnTZ buT53oZjmWi8P4smfSdS4vysCB15nakdFii2RTN/luoYdia1pKuN9nNFHeputu6D6QhA B5RQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gb22-20020a170907961600b006d79dabf845si11545015ejc.522.2022.03.15.01.58.28; Tue, 15 Mar 2022 01:58:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E8C9468B168; Tue, 15 Mar 2022 10:58:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA98768019F for ; Tue, 15 Mar 2022 10:58:19 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 5512E24017C for ; Tue, 15 Mar 2022 09:58:19 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id d7oj6PCgm2t9 for ; Tue, 15 Mar 2022 09:58:18 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id BB3E5240179 for ; Tue, 15 Mar 2022 09:58:18 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 0BEC83A0406; Tue, 15 Mar 2022 09:58:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 09:58:11 +0100 Message-Id: <20220315085812.13916-1-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter: simplify processing child context options X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: URRrG80fYVif THe call to av_opt_set() is redundant, since the option is written in the options dict, which is later passed to avfilter_init_dict(). --- libavfilter/avfilter.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 1f37a70179..030f1823ee 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -861,14 +861,11 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, } } else { av_dict_set(options, key, value, 0); - if ((ret = av_opt_set(ctx->priv, key, value, AV_OPT_SEARCH_CHILDREN)) < 0) { - if (!av_opt_find(ctx->priv, key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) { - if (ret == AVERROR_OPTION_NOT_FOUND) - av_log(ctx, AV_LOG_ERROR, "Option '%s' not found\n", key); - av_free(value); - av_free(parsed_key); - return ret; - } + if (!av_opt_find(ctx->priv, key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) { + av_log(ctx, AV_LOG_ERROR, "Option '%s' not found\n", key); + av_free(value); + av_free(parsed_key); + return AVERROR_OPTION_NOT_FOUND; } } From patchwork Tue Mar 15 08:58:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 34741 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp2832194nkb; Tue, 15 Mar 2022 01:58:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjevRTfqLyDBYbu1UKS8c1KprSqKzNfAQldBMHRwLfGuu7nX15/cg6VyMAyXQUL0wiN0Yu X-Received: by 2002:a17:906:3803:b0:6cf:56b9:60a9 with SMTP id v3-20020a170906380300b006cf56b960a9mr21088833ejc.716.1647334716780; Tue, 15 Mar 2022 01:58:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647334716; cv=none; d=google.com; s=arc-20160816; b=i0E71JuHtUBijLbJJPF6yN3CUbZhVSND0/LPT0Pk1P0tcZX+VPgCHuX1AuTXaRTvy+ IHAuxDGtr9LVjhnEfGupZzi/8Gx1laf9phcoLdnSS4Qjgi4ZeDUGtj07Y2N3bsWafnrt wzssXwwabap3aL71ffj5DQaB2T+rlkyfyJWFe4QaxXmvyVkLp3IhiGsETuv91zYrAVkg AJZuaC1dt86qGJ+PbH9DLhvNZOCTIGbJ9KkPTmqsaloi6Qglgbj8yL4zDtXMsdN0KToE hNX/PMFF7SgMD/HaOoudjxo9y02d9e6B09xN/evbx7lG+8LT9AjmYFc6jywy8dr6f4HV JTtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=bb/vW1QX2HP022O3vfKDJkvOt5lib9ihalrDYk1bUfk=; b=HOUBmbxO2uJ7w6RrT2LOXIyLN084IqiWih2VGSko1Pa3d4R2b8JTV4Zqf++XlhjPfn hj/2Pgx9XsvVj993BUpPxww4oX3uoR+QWEZxOIdVKxGcIvVB+UdkTSUmb15JGCqUk0Ko 8Bg/liHYldgDZpr6Er8e9c4nmmmdJ/gXoXv0LY+O5/dsgA4Su+eXnb7ly562qGM4lKrz FoJ6HwBoaGukDpW4z/fLFZnXr+17qH3AGIo5++ENzPgKddK5CMncN0La4jjIe5hiRCP/ ryPXEDTqMhmSFmeLA/OHPk62VY/XrHn4iR+r5+otr0UAPM3YTPCxi4CJIT8r1EyECgjQ WXBQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x15-20020a05640226cf00b00416a309e850si11348264edd.224.2022.03.15.01.58.36; Tue, 15 Mar 2022 01:58:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D43E568B18E; Tue, 15 Mar 2022 10:58:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE7F668B168 for ; Tue, 15 Mar 2022 10:58:20 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 44EC8240179 for ; Tue, 15 Mar 2022 09:58:20 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id OXwwO94MlkUd for ; Tue, 15 Mar 2022 09:58:18 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id AC72D2400F5 for ; Tue, 15 Mar 2022 09:58:18 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 0DE5D3A0189; Tue, 15 Mar 2022 09:58:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 09:58:12 +0100 Message-Id: <20220315085812.13916-2-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220315085812.13916-1-anton@khirnov.net> References: <20220315085812.13916-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avfilter: handle duplicates in the options string X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: op9QrECE6xJg Use the same logic as fftools/cmdutils - when a flag-type option starts with [+-], append it to the existing value. --- libavfilter/avfilter.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 030f1823ee..a6f2181efb 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -860,13 +860,17 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, return ret; } } else { - av_dict_set(options, key, value, 0); - if (!av_opt_find(ctx->priv, key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) { + o = av_opt_find(ctx->priv, key, NULL, 0, + AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ); + if (!o) { av_log(ctx, AV_LOG_ERROR, "Option '%s' not found\n", key); av_free(value); av_free(parsed_key); return AVERROR_OPTION_NOT_FOUND; } + av_dict_set(options, key, value, + (o->type == AV_OPT_TYPE_FLAGS && + (value[0] == '-' || value[0] == '+')) ? AV_DICT_APPEND : 0); } av_free(value);