From patchwork Sat Aug 7 10:15:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linjie Fu X-Patchwork-Id: 29332 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1249733ioh; Sat, 7 Aug 2021 03:15:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8/xS07Ib2qsUd1H6W73BYCYxMctzvNAQjKNmDY+F9ZjEcIVvNRGxGobke+VR2I+6d4B3X X-Received: by 2002:a17:906:c155:: with SMTP id dp21mr13981287ejc.9.1628331354284; Sat, 07 Aug 2021 03:15:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628331354; cv=none; d=google.com; s=arc-20160816; b=zTlWQ0U0BXmRGjLTgsgJdzU8+runTXa9evblXpyCtjI/RJSscyYbbiNrai2VCZeT3x eXhHlUaaBK7m6q6wA1HeHI8+LL1fGKn9UXIf3pjh6a8TcNuyVKeG1wAOLiJgFRMzlwYc aNFoH4B05eMDH3FU8qv3ugg2XlROBefQuAgRBhYlNcHe9EFXEC3U+TdOrw9QvnGQ/FTL LTjIC/Edp5m1x+QUvXmxuZUkVm1gsLMc6zIJ0ZFlQQvkMLnjCzk4NGBBteUMLSFhxLP5 r40xFlaFIVzCSTHYF3GLuKTSyTI1byuCnC9fVgsxcx7Qcyo01kDftuWSd+0AGWT+x6XH FpRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=JRiqVrU5MroSxy97ZdG1oiC6MUxZ3XBNGEU7UzDPwHg=; b=yqWZz9fsnTVjwemGF8jGUmkh1KurkpCljzGkgTn+pSwoEdHJMYozf+rLOB+nJhU/Ek qJlFliIemByLIwHK2UwwAP43W+3KGh/IV34c7y09t9SSdvj1Kj58qXPtEhLU3bM5EvoV +oh4tbfiHW5xgZhB306/kAM86W7ZT42a4hn+4tvAPfs5cQ0u2INEkNDvSDhSwZOMbjiW U1I8uSTOWQyS3mVWey3bnEfCToNfBWWpUa2IgaS7X7IU7l/AI9XjJUW/Xty3a4XpMSI9 a+w40j3UWIXCefiEk+fhzAgmj7cdoM1aB/n5FS3Go8RLKD5wqsHZzvU/p03qz2brm5L3 pg8w== 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 s4si10824245eji.269.2021.08.07.03.15.53; Sat, 07 Aug 2021 03:15:54 -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 011AA68805F; Sat, 7 Aug 2021 13:15:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from zg8tmty1ljiyny4xntqumjca.icoremail.net (zg8tmty1ljiyny4xntqumjca.icoremail.net [165.227.154.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with SMTP id 17B6068805F for ; Sat, 7 Aug 2021 13:15:41 +0300 (EEST) Received: from localhost.localdomain (unknown [58.247.209.118]) by mail-app3 (Coremail) with SMTP id cC_KCgCXP6RHXQ5hESe8Ag--.117S2; Sat, 07 Aug 2021 18:15:36 +0800 (CST) From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Aug 2021 18:15:05 +0800 Message-Id: <20210807101507.83161-1-fulinjie@zju.edu.cn> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CM-TRANSID: cC_KCgCXP6RHXQ5hESe8Ag--.117S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Wr1xuFWDKw1xZryfWrWxZwb_yoW8JF4Up3 93Gw1UJFyrKFykCFyvgr48WrWrK39aqFyI9F9Yy34UZFWDJr17K3y3KrWagFy2yw1xurs2 vw1Yya4DJasrAaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkjb7Iv0xC_Zr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4 A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IE w4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMc vjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02Avz4vE14v_Gw1l42xK82IY c2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s 026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1Y6r17MIIYrxkI7VAKI48JMIIF 0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0x vE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv 6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07joKZXUUUUU= X-CM-SenderInfo: ysrvjiarsuq6lmxovvfxof0/ Subject: [FFmpeg-devel] [PATCH 1/3] Revert "fftools/ffmpeg_filter: fix the flags parsing for scaler" 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 Cc: Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0yrhkcUVbAwZ From: Linjie Fu This reverts commit b3a0548a981db52911dd34d9de254c4fee0a8f79. This breaks the usage of swscale options, scale_sws_opts should be passed to auto-inserted scale-filters. The auto-inserted scaler accepts sws_flags in filtergraph complex which overrides the 'flags' option for vf_scale and dump it in verbose, however simple filtergraph doesn't override. Hence we got different verbose logs printed in vf_scale when we specify -sws_flags in cmdline. It's a matter of log print rather than option parsing. Signed-off-by: Linjie Fu --- fftools/ffmpeg_filter.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 49076f13ee..a90858655d 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -977,11 +977,7 @@ int configure_filtergraph(FilterGraph *fg) } if (strlen(args)) args[strlen(args)-1] = 0; - - if (!strncmp(args, "sws_flags=", 10)) { - // keep the 'flags=' part - fg->graph->scale_sws_opts = av_strdup(args+4); - } + fg->graph->scale_sws_opts = av_strdup(args); args[0] = 0; while ((e = av_dict_get(ost->swr_opts, "", e,