From patchwork Fri Sep 27 12:52:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramiro Polla X-Patchwork-Id: 51907 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp905757vqb; Sat, 28 Sep 2024 03:21:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJlKrqwabwr49x4HyLI74WKTtHmQnPkCFRx45B/Fqw+Z57JKmwK3luEAUQ8zzsUtZaCFlZAmafCqO6H5bC6Kek@gmail.com X-Google-Smtp-Source: AGHT+IE5p0omBPxhsYLbFUuylB+ekyTdqJvneLrmUq9/HXyRkoZde4GMaNlAcIxM1Gq16hx6wumJ X-Received: by 2002:a05:6512:3095:b0:533:4620:ebfb with SMTP id 2adb3069b0e04-5389fc3c405mr4252519e87.21.1727518871809; Sat, 28 Sep 2024 03:21:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727518871; cv=none; d=google.com; s=arc-20240605; b=ktxs3I2rK5X+X+Cujgk5kyRgfQmsCVt+vNLVBaeDn2kcazxClLnHHhuK7BKTURJm+K lLvKfohIqyfAKYyFIR84/zJHe6c4GLEcac4cdmK0S1lBQCXo5y2QMYxPi0P06IvpJOya eLNc4Urp8ODplc1u+KmrryKRbbHS1/K8EweFY3fPABERXZ7fFhHekf9nLfGjiuVb/Hlw roiMlj1LUQe0QlLTgwiiSr1IZPd2EF/O4/FpTHhDDQAfT7WFlTBZDnshyrh3IAo2gkw1 Lp6iZGEEmJ2mKw1PjJAq/Y3NSl/S3+ynPGsntq8+wAGnoURQC9aQpbHrTQYUPuPYG4Zf vp2Q== 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=T6gqNw8qtSF7MGrCNyy8Xx10gqjbtnjo8+9a32zqVQvZvosGnetuwd53rU5PR2Rbx5 DX1ez3hR9T5Thdulf7iTUZJA9KrD5z0PAVtbegciyMuLYgCHcyC2JrZoB4TK8OIeyWFe mrPpApxjLxGaUj+SUNV4j28lPaiZiOeSqidKxQrDgvY1DRditoWyz4Gdu2i66Hkz7kNR 354eaZavetK41zJJzomaYKUPrzl1BGVisnv9eWTT7+FuSWVFDsWG0rQBccpI86X4IkWI w+3g33qDDinvg7x2vebMPTq9zXAPDYHWSpW5wM7VxNv3SlDXNonjh7rnnudcGTYNWS/3 tHAw==; 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=daREooCY; 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 2adb3069b0e04-538a04327ccsi1305545e87.272.2024.09.28.03.21.10; Sat, 28 Sep 2024 03:21:11 -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=daREooCY; 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 7AD0068DD0A; Fri, 27 Sep 2024 15:53:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1B1468DCEC for ; Fri, 27 Sep 2024 15:52:53 +0300 (EEST) Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-5c5b954c359so2167205a12.1 for ; Fri, 27 Sep 2024 05:52:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727441573; x=1728046373; 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=daREooCYt8O6Lagh7w+R6Ob3VEuU70v9odEaJIZ6K+OYUWhbPXZP/K5NEtZoT9f/Pa QdVP0CJxBYUl70YE+80M03gIKwr/Ir6U7+GW+mXbxtsb+jIQB6Vv0dDXAgUcR4/xn0ve ZcAZibtiqoXnMe6Cwja8yyIrS15VdFbH2BoAv729GA9K2OI+ai24bhiEhxn3UK/HFPlD bZjv2bGaP5Y70hKMpnOZMPUWT9th1wRom3NPx9slKZlrjF7BGowmj9EOYgr3kkQVoSbM HvPf9FqDsDTQ/oAliBaKN0zf1648CWYnVkbHB6cVbF6I1kA5+79z84YV2xof5kJ03DeU Gg/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727441573; x=1728046373; 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=KzIrW4IUp6XamGAbulN+z+saDjQAkUKlLSlAcpY0qUsbEn6lDge4M5AV86V/XeROu5 rdrN2GVNFVzTtJXcw2mSv80Y6u87bJNiXHntN1WlEEg5Ih1I7XSQJl5eKo7eMHJL2/Jf yAzK06Dw66Ktd7tEk7XpFNfZAYKvJljIhbtvU5yXpjAk3IKoWCrLnuOoTjCXh7NtM7jB q8sbLSb/CdbbGalueG7kVSpyija2fl5A4ZxOnKw/iJ0GXcUVVvsY81tIPUw7/EB2mVjs QfWxe1O172IyvlgmjM5uQ4nEdhhP4WZp+rmALe587BmHREDN6aHL0QixVChQn6ADHwo5 VbWg== X-Gm-Message-State: AOJu0YyGCtkhwfl3zku4dvKYVmK6gCLZ0YjlqF27+nEWgMAtq8N3YMTU 7xbb2ELxrJLdXBX/TV9xkqMF8GSZ1RKr3j+IHzte61zPcekvmHXq7vOWoSaw X-Received: by 2002:a17:907:3d91:b0:a7d:a680:23b5 with SMTP id a640c23a62f3a-a93c492a5a1mr260142966b.33.1727441572681; Fri, 27 Sep 2024 05:52:52 -0700 (PDT) Received: from localhost.localdomain ([109.143.184.139]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a93c2777214sm130608566b.36.2024.09.27.05.52.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2024 05:52:52 -0700 (PDT) From: Ramiro Polla To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Sep 2024 14:52:28 +0200 Message-Id: <20240927125241.15887-4-ramiro.polla@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240927125241.15887-1-ramiro.polla@gmail.com> References: <20240927125241.15887-1-ramiro.polla@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 03/16] 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: ig4ycYPpLcdS --- 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)