From patchwork Mon Sep 23 12:40:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramiro Polla X-Patchwork-Id: 51749 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2437501vqb; Mon, 23 Sep 2024 06:04:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXKOc0Sc/dwYC4Ji8O+bCz4xyziGqumOMgeO9Bgr2dkGJvXkUXHgCnKOInHWbYrgX//7bydAeuJ9nM7s8J7PxYy@gmail.com X-Google-Smtp-Source: AGHT+IH9UiWzbMuOFbNHBATVEOWe2+aCPa/ulcwIMzOQ7ALW6/eCCdumPgcAqTUaQsmw4MF3BAJt X-Received: by 2002:a17:907:c7e6:b0:a86:905b:475f with SMTP id a640c23a62f3a-a90d50d1117mr1149777766b.42.1727096661637; Mon, 23 Sep 2024 06:04:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727096661; cv=none; d=google.com; s=arc-20240605; b=XT9tzEnJRvpV83taRBfCQF8hMZ0HnJ/0D6KS2TRhGRQ/9c2KBWdC8yg1tDO4HHyZUd 7Zm449u7e9x5xSUi0n2cX70sV+aDVm6EKj8iBJnDTPR/M3LOV8yWsqKgLmm6IXOxSitI KAmFAZxEHUh4PMK+NDjcVLo5cGhZ1i/VTbOZrWgyusw79gEtbvvDFK4MH6TxFHUi4+b2 Dk4Df0FxhFNNE3xic+nBGmlnoQinAuUbIUZTEEWRzSOKdTzx5/NqWgKALL0BeO6a/Ux2 /4dX6HbSWpdoTqyC6MwogSRvZgrA9zRsGrHJXkyce9sF/kivS0AaOS8QY6idvmvqCBKi dlkQ== 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=8VBro3G5acFitxYRPPm11YCqjsr1RjugFLQh04EWgmA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=XuXduc+WjIOguEvp3oVb3/X9F3RDWJ74lHcev7JRO/6/4uCyeONcff761ItUNAUMGA p29Aow7y/YkzFuXgkeiGH4kWZl/RJu7qHX/P6M/CKTyUkNyWqcYziswm3P5dULTAq+N0 BVM2GC6N74u0GyAFA8bd7x47ZLdr4eUg9pJqmBwVCHbuvWS1z+f7E/vybGrUzviUdnWV 8cp3fTrZ5w2csa+OaMFP+B5q8Rf8HQS3CkTve1kr3vNmksV6qBFjTq8brmVG7Ro001FC OejoB2SVveNuVk/K2APa98qB1nW5HaT7crXCDnH4QpIOtu1gbSjIWOdb+uBt7uw+cWwJ w1UQ==; 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=IWeLEzCX; 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 4fb4d7f45d1cf-5c42bcad6c0si13792038a12.599.2024.09.23.06.04.20; Mon, 23 Sep 2024 06:04:21 -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=IWeLEzCX; 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 06C8468DB4B; Mon, 23 Sep 2024 15:40:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A46C568DAC2 for ; Mon, 23 Sep 2024 15:40:25 +0300 (EEST) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-374b25263a3so2544167f8f.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=JhrlW3A2DgaIi7pvu26GizEfjguII/FG9QUZ/BrtTg8=; b=IWeLEzCXuO9lTkkHlTlIOgYWsEMN6cY2VLJsN+wvbpLMldjVF+tLzPZBR/jLtrnBVi 0hJ9nwDjptA3ydwIrKSVODUl4eXQwHoOXMyHQygGlM+wKuamq2/I/qL0nk20t9yAIdQt pNe/vAYlvRsEpYdtTCvSIkK0rafTu6zZvq1R+leVUF3+mr+gTXwW7zdzKRKDPuBQJTLl 4WP6k+KQVHknDmSVFR3s72ZhAkQ3qAn26zZ9pqtC2d1IbfSL6Odvj9SsiZBC0/DdL1ei 7LFGjiKfBmezaovrobePm9glNUTmMth2GUtaJy7UqMI0tGj7u52FLV6M/CiLQvMbWlTr kzDw== 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=JhrlW3A2DgaIi7pvu26GizEfjguII/FG9QUZ/BrtTg8=; b=UKIP/YEMMnrjd9JppnmSEkmz7nTB6odPabKREJZACW9CM4/T2KKdBHd9CKmX95gKAL AT/wR6wKUsa5jfdvurHy+Y3CICWgPQNqXKg1VCao+TYxOtgswlgWP3bz0xdgOAW7KJ2W LQJ9Cc2ETsDPJFuIlkz2hnSw4fsNZVJL5GWa0rfI2KSv9Hiow+f7+Tb94LxcWmlX/miC 5/KCFQEqaLwKqX75+8McXmuHp+g6pNaNIKmE0Bss/BYNIWBiavXKjLT8vBLyFc2msN6J MQkIsf4P5QCzeR92ZaBNH/qh7YcXSfuRlu9eIRGmgZy2eP29CDEX2QPb6HzVJb5ykovo cRPA== X-Gm-Message-State: AOJu0YzkFqEnMQAndmb58wAGuO4YpYY5lmOa51F1yIgisamev48oV1PW FRR7VvLvUI9HhViWYCctZMiZN89EhNlaEQml2aUcXklsF9j6DCQ2JFgTUg== X-Received: by 2002:a5d:6b4d:0:b0:375:48e6:f30f with SMTP id ffacd0b85a97d-37a422aeac7mr4723751f8f.30.1727095224403; Mon, 23 Sep 2024 05:40:24 -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.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2024 05:40:24 -0700 (PDT) From: Ramiro Polla To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Sep 2024 14:40:06 +0200 Message-Id: <20240923124017.33659-4-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 03/14] swscale/range_convert: indent after previous commit 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: tyfmiVVC4qsw --- libswscale/loongarch/swscale_init_loongarch.c | 32 +++++++++---------- libswscale/swscale.c | 8 ++--- libswscale/x86/swscale.c | 12 +++---- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/libswscale/loongarch/swscale_init_loongarch.c b/libswscale/loongarch/swscale_init_loongarch.c index 9f12f5e166..de75ffc6dc 100644 --- a/libswscale/loongarch/swscale_init_loongarch.c +++ b/libswscale/loongarch/swscale_init_loongarch.c @@ -29,27 +29,27 @@ 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->dstBpc <= 14) { - if (c->srcRange) { - c->lumConvertRange = lumRangeFromJpeg_lsx; - c->chrConvertRange = chrRangeFromJpeg_lsx; - } else { - c->lumConvertRange = lumRangeToJpeg_lsx; - c->chrConvertRange = chrRangeToJpeg_lsx; - } + if (c->dstBpc <= 14) { + if (c->srcRange) { + c->lumConvertRange = lumRangeFromJpeg_lsx; + c->chrConvertRange = chrRangeFromJpeg_lsx; + } else { + c->lumConvertRange = lumRangeToJpeg_lsx; + c->chrConvertRange = chrRangeToJpeg_lsx; } + } } #if HAVE_LASX if (have_lasx(cpu_flags)) { - if (c->dstBpc <= 14) { - if (c->srcRange) { - c->lumConvertRange = lumRangeFromJpeg_lasx; - c->chrConvertRange = chrRangeFromJpeg_lasx; - } else { - c->lumConvertRange = lumRangeToJpeg_lasx; - c->chrConvertRange = chrRangeToJpeg_lasx; - } + if (c->dstBpc <= 14) { + if (c->srcRange) { + c->lumConvertRange = lumRangeFromJpeg_lasx; + c->chrConvertRange = chrRangeFromJpeg_lasx; + } else { + c->lumConvertRange = lumRangeToJpeg_lasx; + c->chrConvertRange = chrRangeToJpeg_lasx; } + } } #endif // #if HAVE_LASX } diff --git a/libswscale/swscale.c b/libswscale/swscale.c index df9d3e5ae3..18e213b21b 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -555,13 +555,13 @@ av_cold void ff_sws_init_range_convert(SwsContext *c) } #if ARCH_AARCH64 - ff_sws_init_range_convert_aarch64(c); + ff_sws_init_range_convert_aarch64(c); #elif ARCH_LOONGARCH64 - ff_sws_init_range_convert_loongarch(c); + ff_sws_init_range_convert_loongarch(c); #elif ARCH_RISCV - ff_sws_init_range_convert_riscv(c); + ff_sws_init_range_convert_riscv(c); #elif ARCH_X86 - ff_sws_init_range_convert_x86(c); + ff_sws_init_range_convert_x86(c); #endif } } diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 7ecb1f6542..a836de734c 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -474,12 +474,12 @@ RANGE_CONVERT_FUNCS_DECL(avx2); av_cold void ff_sws_init_range_convert_x86(SwsContext *c) { - 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); - } + 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)