From patchwork Fri Jun 7 14:05:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramiro Polla X-Patchwork-Id: 49678 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1050004vqo; Fri, 7 Jun 2024 07:06:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWMC18YqjZJWEY+TtK29h9vPgxz1PmHVDtH+aD5F8ArmY1sJKswrAw1n+TMJK2kmbRseMAdPABV8PUyjBkUTWrC8s8+B9qDgYQa1A== X-Google-Smtp-Source: AGHT+IEo7DwK5VdgWyEm9OvSWJm2r/tDqRzl2aStosxfg8Cr1f7xF5H+rfdk8CqKLjI9wTv5G4YO X-Received: by 2002:a2e:1f01:0:b0:2ea:8442:2096 with SMTP id 38308e7fff4ca-2eadce343efmr15074981fa.2.1717769181558; Fri, 07 Jun 2024 07:06:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717769181; cv=none; d=google.com; s=arc-20160816; b=D9lpXhOuzSNRu+z/rzQT/a3Pqg3DXcYnwAMgpaThqLKZIjZuvUORCCwClRK+OPcs0D RsPnkoF6EBx2+4cSEUI0XdyUadKykxAXiGRIktKtnPgwX2xrJww+SB1pMArqWV1je9MO 7JlXV4lH1TdBQ3Mhx5q/+5oOEsthv5Co+I8lX7eagjKzpykfYZjRbcRv0Cf2xd9LxKt+ qz6hTksxZDXZeHfbfT2dFoMqcBbUi6B8DCKRFkktSjkaUuVNpIVNABY3du8K3JBKlstK RxrDkXbpwkdMJwxwqn82hKO+2NEcHGZE5wmwVa2gClkmqI2glz4RUwmZOe4KUZjuRof2 A6Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=BE3KFEtxCoNC+oTGukh5h4nNkFpfez7SWO0mgWt6bxg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=KPXaMujDeeT2yzzGiHUoTA2UbrrnhLW5+1kT7Gcqa5sXmhxuuDegwONg0DG2d4RhqT 6iakqX1BbBTqn/awXqTxmtGs8TS4JW2Iw2mjEWnAfK+RuJvDowhXWvuJ6DPqDi+0VEvO wFEnVH0JVluLGZBFv+tSn1+Ikmzjmj/hCoKzG6vgaNEpmJibuPz9Ql28r/nL+7Xs3stG NfjnoUKrKG7vlk81/K7ixZH1FaBNsypSglLVJKeExa8F7zDw72r6JWB40Tc++mxqPGWH DPDYb6pYC3q2CZfjIas8MJtlOy/QNM2nWEVxc9vb1bMV4ru+b6BI3QAAMwtvovWsgA4a +wzg==; 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=XV4FZJqG; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2ead40699d9si10401951fa.132.2024.06.07.07.06.20; Fri, 07 Jun 2024 07:06: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=XV4FZJqG; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8863768D590; Fri, 7 Jun 2024 17:05:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69A7F68D745 for ; Fri, 7 Jun 2024 17:05:49 +0300 (EEST) Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2e73359b900so23841971fa.2 for ; Fri, 07 Jun 2024 07:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717769148; x=1718373948; 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=1FJU3mSqmZJvts3xAl8fX2uUMCmStM88/oV4EAmKnXg=; b=XV4FZJqGeQOWzHzo/WKEXkEtqcvwxrQ3fsJJzdgXmIedy6YnxU9urxY53JfQz6AZLn tRSRYESjfbsDb0FCD2IjKRiIDpag2FUT46onWMHTDy0wGqKDGGkfqsEjLBvU6oNcAOQr vZfoHphpKfvxF6BytCkGwmPuIqb3756/+/zOq2klSKid5E6CXNroEQSEg+WJfIaioqaL xsBZAwG7hRgCpHeSELDk96YtOxvobRP7vDln5P+FRspOb4fYmREFRQHVFaU1iLbIx9e6 Wxqoc8VwDPGXiQrp+DJOKGN6K60AlhGc4XSHWihIy6vWO/55s35gqAAyVUVduUX6Yyic hj9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717769148; x=1718373948; 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=1FJU3mSqmZJvts3xAl8fX2uUMCmStM88/oV4EAmKnXg=; b=enmvrzUJYFbzUf6llbDW6wc/wWWtzZ86eBsOssNrkZ9Jm2mTUYisDpihyjJc08Nfd5 6g1MCiXQ7Gmte9oAzKuIRPi7kUIsAXXHSkbjXBtO9bigrFfj/W+FmSO8srN1fVD7AAyq 2YhnuaCfeqtyUyIyJ36WUWatkPPZih9BTv+vDU73JAw2o2wwhZ1tIMU44kEFcbZ/OM7x b3MjrhDI6bEYWBCvMnNickvSbBV/v01PH2yiEMq3Xk2Sl166ZPHfFgOkppaKmiRm437k H1XXufJlZ99SWQHdpjKs2Tdwe/yoxqUfNUrMSQ5Tl7N1D4Adf0bsOax+5LyS1SpNAONd Xlqw== X-Gm-Message-State: AOJu0YzRnFCfjpz3vRyg9vSTCJrfJhSHXDvJ2etXq+AdqK7kmUUVH0Cj 5zDHFSj040fKVaCVFh4qBfj0thbbMxChNAqFdVm9pM4HMJTnXQ3qAoE0Rg== X-Received: by 2002:a2e:9187:0:b0:2ea:83d1:4802 with SMTP id 38308e7fff4ca-2eadce3e25fmr16782721fa.27.1717769147514; Fri, 07 Jun 2024 07:05:47 -0700 (PDT) Received: from localhost.localdomain (80.164-182-91.adsl-dyn.isp.belgacom.be. [91.182.164.80]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4215814f6c0sm87282795e9.46.2024.06.07.07.05.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 07:05:47 -0700 (PDT) From: Ramiro Polla To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jun 2024 16:05:42 +0200 Message-Id: <20240607140543.130761-3-ramiro.polla@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240607140543.130761-1-ramiro.polla@gmail.com> References: <20240607140543.130761-1-ramiro.polla@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] swscale/x86: add sse4 {lum, chr}ConvertRange 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: lmhlLu8TwH5e chrRangeFromJpeg_8_c: 19.9 chrRangeFromJpeg_8_sse4: 16.2 chrRangeFromJpeg_24_c: 60.7 chrRangeFromJpeg_24_sse4: 28.9 chrRangeFromJpeg_128_c: 325.7 chrRangeFromJpeg_128_sse4: 160.2 chrRangeFromJpeg_144_c: 364.2 chrRangeFromJpeg_144_sse4: 194.9 chrRangeFromJpeg_256_c: 630.7 chrRangeFromJpeg_256_sse4: 337.4 chrRangeFromJpeg_512_c: 1240.4 chrRangeFromJpeg_512_sse4: 668.4 chrRangeToJpeg_8_c: 37.7 chrRangeToJpeg_8_sse4: 19.7 chrRangeToJpeg_24_c: 114.7 chrRangeToJpeg_24_sse4: 30.2 chrRangeToJpeg_128_c: 636.4 chrRangeToJpeg_128_sse4: 161.7 chrRangeToJpeg_144_c: 715.7 chrRangeToJpeg_144_sse4: 272.9 chrRangeToJpeg_256_c: 1256.7 chrRangeToJpeg_256_sse4: 341.9 chrRangeToJpeg_512_c: 2498.7 chrRangeToJpeg_512_sse4: 668.4 lumRangeFromJpeg_8_c: 11.7 lumRangeFromJpeg_8_sse4: 12.4 lumRangeFromJpeg_24_c: 36.9 lumRangeFromJpeg_24_sse4: 17.7 lumRangeFromJpeg_128_c: 228.4 lumRangeFromJpeg_128_sse4: 85.2 lumRangeFromJpeg_144_c: 272.9 lumRangeFromJpeg_144_sse4: 96.9 lumRangeFromJpeg_256_c: 463.4 lumRangeFromJpeg_256_sse4: 183.9 lumRangeFromJpeg_512_c: 879.9 lumRangeFromJpeg_512_sse4: 355.9 lumRangeToJpeg_8_c: 17.7 lumRangeToJpeg_8_sse4: 15.4 lumRangeToJpeg_24_c: 56.2 lumRangeToJpeg_24_sse4: 18.4 lumRangeToJpeg_128_c: 331.4 lumRangeToJpeg_128_sse4: 84.4 lumRangeToJpeg_144_c: 375.2 lumRangeToJpeg_144_sse4: 96.9 lumRangeToJpeg_256_c: 649.7 lumRangeToJpeg_256_sse4: 184.4 lumRangeToJpeg_512_c: 1281.9 lumRangeToJpeg_512_sse4: 355.9 --- libswscale/swscale_internal.h | 1 + libswscale/utils.c | 2 + libswscale/x86/Makefile | 1 + libswscale/x86/range_convert.asm | 100 +++++++++++++++++++++++++++++++ libswscale/x86/swscale.c | 36 +++++++++++ 5 files changed, 140 insertions(+) create mode 100644 libswscale/x86/range_convert.asm diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index d4b0c3cee2..92f6105443 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -698,6 +698,7 @@ void ff_updateMMXDitherTables(SwsContext *c, int dstY); av_cold void ff_sws_init_range_convert(SwsContext *c); av_cold void ff_sws_init_range_convert_loongarch(SwsContext *c); +av_cold void ff_sws_init_range_convert_x86(SwsContext *c); SwsFunc ff_yuv2rgb_init_x86(SwsContext *c); SwsFunc ff_yuv2rgb_init_ppc(SwsContext *c); diff --git a/libswscale/utils.c b/libswscale/utils.c index 476a24fea5..8dfa57b5ff 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1082,6 +1082,8 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], ff_sws_init_range_convert(c); #if ARCH_LOONGARCH64 ff_sws_init_range_convert_loongarch(c); +#elif ARCH_X86 + ff_sws_init_range_convert_x86(c); #endif } diff --git a/libswscale/x86/Makefile b/libswscale/x86/Makefile index 68391494be..f00154941d 100644 --- a/libswscale/x86/Makefile +++ b/libswscale/x86/Makefile @@ -12,6 +12,7 @@ X86ASM-OBJS += x86/input.o \ x86/output.o \ x86/scale.o \ x86/scale_avx2.o \ + x86/range_convert.o \ x86/rgb_2_rgb.o \ x86/yuv_2_rgb.o \ x86/yuv2yuvX.o \ diff --git a/libswscale/x86/range_convert.asm b/libswscale/x86/range_convert.asm new file mode 100644 index 0000000000..333265fb65 --- /dev/null +++ b/libswscale/x86/range_convert.asm @@ -0,0 +1,100 @@ +;****************************************************************************** +;* Copyright (c) 2024 Ramiro Polla +;* +;* This file is part of FFmpeg. +;* +;* FFmpeg is free software; you can redistribute it and/or +;* modify it under the terms of the GNU Lesser General Public +;* License as published by the Free Software Foundation; either +;* version 2.1 of the License, or (at your option) any later version. +;* +;* FFmpeg is distributed in the hope that it will be useful, +;* but WITHOUT ANY WARRANTY; without even the implied warranty of +;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;* Lesser General Public License for more details. +;* +;* You should have received a copy of the GNU Lesser General Public +;* License along with FFmpeg; if not, write to the Free Software +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +;****************************************************************************** + +%include "libavutil/x86/x86util.asm" + +; NOTE: there is no need to clamp the input when converting to jpeg range +; (like we do in the C code) because packssdw will saturate the output. + +;----------------------------------------------------------------------------- +; lumConvertRange +; +; void ff_lumRangeToJpeg_(int16_t *dst, int width); +; void ff_lumRangeFromJpeg_(int16_t *dst, int width); +; +;----------------------------------------------------------------------------- + +%macro LUMCONVERTRANGE 4 +SECTION_RODATA +mult_%1: times 4 dd %2 +offset_%1: times 4 dd %3 +SECTION .text +cglobal %1, 2, 3, 3, dst, width, x + movsxdifnidn widthq, widthd + xor xq, xq + mova m1, [mult_%1] + mova m2, [offset_%1] +.loop: + pmovsxwd m0, [dstq+xq*2] + pmulld m0, m1 + paddd m0, m2 + psrad m0, %4 + packssdw m0, m0 + movh [dstq+xq*2], m0 + add xq, mmsize / 4 + cmp xd, widthd + jl .loop + RET +%endmacro + +;----------------------------------------------------------------------------- +; chrConvertRange +; +; void ff_chrRangeToJpeg_(int16_t *dstU, int16_t *dstV, int width); +; void ff_chrRangeFromJpeg_(int16_t *dstU, int16_t *dstV, int width); +; +;----------------------------------------------------------------------------- + +%macro CHRCONVERTRANGE 4 +SECTION_RODATA +mult_%1: times 4 dd %2 +offset_%1: times 4 dd %3 +SECTION .text +cglobal %1, 3, 4, 4, dstU, dstV, width, x + movsxdifnidn widthq, widthd + xor xq, xq + mova m1, [mult_%1] + mova m2, [offset_%1] +.loop: + pmovsxwd m0, [dstUq+xq*2] + pmulld m0, m1 + paddd m0, m2 + psrad m0, %4 + packssdw m0, m0 + movh [dstUq+xq*2], m0 + pmovsxwd m0, [dstVq+xq*2] + pmulld m0, m1 + paddd m0, m2 + psrad m0, %4 + packssdw m0, m0 + movh [dstVq+xq*2], m0 + add xq, mmsize / 4 + cmp xd, widthd + jl .loop + RET +%endmacro + +%if ARCH_X86_64 +INIT_XMM sse4 +LUMCONVERTRANGE lumRangeToJpeg, 19077, -39057361, 14 +CHRCONVERTRANGE chrRangeToJpeg, 4663, -9289992, 12 +LUMCONVERTRANGE lumRangeFromJpeg, 14071, 33561947, 14 +CHRCONVERTRANGE chrRangeFromJpeg, 1799, 4081085, 11 +%endif diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index fff8bb4396..c5ddfb5605 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -447,6 +447,38 @@ INPUT_PLANAR_RGB_UV_ALL_DECL(avx2); INPUT_PLANAR_RGB_A_ALL_DECL(avx2); #endif +#if ARCH_X86_64 +#define RANGE_CONVERT_FUNCS(opt) do { \ + if (c->dstBpc <= 14) { \ + if (c->srcRange) { \ + c->lumConvertRange = ff_lumRangeFromJpeg_ ##opt; \ + c->chrConvertRange = ff_chrRangeFromJpeg_ ##opt; \ + } else { \ + c->lumConvertRange = ff_lumRangeToJpeg_ ##opt; \ + c->chrConvertRange = ff_chrRangeToJpeg_ ##opt; \ + } \ + } \ +} while (0) + +#define RANGE_CONVERT_FUNCS_DECL(opt) \ +void ff_lumRangeFromJpeg_ ##opt(int16_t *dst, int width); \ +void ff_chrRangeFromJpeg_ ##opt(int16_t *dstU, int16_t *dstV, int width); \ +void ff_lumRangeToJpeg_ ##opt(int16_t *dst, int width); \ +void ff_chrRangeToJpeg_ ##opt(int16_t *dstU, int16_t *dstV, int width); \ + +RANGE_CONVERT_FUNCS_DECL(sse4); + +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_SSE4(cpu_flags)) { + RANGE_CONVERT_FUNCS(sse4); + } + } +} +#endif + av_cold void ff_sws_init_swscale_x86(SwsContext *c) { int cpu_flags = av_get_cpu_flags(); @@ -805,4 +837,8 @@ switch(c->dstBpc){ \ } #endif + +#if ARCH_X86_64 + ff_sws_init_range_convert_x86(c); +#endif }