From patchwork Mon Aug 2 16:49:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linjie Fu X-Patchwork-Id: 29203 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1732475ioh; Mon, 2 Aug 2021 09:49:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUSQolTLjuhvJSO3XPvHapSJfxHvFNOZgWeJFT45LljllIPwDB7OxJChCHOYyhYvK2Pouv X-Received: by 2002:aa7:dc18:: with SMTP id b24mr20677574edu.343.1627922983880; Mon, 02 Aug 2021 09:49:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627922983; cv=none; d=google.com; s=arc-20160816; b=zdP3AoNJqLMVbyNPD8TSzMPiR1ad9inVTCnA5ki9Wt454W2IGe1J19iBAx1vcntzPI uejI2CCU/TjfLvd3fqtJHrG0KJ6NhjgG/kvGcYG5A8fhI8T4wU7HNUSqEx4Iu3ngAG9Z fCxnYAo3sxV25N26fWDOpb7No5aetHwhIHXsw7+/D0/XvSHQLzemdi/yS0pvOeS8DAO9 v6obrk6SXQTDfhGBgeMLwcpgg+vAt0LZB/hQHhjeDUbBU7NZaXFGOillsMk9lYoyWue1 4rISIJlYqjeH5kMtXLc/PcoA4t16GgsByZMPzMosGjBWKfmcU31rG82Qoh/jfehK8Eeg ZbHQ== 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=3znQ8mPs+6fcGYbQ1tiDnFDBTVt5KYFSIPbL1ARr7eY=; b=YRtLys5nK8zizazg1/kgK0QAqNs3YUXQZHhsKjk8wFL6S/Lj5qC0wy+rzHtAwar4Gb QYBF5Ul/fdzWzEhZKE5/39445uSEZuP1m7LY5ubmesOlvNnvnVqbDdW/HGgBKjcLabG+ kEi59b6+G+mkol8iYv2XvpRcKyhrQK8v4X0mV53vm3aHmE0iH12jKUYPJgAo4Mi29W4P /pRhICylE3Rhq7GklyCj2g3g+nvz7aVXNwsGSN3EblKIbZ+w1DK7ysPvfiLb/dKT42U3 rtIokk7jCG5yH2J1PfHqs1PaceZwRn0f+Da9qQ50gNh0H/eq+tDU7taDTRc/xNZwNbY9 EmPA== 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 hy25si10062840ejc.673.2021.08.02.09.49.43; Mon, 02 Aug 2021 09:49:43 -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 CC62D6804A1; Mon, 2 Aug 2021 19:49:23 +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 694E66804A1 for ; Mon, 2 Aug 2021 19:49:15 +0300 (EEST) Received: from localhost.localdomain (unknown [58.247.209.118]) by mail-app3 (Coremail) with SMTP id cC_KCgD3_xsDIghh5ZVtAg--.59268S4; Tue, 03 Aug 2021 00:49:12 +0800 (CST) From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Aug 2021 00:49:03 +0800 Message-Id: <20210802164904.70998-3-fulinjie@zju.edu.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210802164904.70998-1-fulinjie@zju.edu.cn> References: <20210802164904.70998-1-fulinjie@zju.edu.cn> MIME-Version: 1.0 X-CM-TRANSID: cC_KCgD3_xsDIghh5ZVtAg--.59268S4 X-Coremail-Antispam: 1UD129KBjvdXoW7JFyrAryUAw4kZrW5GF4Durg_yoW3GFX_Ja y8AF1UXw4DXr9rtanxC395KF1kt3yIgw1Sga1DJw4Uur4xX345uFZ7uFyrXrnYyw13G397 tw4DAFy0qw13KjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbfAYjsxI4VWxJwAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVWUXVWUCwA2ocxC64kIII0Yj41l84x0c7CE w4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2IY6x kF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv 6xkF7I0E14v26r4UJVWxJr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4 CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvj eVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02Avz4vE14v_JwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jrv_JF1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU0aNt3UUUUU== X-CM-SenderInfo: ysrvjiarsuq6lmxovvfxof0/ Subject: [FFmpeg-devel] [PATCH v2 3/4] libswscale/utils: simplify the default scaler logic 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: jrYHKbGKn80g From: Linjie Fu Signed-off-by: Linjie Fu --- libswscale/utils.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 176fc6fd63..dea3b76eb3 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1250,12 +1250,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, /* provide a default scaler if not set by caller */ if (!i) { - if (dstW < srcW && dstH < srcH) - flags |= SWS_BICUBIC; - else if (dstW > srcW && dstH > srcH) - flags |= SWS_BICUBIC; - else - flags |= SWS_BICUBIC; + flags |= SWS_BICUBIC; c->flags = flags; } else if (i & (i - 1)) { av_log(c, AV_LOG_ERROR,