From patchwork Tue Jun 11 12:28:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramiro Polla X-Patchwork-Id: 49793 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:613:0:b0:460:55fa:d5ed with SMTP id 19csp362815vqg; Tue, 11 Jun 2024 05:29:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU6nzp8rq5e8F8u9kNTPC7rN9uvOPIVn7QVgFyYQqW19tbw9eFJmg2S4yMjVtnXUCYU126yegMZJMR4J3WaXve5Jakp9oHAaO2+Yg== X-Google-Smtp-Source: AGHT+IEQehDufy0YfpKUqphXNjUoQI8cO76iv2DPo+kWloQegrkn5aJwYNEl+geN7kfHW7Oz8vUh X-Received: by 2002:a2e:8712:0:b0:2eb:e312:5af1 with SMTP id 38308e7fff4ca-2ebe3125cd4mr43737741fa.22.1718108962954; Tue, 11 Jun 2024 05:29:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718108962; cv=none; d=google.com; s=arc-20160816; b=SbZhThD5JicdgE1OTytL2WhC41mMnG+ik0F6QBIJ3hj8kUj8TTm6ZMV2PdOP5ynifV zxNFTlwFiOX5BzvVioayBKvytEoCZWJDGR6pxXXTJXxOOyGQOem+iXnzkV7kG6kfv5SG usvbL9M2RILtdH4pniy8mpuEhJkDpEH6DvQ11m+8J6fuxgX8ke6ON/VM2+QEQggVmHET GyHoU6SA7asnncOdHDD4bRPIIbQqS4LuzZw0hc7r/suAEvWd1/Z5iKVJkc726f5cnK5Z UdbGDDHANlvLT+1Kk9m9BSJAADm27K1qojOTZjI2cWAp+tWvKGu85Cfn1kWxboukqE3F kTkw== 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=dCaELELsUYiclzqmiMXEfKd/m6VVTuY0niVYwM3jK4M=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=afMwjsk5JlsHxB0y6OFW6e4HRnkMxNXB1LSRV5pWG09PPcChfbCwpumRGduDPhlhMq 3hOE4rPEb24oEtIUgmw9JCzIv5fOFHlAsts9azrDBCSQrKy99npuXRyoRVFfiXmJmk3a OawbB2tZaCepAb5X6hBRFhReaQIeGW989eaIj1Mr3z2ghIUqRII3tFPhGgV4SPiqlQun YAeP3sAKMMXeW5c3Lv9eiB4+j7WXm8+kZD/ioibgfq/hR5nEEXnkmtbeU6UHZL3GTP3y XxRsKBc8/geRT8n02I3qYCJ7hEBIbyY0+wiBGtrczde/ND4xC9NAx7fg7+TRzEDeVxHk a7TA==; 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=hIa39E8w; 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 4fb4d7f45d1cf-57c759e73a5si3038601a12.33.2024.06.11.05.29.22; Tue, 11 Jun 2024 05:29:22 -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=hIa39E8w; 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 771A168D854; Tue, 11 Jun 2024 15:29:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C809268D858 for ; Tue, 11 Jun 2024 15:29:03 +0300 (EEST) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-35dc9cef36dso997992f8f.3 for ; Tue, 11 Jun 2024 05:29:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718108942; x=1718713742; 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=kzO5dWn9RQsIDRp9FaVi5y5GBR54ySspO5cNPxfFfiw=; b=hIa39E8wZTrK183OUCjdJOFg+ubU6kOVtLFZZTF88t/PLeb0EttYPX5CVObaF4GjA/ nWLcNU0X7XZVw67xQw4KN1M2w/yKNUFC7VMY8NMYupUx4Q+ecgd+nYWhPk13H1MqI2Fj 90uRh5CrRlSBrpkswes0uiqAua0Gz0VBm3dmgeVMhIgVyVU8h2QBtzmhtl8s5VT8Nthy gjBStC4LLdPAxbSUf+ZliCzFbZOvRvlPn77KLkOWzUbqfaXRZRBY6+EruGm81HxQ6WKl IMZG4VrPpTpnE2ovDtM7fGQ+EWp2vU9CcjN9ADRsFpV+UfHFjLjLRgwn+TxQ2ZyqW8m8 K8TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718108942; x=1718713742; 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=kzO5dWn9RQsIDRp9FaVi5y5GBR54ySspO5cNPxfFfiw=; b=J3rnSGbg8YPo9NRQRCuJaUeAlEGg1R69iy3hWuzFQ+kCHlq6yKy26U6q0ho5D8M7r3 xfC7G7Y6C7ZOwlDcc7DfLXJmxxSAIFoS/NRqkYV1B9ewQY4T5HDsg1RKcywnn/oWJWca dYk3FwJS5zQc2T6P6JkSRj/GBwEGUi1a/ozgo4nQurkah5KHEIz+Q9Y+y6YUbrHH4QMK m1OYCl30fZ9RMnmzxkqTvbaUHFb1Cd9eOLB15KzNLq7ujq6hJJ28hSOAdJXyBn7ALcT2 ZrFbtTTc/AXIrVMfztnuC++8bNO9cLg4KDwsuukAg516dCn4iuLjKUA6AmFDiW+t76K8 SgGw== X-Gm-Message-State: AOJu0YzimSXN691lpAlgDbrBhnR5gF9uKJrGN2GillF+hJRqA752WVi+ fLd1HqLVg465BFeeC+GsV8ZugSf2wnGpvSggzEyhal3FCFZAvoEhbBzXtw== X-Received: by 2002:adf:ed92:0:b0:35f:1c99:c79a with SMTP id ffacd0b85a97d-35f1c99c8c2mr5136244f8f.8.1718108942305; Tue, 11 Jun 2024 05:29:02 -0700 (PDT) Received: from localhost.localdomain (237.35-178-91.adsl-dyn.isp.belgacom.be. [91.178.35.237]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35f0b876d80sm10592856f8f.109.2024.06.11.05.29.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 05:29:01 -0700 (PDT) From: Ramiro Polla To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Jun 2024 14:28:56 +0200 Message-Id: <20240611122858.196658-2-ramiro.polla@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240611122858.196658-1-ramiro.polla@gmail.com> References: <20240611122858.196658-1-ramiro.polla@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/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: SX7pVZBbUucQ chrRangeFromJpeg_8_c: 28.7 chrRangeFromJpeg_8_sse4: 16.2 chrRangeFromJpeg_24_c: 152.7 chrRangeFromJpeg_24_sse4: 29.7 chrRangeFromJpeg_128_c: 366.5 chrRangeFromJpeg_128_sse4: 233.0 chrRangeFromJpeg_144_c: 408.0 chrRangeFromJpeg_144_sse4: 182.5 chrRangeFromJpeg_256_c: 698.7 chrRangeFromJpeg_256_sse4: 325.5 chrRangeFromJpeg_512_c: 1348.7 chrRangeFromJpeg_512_sse4: 660.2 chrRangeToJpeg_8_c: 37.7 chrRangeToJpeg_8_sse4: 16.2 chrRangeToJpeg_24_c: 115.7 chrRangeToJpeg_24_sse4: 36.2 chrRangeToJpeg_128_c: 631.2 chrRangeToJpeg_128_sse4: 163.7 chrRangeToJpeg_144_c: 710.7 chrRangeToJpeg_144_sse4: 183.0 chrRangeToJpeg_256_c: 1253.0 chrRangeToJpeg_256_sse4: 343.5 chrRangeToJpeg_512_c: 2491.2 chrRangeToJpeg_512_sse4: 654.2 lumRangeFromJpeg_8_c: 11.7 lumRangeFromJpeg_8_sse4: 10.5 lumRangeFromJpeg_24_c: 38.5 lumRangeFromJpeg_24_sse4: 19.0 lumRangeFromJpeg_128_c: 237.5 lumRangeFromJpeg_128_sse4: 79.2 lumRangeFromJpeg_144_c: 255.7 lumRangeFromJpeg_144_sse4: 90.5 lumRangeFromJpeg_256_c: 441.5 lumRangeFromJpeg_256_sse4: 161.7 lumRangeFromJpeg_512_c: 879.0 lumRangeFromJpeg_512_sse4: 333.2 lumRangeToJpeg_8_c: 20.0 lumRangeToJpeg_8_sse4: 11.7 lumRangeToJpeg_24_c: 61.5 lumRangeToJpeg_24_sse4: 17.7 lumRangeToJpeg_128_c: 357.5 lumRangeToJpeg_128_sse4: 80.0 lumRangeToJpeg_144_c: 371.5 lumRangeToJpeg_144_sse4: 93.2 lumRangeToJpeg_256_c: 651.5 lumRangeToJpeg_256_sse4: 164.5 lumRangeToJpeg_512_c: 1279.0 lumRangeToJpeg_512_sse4: 333.7 --- libswscale/swscale_internal.h | 1 + libswscale/utils.c | 2 + libswscale/x86/Makefile | 1 + libswscale/x86/range_convert.asm | 130 +++++++++++++++++++++++++++++++ libswscale/x86/swscale.c | 36 +++++++++ 5 files changed, 170 insertions(+) create mode 100644 libswscale/x86/range_convert.asm diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 5007dd422f..d5e7b5e71c 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..13983a386b --- /dev/null +++ b/libswscale/x86/range_convert.asm @@ -0,0 +1,130 @@ +;****************************************************************************** +;* 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" + +SECTION_RODATA + +chr_to_mult: times 4 dd 4663 +chr_to_offset: times 4 dd -9289992 +%define chr_to_shift 12 + +chr_from_mult: times 4 dd 1799 +chr_from_offset: times 4 dd 4081085 +%define chr_from_shift 11 + +lum_to_mult: times 4 dd 19077 +lum_to_offset: times 4 dd -39057361 +%define lum_to_shift 14 + +lum_from_mult: times 4 dd 14071 +lum_from_offset: times 4 dd 33561947 +%define lum_from_shift 14 + +SECTION .text + +; 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 +cglobal %1, 2, 3, 3, dst, width, x + movsxdifnidn widthq, widthd + xor xq, xq + mova m4, [%2] + mova m5, [%3] +.loop: + pmovsxwd m0, [dstq+xq*2] + pmovsxwd m1, [dstq+xq*2+mmsize/2] + pmulld m0, m4 + pmulld m1, m4 + paddd m0, m5 + paddd m1, m5 + psrad m0, %4 + psrad m1, %4 + packssdw m0, m0 + packssdw m1, m1 + movq [dstq+xq*2], m0 + movq [dstq+xq*2+mmsize/2], m1 + add xq, mmsize / 2 + 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 +cglobal %1, 3, 4, 4, dstU, dstV, width, x + movsxdifnidn widthq, widthd + xor xq, xq + mova m4, [%2] + mova m5, [%3] +.loop: + pmovsxwd m0, [dstUq+xq*2] + pmovsxwd m1, [dstUq+xq*2+mmsize/2] + pmovsxwd m2, [dstVq+xq*2] + pmovsxwd m3, [dstVq+xq*2+mmsize/2] + pmulld m0, m4 + pmulld m1, m4 + pmulld m2, m4 + pmulld m3, m4 + paddd m0, m5 + paddd m1, m5 + paddd m2, m5 + paddd m3, m5 + psrad m0, %4 + psrad m1, %4 + psrad m2, %4 + psrad m3, %4 + packssdw m0, m0 + packssdw m1, m1 + packssdw m2, m2 + packssdw m3, m3 + movq [dstUq+xq*2], m0 + movq [dstUq+xq*2+mmsize/2], m1 + movq [dstVq+xq*2], m2 + movq [dstVq+xq*2+mmsize/2], m3 + add xq, mmsize / 2 + cmp xd, widthd + jl .loop + RET +%endmacro + +%if ARCH_X86_64 +INIT_XMM sse4 +LUMCONVERTRANGE lumRangeToJpeg, lum_to_mult, lum_to_offset, lum_to_shift +CHRCONVERTRANGE chrRangeToJpeg, chr_to_mult, chr_to_offset, chr_to_shift +LUMCONVERTRANGE lumRangeFromJpeg, lum_from_mult, lum_from_offset, lum_from_shift +CHRCONVERTRANGE chrRangeFromJpeg, chr_from_mult, chr_from_offset, chr_from_shift +%endif diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 5a9da23265..8f477b7b72 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -453,6 +453,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(); @@ -820,4 +852,8 @@ switch(c->dstBpc){ \ } #endif + +#if ARCH_X86_64 + ff_sws_init_range_convert_x86(c); +#endif }