From patchwork Wed Aug 4 17:03:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linjie Fu X-Patchwork-Id: 29248 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp3548519ioh; Wed, 4 Aug 2021 10:03:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3s5746JdMJB8HYbP8uNHEPDR0lbK6ufWRbUrEl3K5vHSjrx9DdMS/sW06jYMRHSkwhG5R X-Received: by 2002:a5d:522a:: with SMTP id i10mr372845wra.280.1628096617974; Wed, 04 Aug 2021 10:03:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628096617; cv=none; d=google.com; s=arc-20160816; b=AgqASka38YH1b42nR/uDolzOi6Vd0in6nZM5R6LneKAlNIsG7mDS8VJQ7/evdCXSDO TZbwFLLi94EeykywT1nJQ92tvYVMD7BE2pJ4k3+wlmFzRADigbyZEvgFvlz1xGu5U1ND zvfONRgS/tISQs7ZhQ4iPUKlX400dZpfLXP1FNpao9Iz+a+XTwgxBSQgWV8qR+E6fgJw t2/b+PryZ+Q8jT9075vd5yWHolFoWzJPtwHobcjtPw19DybqVFHj/sI4XFd1UROMqgaJ dHjCWVptxRFM8SDp5VyAuPwu7nJ3Jf896OIY1o392TbpaYB98auN6eeSkAKrz+ywOpWG 1xSg== 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=b4219CnJJcXxCXXJZEUv914FRJTjKvk5O2vUbzpi6JA=; b=B64wL1sd2UdKBMCGcE/+hKoNEFqFn77Z4tCuI0caC6RPl1tgCKQPKtF7d4Ql952gNW imAMuJXzOWmC1ferODmsQcXo/2AGl+K2pOXDrv8mO0zkXrI5IuWxLKWBM3dqbRlYEHIc +sqxPBzfcr5Fi6uPACINs4X1A54UJGzmFN1c3PQOqO6OGBRH7feAweEHbsJ7F3ghUbrI nKG/dwSAnpSnUiQYeihC3h6HdKgl2RbhKa3ye6XY51KfjI8jjxEg9lLtxCuPpbs2Noaa GiJ0lWLWt5caosCiHhT17UaKj9hQleeH1PkVGhgMM0Yxpn7C1r3AB34Txm0GTrFvQ6Lx 8LqQ== 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 cw2si2731866ejc.730.2021.08.04.10.03.37; Wed, 04 Aug 2021 10:03:37 -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 1F6C068A2B2; Wed, 4 Aug 2021 20:03:26 +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 E70DD689DD9 for ; Wed, 4 Aug 2021 20:03:18 +0300 (EEST) Received: from localhost.localdomain (unknown [58.247.209.118]) by mail-app3 (Coremail) with SMTP id cC_KCgD3_xtQyAphu2KPAg--.37631S2; Thu, 05 Aug 2021 01:03:13 +0800 (CST) From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 01:03:09 +0800 Message-Id: <20210804170311.86426-1-fulinjie@zju.edu.cn> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CM-TRANSID: cC_KCgD3_xtQyAphu2KPAg--.37631S2 X-Coremail-Antispam: 1UD129KBjvJXoWxZrWDArWkAF4UGry7Jr1DKFg_yoW5ZFyDpr 4ruas7Wr4xJFy8A3sxXr1DtFWrW3W8Jan8uayFgwsrJ3Z5CrnIgw4Skry5uws7ua18ZrW0 qF4Yk3WxWFyjqF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkq14x267AKxVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv6xkF7I0E14v26F 4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv 7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r 1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY02Avz4vE14v_ GwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r 1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jrv_JF1lIxkGc2Ij 64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr 0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF 0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7VUUvD77UUUUU== X-CM-SenderInfo: ysrvjiarsuq6lmxovvfxof0/ Subject: [FFmpeg-devel] [PATCH v4 1/3] lavfi/vf_scale: use default swscale flags 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 , Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kYMCuoePoVil Currently the default swscale flags for simple filter graph is bicubic, however for complex filter graph it uses bilinear as decleared in scale filter. $ffmpeg -v verbose -i input.mp4 -vf format=yuv420p,scale=800x600 -an -f null - [Parsed_scale_1 @ 0x7f86d2c160c0] w:1920 h:1080 fmt:yuv420p sar:0/1 -> w:800 h:600 fmt:yuv420p sar:0/1 flags:0x4 $ffmpeg -v verbose -i input.mp4 -filter_complex format=yuv420p,scale=800x600 -an -f null - [Parsed_scale_1 @ 0x7f8779e046c0] w:1920 h:1080 fmt:yuv420p sar:0/1 -> w:800 h:600 fmt:yuv420p sar:0/1 flags:0x2 Use default swscale flags (bicubic currently) for scale filter. - Remove flags="bilinear" from vf_scale - Update the FATE refs Signed-off-by: Linjie Fu --- libavfilter/vf_scale.c | 4 ++-- tests/ref/fate/filter-scale2ref_keep_aspect | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index f07e01bf90..683c4caa37 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -313,7 +313,7 @@ static av_cold int init_dict(AVFilterContext *ctx, AVDictionary **opts) scale->flags = 0; - if (scale->flags_str) { + if (*scale->flags_str) { const AVClass *class = sws_get_class(); const AVOption *o = av_opt_find(&class, "sws_flags", NULL, 0, AV_OPT_SEARCH_FAKE_OBJ); @@ -900,7 +900,7 @@ static const AVOption scale_options[] = { { "width", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, .flags = TFLAGS }, { "h", "Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, .flags = TFLAGS }, { "height","Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, .flags = TFLAGS }, - { "flags", "Flags to pass to libswscale", OFFSET(flags_str), AV_OPT_TYPE_STRING, { .str = "bilinear" }, .flags = FLAGS }, + { "flags", "Flags to pass to libswscale", OFFSET(flags_str), AV_OPT_TYPE_STRING, { .str = "" }, .flags = FLAGS }, { "interl", "set interlacing", OFFSET(interlaced), AV_OPT_TYPE_BOOL, {.i64 = 0 }, -1, 1, FLAGS }, { "size", "set video size", OFFSET(size_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, FLAGS }, { "s", "set video size", OFFSET(size_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, FLAGS }, diff --git a/tests/ref/fate/filter-scale2ref_keep_aspect b/tests/ref/fate/filter-scale2ref_keep_aspect index 8dd0dbb13b..53c6fc14ec 100644 --- a/tests/ref/fate/filter-scale2ref_keep_aspect +++ b/tests/ref/fate/filter-scale2ref_keep_aspect @@ -7,8 +7,8 @@ #dimensions 0: 160x120 #sar 0: 1/1 #stream#, dts, pts, duration, size, hash -0, 0, 0, 1, 57600, 9a19c23dc3a557786840d0098606d5f1 -0, 1, 1, 1, 57600, e6fbdabaf1bb0d28afc648ed4d27e9f0 -0, 2, 2, 1, 57600, 52924ed0a751214c50fb2e7a626c8cc5 -0, 3, 3, 1, 57600, 67d5fd6ee71793f1cf8794d1c27afdce -0, 4, 4, 1, 57600, 85f7775f7b01afd369fc8919dc759d30 +0, 0, 0, 1, 57600, 65fe9892ad710cc5763b04b390327d40 +0, 1, 1, 1, 57600, 5e8d4524bc8889afa8769e851e998bc0 +0, 2, 2, 1, 57600, 8f5e0e58d1f4c2104b82ef7a16850f1e +0, 3, 3, 1, 57600, cfe4142845e1445d33748493faa63cda +0, 4, 4, 1, 57600, bb491f3b01788773fb6129aef0f0abd2 From patchwork Wed Aug 4 17:03:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linjie Fu X-Patchwork-Id: 29251 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp3548387ioh; Wed, 4 Aug 2021 10:03:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwj0lO89faMVvVZ2IMfwtNTEBYkhKHOz5O88gV7Lm9gtzT0ieugKWv/b02g1bThfPEicTi/ X-Received: by 2002:a50:fb05:: with SMTP id d5mr863193edq.5.1628096608461; Wed, 04 Aug 2021 10:03:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628096608; cv=none; d=google.com; s=arc-20160816; b=0nXJSa8Dn7cYh4wY24TWr3W/c9fdlu4WyCsyoPgVOKw4EL7Nn5irp5mdhvXd1rziQQ lRz8Cp6cuTHuQMuYVRzGW0yu4ItlJa050iSouFdf0JVp/8AWcznrB/AC8WApvTJA2vsu NzCrHdVoL3Pm5kB5HCl4IovKIbGVV13a/5Vwypy/14zmrg+z20d1piNxxVMSRawwPdWo wtvq3MPdud4kvStgankip5sb9f3L7E4FwvdTOSXKAuPoaDgdTeasdChXMWkHt62xI8qT pN2HmS+qe8eW86PVgIUoh9EivwGNurmjQF38qt8YBks5XCLIlfzfOlmBWHmpyLMy6e3V 7SvA== 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=NkdTmcD/pUN7mYUdHnOrMqrMHEQUgsbwzsZJHF3V19k=; b=RlqnWvdBn90QfOyD4GuVQMOngSV+g07prdZ/eVYK2YTOiBMdd6MSd/wnqDdraIFFpE 2k9BtQ/99Rj8B2Exe407vMpR8IsPSJJ7gEP3QQv+JOxLKJhsSGym5QPu8Wc5RzKqXxws bU6mf0nrIPnNvyPTgnk90NrA06Egu8+vnQKJo92nKK7KmE3/MfmPBB5nM7Y8qGKznn8z PZcB/S7V3kyrGQeEB33OHg9/+B0wAiZOdJTikY8gSUNuJxlF8+4UcgzAy1lrq6kGc1NQ TdDYdd72KDfsiy3b8kRO506DJK8MN73dFKnmh1PHPpeLIT6kTgojTI1bC1xVvacO5PO8 NBfw== 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 w11si2970500ejc.221.2021.08.04.10.03.28; Wed, 04 Aug 2021 10:03:28 -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 0DF2668A16A; Wed, 4 Aug 2021 20:03:25 +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 E3E106808E6 for ; Wed, 4 Aug 2021 20:03:18 +0300 (EEST) Received: from localhost.localdomain (unknown [58.247.209.118]) by mail-app3 (Coremail) with SMTP id cC_KCgD3_xtQyAphu2KPAg--.37631S3; Thu, 05 Aug 2021 01:03:14 +0800 (CST) From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 01:03:10 +0800 Message-Id: <20210804170311.86426-2-fulinjie@zju.edu.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210804170311.86426-1-fulinjie@zju.edu.cn> References: <20210804170311.86426-1-fulinjie@zju.edu.cn> MIME-Version: 1.0 X-CM-TRANSID: cC_KCgD3_xtQyAphu2KPAg--.37631S3 X-Coremail-Antispam: 1UD129KBjvJXoW7WrWDZF1kXF17KFWDWry8Krg_yoW8Cr15pr 98J3WkJryrXrsYvF4kJw1kW34rKrs7Ww40krsYyw13XrnrGrnrKFy0kFySqrnrXa9rAF4S vrsYgF15CayfZaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBYb7Iv0xC_Cr1lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28CjxkF 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcV CY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280 aVCY1x0267AKxVWxJr0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02Avz4vE14v_GwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jrv_JF1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU0jiiDUUUUU== X-CM-SenderInfo: ysrvjiarsuq6lmxovvfxof0/ Subject: [FFmpeg-devel] [PATCH v4 2/3] fftools: Don't set default swscale flags in ffmpeg/ffprobe/ffplay 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: 2NvlmJMa2fBY From: Linjie Fu Signed-off-by: Linjie Fu --- fftools/cmdutils.c | 8 -------- fftools/ffplay.c | 2 -- fftools/ffprobe.c | 1 - 3 files changed, 11 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 0b1ef03a25..912e881174 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -81,11 +81,6 @@ enum show_muxdemuxers { SHOW_MUXERS, }; -void init_opts(void) -{ - av_dict_set(&sws_dict, "flags", "bicubic", 0); -} - void uninit_opts(void) { av_dict_free(&swr_opts); @@ -670,7 +665,6 @@ static void finish_group(OptionParseContext *octx, int group_idx, resample_opts = NULL; sws_dict = NULL; swr_opts = NULL; - init_opts(); memset(&octx->cur_group, 0, sizeof(octx->cur_group)); } @@ -708,8 +702,6 @@ static void init_parse_context(OptionParseContext *octx, octx->global_opts.group_def = &global_group; octx->global_opts.arg = ""; - - init_opts(); } void uninit_parse_context(OptionParseContext *octx) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 6b19574eae..46758b9f55 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -3695,8 +3695,6 @@ int main(int argc, char **argv) #endif avformat_network_init(); - init_opts(); - signal(SIGINT , sigterm_handler); /* Interrupt (ANSI). */ signal(SIGTERM, sigterm_handler); /* Termination (ANSI). */ diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index f411ba35b5..95263e1e6f 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3721,7 +3721,6 @@ int main(int argc, char **argv) options = real_options; parse_loglevel(argc, argv, options); avformat_network_init(); - init_opts(); #if CONFIG_AVDEVICE avdevice_register_all(); #endif From patchwork Wed Aug 4 17:03:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linjie Fu X-Patchwork-Id: 29250 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp3548656ioh; Wed, 4 Aug 2021 10:03:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxf1JrUFFvcKicH5+kTGijtJeTvBIhjgv7MgBaIUoXNgjMXm3Tv7m4OHoTtQ4PJixnkStQn X-Received: by 2002:a05:6402:1458:: with SMTP id d24mr861256edx.281.1628096628020; Wed, 04 Aug 2021 10:03:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628096628; cv=none; d=google.com; s=arc-20160816; b=yxHkOq/w4hD1pKnLTwPUPMSfT+WG5ch5z7Zsdr0jCZ7wx2NIPNd+7SLs8jbuvE4vbI 72HKqKJKn0dOyhCo9mFm2R7Qq4s1nPvi3ASo0i9v4Dr+EVQjR4XbFyryBSJsj+9KjfHw DPY3LPkcA88XNKvSaVuu51dy9MbCthRnISxbsrtnQcxp+jCKx8UCBMuq9l14Cu8lCOgv 4sVBVAWadquqB10AV39/E6odQIqEeJEY0Q/v049F5fpuc41Xm850iFKbnZGEKdWjQdtL oEUFaDQ5go535koIfJcCwe79sJgDIPkBdz8inC7qQgnv8eBCbadu3A561HCJGLVb4xai TaEQ== 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=Wt3yp88+Cm1KTdI2MRHjcH+v+u5VFHPGlUmmHyszAcw=; b=eMwz6NdLtZuYJGDHJNq5zuyAnH7fHpuqiimPauze+j1d/0eyGaqDLJ0DLH90E20HQV Ms0ImiTkF/nf+Lbp++qSJ//OqKeALZYShnQcx7Jyb3dSKbKQNnrTjcnUgYQ25EunjcYY y/DuJQnSvJ10RTJm9r2Sf9WrIskjUK5djV7klmajcC7ZMFO0SMTmB3LHxOQToI/IBoUh GsU+J+9Cparz9ryaH2zOXFy18KaLGErj+Sh32gWNwlXo2TK/v9MqL8W1ruazUD6pWoDh JsnsJP/A+x23VCRXezq2Mo5XKFzSdTah/nXFgkws5GEfg+HcxOrjA/8jUzEyzcqKyiex 2PXg== 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 h12si2635374ejy.369.2021.08.04.10.03.47; Wed, 04 Aug 2021 10:03:48 -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 32FC1688095; Wed, 4 Aug 2021 20:03:27 +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 D28D068A13C for ; Wed, 4 Aug 2021 20:03:19 +0300 (EEST) Received: from localhost.localdomain (unknown [58.247.209.118]) by mail-app3 (Coremail) with SMTP id cC_KCgD3_xtQyAphu2KPAg--.37631S4; Thu, 05 Aug 2021 01:03:15 +0800 (CST) From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 01:03:11 +0800 Message-Id: <20210804170311.86426-3-fulinjie@zju.edu.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210804170311.86426-1-fulinjie@zju.edu.cn> References: <20210804170311.86426-1-fulinjie@zju.edu.cn> MIME-Version: 1.0 X-CM-TRANSID: cC_KCgD3_xtQyAphu2KPAg--.37631S4 X-Coremail-Antispam: 1UD129KBjvJXoW7tw17Gw48GF47Wr45Zw43Wrg_yoW8Zr4xpr 4rK3W7JFyfArWfAFWvqr1UGa15GaykZF9F9FWfAry5XF98Jr1xta4fKayY9ry5K3W7uan7 Za4Yga4UWa4Utw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBYb7Iv0xC_Cr1lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28CjxkF 64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcV CY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280 aVCY1x0267AKxVWxJr0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02Avz4vE14v_GwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jrv_JF1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU01CJJUUUUU== X-CM-SenderInfo: ysrvjiarsuq6lmxovvfxof0/ Subject: [FFmpeg-devel] [PATCH v4 3/3] 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: 1tmSJrtx4Eju From: Linjie Fu Scaler relys on "-sws_flags" option to pass the flags to swscale and scale filter. Currently passing "sws_flags=xxx" as a filter option to scaler leads to an incorrect option parsing. Check and change the string to "flags=xxx" and dumped flags information. (Refer to parse_sws_flags()) CMD: $ffmpeg -v verbose -i input.mp4 -sws_flags lanczos+bitexact+accurate_rnd \ -vf format=yuv420p,scale=800x600 -an -vframes 10 -f md5 - Before: [auto_scaler_0 @ 0x7f96c3808680] w:iw h:ih flags:'' interl:0 [auto_scaler_0 @ 0x7f96c3808680] w:1920 h:1080 fmt:yuvj420p sar:0/1 -> w:1920 h:1080 fmt:yuv420p sar:0/1 flags:0x0 [Parsed_scale_1 @ 0x7f96c3806e40] w:1920 h:1080 fmt:yuv420p sar:0/1 -> w:800 h:600 fmt:yuv420p sar:0/1 flags:0x0 MD5=ff1d6091690c6fcd36d458d2a9f648ce After: [auto_scaler_0 @ 0x7fe94563b4c0] w:iw h:ih flags:'lanczos+bitexact+accurate_rnd' interl:0 [auto_scaler_0 @ 0x7fe94563b4c0] w:1920 h:1080 fmt:yuvj420p sar:0/1 -> w:1920 h:1080 fmt:yuv420p sar:0/1 flags:0xc0200 [Parsed_scale_1 @ 0x7fe945639d00] w:1920 h:1080 fmt:yuv420p sar:0/1 -> w:800 h:600 fmt:yuv420p sar:0/1 flags:0xc0200 MD5=ff1d6091690c6fcd36d458d2a9f648ce Signed-off-by: Linjie Fu --- fftools/ffmpeg_filter.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 958d74f008..94838adc56 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -977,7 +977,11 @@ int configure_filtergraph(FilterGraph *fg) } if (strlen(args)) args[strlen(args)-1] = 0; - fg->graph->scale_sws_opts = av_strdup(args); + + if (!strncmp(args, "sws_flags=", 10)) { + // keep the 'flags=' part + fg->graph->scale_sws_opts = av_strdup(args+4); + } args[0] = 0; while ((e = av_dict_get(ost->swr_opts, "", e,