From patchwork Mon Sep 23 12:40:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramiro Polla X-Patchwork-Id: 51767 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2571428vqb; Mon, 23 Sep 2024 09:19:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVrzXvBTgnwMsd9A4/rQrmKJ0Jny42dl2qFuamkb2QYPLOQhEIJZ5UP/BTt/D9DUJP8zW87qKquM9iQ/jyOwx+a@gmail.com X-Google-Smtp-Source: AGHT+IEa/RuBK9rN6guxvRr19KLN+pzcw+OCS9EN0+ROoeubupZfId9gQ7oBdJg6/iuifdCwQok3 X-Received: by 2002:a2e:a551:0:b0:2f6:6029:c631 with SMTP id 38308e7fff4ca-2f7cb3233c9mr63745841fa.20.1727108358970; Mon, 23 Sep 2024 09:19:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727108358; cv=none; d=google.com; s=arc-20240605; b=iMW/tmQ+BNKUsHh2mZhe4CVtLjtaysy6zf+TUezzRqIdBPY6BnmcbKijCGmcuDrm1U LE/QsOVElGPGr7MvwcGWNC4jR+Pd3Gs800ux1E58jtNyb+PkeSOwlgofNxgm60pl9Ok8 sKaIloGU26E+ZZLaFOeUPnrginD/BAlh5VkJKhH6BFYLFPZuu/zEZRb4H5w8dLEs9m0h NtetwhKJNYQDu+lq9Eesa1PHKcLQqZlH2HMjrTL9S3OL+5pk0a8QgRjxY4ajY4caxLL6 Krp1ApXlBpRau4BefRouac5GK737L/PU4tuPFgO4NfOkzH9PC49tE5CpOV5yooj7QBV9 +e9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding: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:dkim-signature:delivered-to; bh=aFRvlNkBzzGWPlZiNJPX0rjozCbu1NAlTyjfJ7c5180=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=cqWAIRvtmwIG3385X5PijpCvCtX6538o162BH+TgWFb2WsTRZBuU3A5GYOAxKLUno6 zL3IHRQWSW5PhUEwJT3lnqZlN7OBE00ZXaSvrw8GOiwtZ0DsPJE+CFJsgHJ7jwWuwz0a EcpTY7fmiRLGuoj232Jc1c8NHYWo84W5/svAT2boYRyjZECUBD7a71LCG0Z019YXaktp XyVXbZWshtPZKaxINY+xIuhk1pMetNfrNv+kDOmzgQllYU9z5Tn56wICeqphm5echGpR G00sxYVvPFDPtZSFFRqCMv7q7GBSo2gwtkuN7kIyzEQFQyTM31+daqhgiaR6Fmcby+BY ZnSw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="Jm/hTONV"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2f79d379010si59338561fa.389.2024.09.23.09.19.18; Mon, 23 Sep 2024 09:19:18 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="Jm/hTONV"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B3B7468DB1A; Mon, 23 Sep 2024 15:40:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24D1B68DA6C for ; Mon, 23 Sep 2024 15:40:25 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-42cb9a0c300so36068645e9.0 for ; Mon, 23 Sep 2024 05:40:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727095224; x=1727700024; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6IELB/EZueggoGKoAzLj4DSAlyXvsakM7NLhjUgwV2g=; b=Jm/hTONVCiNbXV0/9CduND0D056c/DS4BkBKZJIwKjSFTJOhV/PyNPu0qek0ufqnh3 k5/nIHLOUiIGMZpU24iMKEvPo/8mfB6T3QtXsV7nCkSfD6nAqIxrsvt4f+bEr196EeQk nIc2pk/RZk7MvtsWlNPJ5aYCYWSwsEDSMgV99HJMX66wU8UJE0A+I1v5psahbhr3xtDA CqLdjyT/Z2Z7b3XZxNghpjA4Kk3hNG1tgX5oE4Q8SYAYxs3M2aRdLwkD8VJWqMEYSnRd p2xKYj2flf+02uxcorJ0eMBHnfE3NlJfU/wmgGQO3+szWQaO+M8FCldn+ExHFp92m4dD uz5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727095224; x=1727700024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6IELB/EZueggoGKoAzLj4DSAlyXvsakM7NLhjUgwV2g=; b=pE2fYjti1vQ/2QlsNV25t70cJMeQa+393h3DUV9yEMwElt6XZuxMiZVeBVn9u0BEoj 88mTqTvjUTkMAan28iAYAJBV+RJI4El0d+PLNE+XhffGbtEyf9jlucXKxl6dnOnFSlh1 DQFi6hpmI16CmAdeszjSC+bdxNUzSSeMKznYzJ2r6eDJ4R91lObS1VpP8GpBjb2pKbHT CP//FhP5eDfjOCCzCs5AbMS8hGdGwgsZQSSq5MtHH2M0XIKm/gJ1bLKlJ2YeFCeIqpS3 MRa7A+9Bv8FOlZbTmd+KpTOgF1YG1f0h/f6MRoSwOLEnPd9SVFZqqpW0HgVMI5qzsZMB +lrw== X-Gm-Message-State: AOJu0Yzky1jmKWVV4KcNx44NxohXGWb8O4hoZDV+pEvT1LnqW7vs5kjU 1H2FMYaGHXh3u1NqSD7fxoI40Eb0IS6x8Qn+aVCxumAKlES/cDLxycliMg== X-Received: by 2002:a05:6000:128e:b0:374:ce15:998c with SMTP id ffacd0b85a97d-37a422bec5cmr5311584f8f.30.1727095223483; Mon, 23 Sep 2024 05:40:23 -0700 (PDT) Received: from localhost.localdomain (213.95-240-81.adsl-dyn.isp.belgacom.be. [81.240.95.213]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-378e71f0683sm24424345f8f.13.2024.09.23.05.40.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2024 05:40:22 -0700 (PDT) From: Ramiro Polla To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Sep 2024 14:40:05 +0200 Message-Id: <20240923124017.33659-3-ramiro.polla@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240923124017.33659-1-ramiro.polla@gmail.com> References: <20240923124017.33659-1-ramiro.polla@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/14] swscale/range_convert: drop redundant conditionals from arch-specific init functions 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: y3zDlBrXDFkD These conditions are already checked for in the main init function. --- libswscale/aarch64/swscale.c | 2 -- libswscale/loongarch/swscale_init_loongarch.c | 4 ---- libswscale/riscv/swscale.c | 3 +-- libswscale/swscale.c | 2 +- libswscale/x86/swscale.c | 2 -- 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/libswscale/aarch64/swscale.c b/libswscale/aarch64/swscale.c index 863627d7c3..653144dbca 100644 --- a/libswscale/aarch64/swscale.c +++ b/libswscale/aarch64/swscale.c @@ -228,7 +228,6 @@ av_cold void ff_sws_init_range_convert_aarch64(SwsContext *c) int cpu_flags = av_get_cpu_flags(); if (have_neon(cpu_flags)) { - if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) { if (c->dstBpc <= 14) { if (c->srcRange) { c->lumConvertRange = ff_lumRangeFromJpeg_neon; @@ -239,7 +238,6 @@ av_cold void ff_sws_init_range_convert_aarch64(SwsContext *c) } } } - } } av_cold void ff_sws_init_swscale_aarch64(SwsContext *c) diff --git a/libswscale/loongarch/swscale_init_loongarch.c b/libswscale/loongarch/swscale_init_loongarch.c index 88ad21a103..9f12f5e166 100644 --- a/libswscale/loongarch/swscale_init_loongarch.c +++ b/libswscale/loongarch/swscale_init_loongarch.c @@ -29,7 +29,6 @@ av_cold void ff_sws_init_range_convert_loongarch(SwsContext *c) int cpu_flags = av_get_cpu_flags(); if (have_lsx(cpu_flags)) { - if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) { if (c->dstBpc <= 14) { if (c->srcRange) { c->lumConvertRange = lumRangeFromJpeg_lsx; @@ -39,11 +38,9 @@ av_cold void ff_sws_init_range_convert_loongarch(SwsContext *c) c->chrConvertRange = chrRangeToJpeg_lsx; } } - } } #if HAVE_LASX if (have_lasx(cpu_flags)) { - if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) { if (c->dstBpc <= 14) { if (c->srcRange) { c->lumConvertRange = lumRangeFromJpeg_lasx; @@ -53,7 +50,6 @@ av_cold void ff_sws_init_range_convert_loongarch(SwsContext *c) c->chrConvertRange = chrRangeToJpeg_lasx; } } - } } #endif // #if HAVE_LASX } diff --git a/libswscale/riscv/swscale.c b/libswscale/riscv/swscale.c index ad579308c5..fc592c39d5 100644 --- a/libswscale/riscv/swscale.c +++ b/libswscale/riscv/swscale.c @@ -39,8 +39,7 @@ av_cold void ff_sws_init_range_convert_riscv(SwsContext *c) { ff_range_lum_from_jpeg_16_rvv, ff_range_chr_from_jpeg_16_rvv }, }; - if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat) && - c->dstBpc <= 14 && + if (c->dstBpc <= 14 && (flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB)) { bool from = c->srcRange != 0; diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 7f47dab4b6..df9d3e5ae3 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -553,7 +553,6 @@ av_cold void ff_sws_init_range_convert(SwsContext *c) c->chrConvertRange = chrRangeToJpeg16_c; } } - } #if ARCH_AARCH64 ff_sws_init_range_convert_aarch64(c); @@ -564,6 +563,7 @@ av_cold void ff_sws_init_range_convert(SwsContext *c) #elif ARCH_X86 ff_sws_init_range_convert_x86(c); #endif + } } static av_cold void sws_init_swscale(SwsContext *c) diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index c82311d87b..7ecb1f6542 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -474,14 +474,12 @@ RANGE_CONVERT_FUNCS_DECL(avx2); av_cold void ff_sws_init_range_convert_x86(SwsContext *c) { - if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) { int cpu_flags = av_get_cpu_flags(); if (EXTERNAL_AVX2_FAST(cpu_flags)) { RANGE_CONVERT_FUNCS(avx2); } else if (EXTERNAL_SSE2(cpu_flags)) { RANGE_CONVERT_FUNCS(sse2); } - } } av_cold void ff_sws_init_swscale_x86(SwsContext *c)