From patchwork Sat Aug 7 10:15:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linjie Fu X-Patchwork-Id: 29333 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1249849ioh; Sat, 7 Aug 2021 03:16:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkuPfPiKy7jd/r5hkdd4E+2XmlNrzp2PR9+G1Qnf0ornTlac7kFZUdlOb/a076gPr8kotR X-Received: by 2002:a05:6402:747:: with SMTP id p7mr18377229edy.114.1628331366207; Sat, 07 Aug 2021 03:16:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628331366; cv=none; d=google.com; s=arc-20160816; b=bI+C02axKgGSyxpUIKIN/gFbUJ7E48tgsm36rg7t8mDMjAsL6xzNvBgq898ROY5XBP PimWvuq41K1FW0IuyRCddalNEAu0LHru8VF4Ltoc5s9M3oSMCuEB16OII6pkKJOQQRRI 0lkDodnt9o+3JBzD71SAOQ/bv8TUGo2a9Uh0KgUIBEuxuhLpxwQuLmdVwH7Ik+f2j0cE EGmXEUkn7H8VX7+uV0XLqLtvT1IaT8hsj3Bw8DVYBqrbFVa9BBwJg9wwXVk0/qnXbacg 2E7KqpZAdtVJp2u6bT4o8PbgiRuI3zq5P1eNVgzxJSHvgv18w8OvKwsrQHjNpSmlfnS+ 9+8A== 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:references:in-reply-to :message-id:date:to:from:delivered-to; bh=rYyRTuLiBmef7cGHnPSPL6eyNkDQk4oJHxMtVP3bafI=; b=O2D10OxuBHXxpUhf2eY86YzDE4Jjzksgt/R+rCNJaxSqGd9PKlNrqGwHHvMSqlcdNT SRdJvhN4Rio97yMlZ1j8VVFzY5w16caPGTnXbZSdbaswdYST13v4wlgk8wKH6z5+Scc6 EKhtDpsbctyVuHpQIeVSoxOHhlvg+Z5RTDRsmXEv8ezIwMg9KGoDItWQ58q9/5o7v6fs FjXPSLHulcQZBoEKsUtpslmGoeSc2WLinSaxjmbXRzsSjTAQFlrbSNJ40TNo4xilbO+R 2Xo1qRAgm3pv/hMzSus+irRfqpK7ilETSudzgUIutyMTrkdOf4STVhbpAO5jq3Obc6Cb 7fNQ== 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 i12si11482766edc.10.2021.08.07.03.16.05; Sat, 07 Aug 2021 03:16:06 -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 1C7BC689F16; Sat, 7 Aug 2021 13:15:50 +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 98E6E68805F for ; Sat, 7 Aug 2021 13:15:42 +0300 (EEST) Received: from localhost.localdomain (unknown [58.247.209.118]) by mail-app3 (Coremail) with SMTP id cC_KCgCXP6RHXQ5hESe8Ag--.117S3; Sat, 07 Aug 2021 18:15:38 +0800 (CST) From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Aug 2021 18:15:06 +0800 Message-Id: <20210807101507.83161-2-fulinjie@zju.edu.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210807101507.83161-1-fulinjie@zju.edu.cn> References: <20210807101507.83161-1-fulinjie@zju.edu.cn> MIME-Version: 1.0 X-CM-TRANSID: cC_KCgCXP6RHXQ5hESe8Ag--.117S3 X-Coremail-Antispam: 1UD129KBjvJXoW7ZrWrKF18ZrWfArykCr47XFb_yoW8Cw4Upw 4F93WfGFWfJrWIva92vryrXa1rGry8GFW29rZ5A3yrA3s5JryUt3y2kFWY9rWjywnrZr40 qr1jy34UX3WqvaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Gb7Iv0xC_Cr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kE wVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x 0267AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x02 67AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I 80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCj c4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVAFwVW8twCF04k20xvY0x0EwIxGrw CFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE 14v26r106r1rMI8E67AF67kF1VAFwI0_Jrv_JF1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2 IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxK x2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI 0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU8y7K3UUUUU== X-CM-SenderInfo: ysrvjiarsuq6lmxovvfxof0/ Subject: [FFmpeg-devel] [PATCH 2/3] lavfi/vf_scale: dump the exact swscale_options to passed to libswscale 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: qM0hLHcHGUfi From: Linjie Fu Printed verbose log doesn't match the sws_flags specified in the cmdline for simple filter graph. ffmpeg .. -sws_flags bicubic .. [auto_scaler_0] w:iw h:ih flags:'' interl:0 [auto_scaler_0] w:310 h:449 fmt:yuva420p sar:0/1 -> w:310 h:449 fmt:yuv420p sar:0/1 flags:0x0 Filter complex doesn't have this issue as mentioned in 12e7e1d03, the auto-inserted scaler accepts sws_flags in filtergraph complex which overrides the 'flags' option for vf_scale and dump it as a verbose log: ffmpeg .. -filter_complex "sws_flags=bicubic;format=nv12" .. [auto_scaler_0] w:iw h:ih flags:'bicubic' interl:0 [auto_scaler_0] w:310 h:449 fmt:yuva420p sar:0/1 -> w:310 h:449 fmt:nv12 sar:0/1 flags:0x2 To catch the difference, dump the exact sws_flags which is passed to libswscale. [auto_scaler_0] swscale_options:'sws_flags=bicubic' Signed-off-by: Linjie Fu --- libavfilter/vf_scale.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index aa855b894a..f994217bdc 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -552,11 +552,17 @@ static int config_props(AVFilterLink *outlink) scale->out_range == AVCOL_RANGE_JPEG, 0); if (scale->opts) { + char args[512]; + args[0] = 0; AVDictionaryEntry *e = NULL; while ((e = av_dict_get(scale->opts, "", e, AV_DICT_IGNORE_SUFFIX))) { if ((ret = av_opt_set(*s, e->key, e->value, 0)) < 0) return ret; + av_strlcatf(args, sizeof(args), "%s=%s:", e->key, e->value); } + if (strlen(args)) + args[strlen(args)-1] = 0; + av_log(ctx, AV_LOG_VERBOSE, "swscale_options:'%s'\n", (char *)av_x_if_null(args, "")); } /* Override YUV420P default settings to have the correct (MPEG-2) chroma positions * MPEG-2 chroma positions are used by convention