From patchwork Tue Aug 3 16:13:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linjie Fu X-Patchwork-Id: 29218 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp2606031ioh; Tue, 3 Aug 2021 09:13:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIQul7RzbRyve+c661UNoVqqCIno7XvuBLUStJW5vkhCntubQfMK6uQxHZNJSUfGaD3BVH X-Received: by 2002:a17:906:9246:: with SMTP id c6mr20653385ejx.78.1628007210458; Tue, 03 Aug 2021 09:13:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628007210; cv=none; d=google.com; s=arc-20160816; b=Pt10sWH2H/fwvs1gKty9YpKIupBkF/lMy7mjT2gWpSXmCNhkg7ZTXdf9MQkxXyL64t 2IsaWrAMFMGWjdn4hgl1dXx5qye7XGEbODc9Y5dH3CGX357mst5PCD+YzEw+ek4UrEmX BhL0FgDadwhXFfvVdsHTls03Bf41bmpMKepPMvZv40L9YBQ1PnjBAVcH9cJ9ZmFIWDOQ 9BwLEBNS7rsq9cEWRHXiJleQP8EABxj9EDzk2csgP/8aa6NDRgAnVOc7/yXqadTzfDgk 2lJtskuO9Lr7UCqG7UfNVbuvt3an6K5NRupQTcNJIeX3RyL64sg0en3nH93FaSg7oe8X bmSA== 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=2vyib8O/vw9lM5/6wyaC1U/v8t7U/qZwoFtB0lncbGs=; b=SkMJDEN5I0+yp2yavPhDCtL/79JMZH8XC5CFrhR7nOOp+MiTLodIDKkfU7UGV+cTxz BHll1w3s75e8BJfdjKpEJ8wz+KTCYBKrD4oqwsC6HD5nEZDD+mMFSWhJOlQHGxTzDECo GkRXvSh2ZMOW1msgyaxHZS3o8Vks7yr/c1dmzfsX0QdkjyZVPfLR7jY9jeMFo6gGF6Oy aq+eTrYQPQkgHX7JEvoh9CZKfKcP9GlzR3Lvb/fYlHf8zDHxVyGx0MIusLBFrgLKyshw 74V2z/nNN0kyoNTcZA+VqpOgynqrL8FGAk8xKyjGEMCcIuwyBUSyr2Do4GMEwSq5dCgJ HLEg== 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 ci21si13067354ejb.252.2021.08.03.09.13.29; Tue, 03 Aug 2021 09:13:30 -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 ACFC4680BBE; Tue, 3 Aug 2021 19:13: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 9586068819D for ; Tue, 3 Aug 2021 19:13:18 +0300 (EEST) Received: from localhost.localdomain (unknown [58.247.209.118]) by mail-app3 (Coremail) with SMTP id cC_KCgCXl2wWawlh9op+Ag--.1390S2; Wed, 04 Aug 2021 00:13:10 +0800 (CST) From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Aug 2021 00:13:08 +0800 Message-Id: <20210803161309.83767-1-fulinjie@zju.edu.cn> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CM-TRANSID: cC_KCgCXl2wWawlh9op+Ag--.1390S2 X-Coremail-Antispam: 1UD129KBjvJXoWxuw4kZFyktr1xGryUZry7ZFb_yoW7Gryfpr 4rGas7Jr1fJF1rZws7Jw1kGFyrWr4xWws8C39YywsrtF1kCrnFgFWIkry5ursrWa9rZr4I vF45K3W8WayUXF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkFb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJV W8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4AK67AK6r1l42xK 82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGw C20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1Y6r17MIIYrxkI7VAKI48J MIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMI IF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E 87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07jTMKZUUUUU= X-CM-SenderInfo: ysrvjiarsuq6lmxovvfxof0/ Subject: [FFmpeg-devel] [PATCH v3 1/2] lavfi/vf_scale: use default swscale flags for simple and complex filter graph 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: 5R07Loyf5Wi1 From: Linjie Fu 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 - Remove setting defaults in ffmpeg/ffprobe/ffplay - Update the FATE refs Signed-off-by: Linjie Fu --- fftools/cmdutils.c | 8 -------- fftools/ffplay.c | 2 -- fftools/ffprobe.c | 1 - libavfilter/vf_scale.c | 4 ++-- tests/ref/fate/filter-scale2ref_keep_aspect | 10 +++++----- 5 files changed, 7 insertions(+), 18 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 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