From patchwork Wed Jun 19 17:10:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50017 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9187:0:b0:482:c625:d099 with SMTP id s7csp369861vqg; Wed, 19 Jun 2024 10:11:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUMgbwIq4V90ecrSkAiYuEaA46DkaEFb82IR8rh6msfy5yEmulW57DxHpS9BOzkFMOYSZYhiz297NWfOYRpZcFVEvXQT7PcYueK9A== X-Google-Smtp-Source: AGHT+IHleqfUShhNGCtzblQAvfhfkfUjNjnLzMgPV1Qnl0cgtVg3aHdm0bULQ+WB7Ku4CgHl4ZrB X-Received: by 2002:a2e:9659:0:b0:2ec:f8a:6f0f with SMTP id 38308e7fff4ca-2ec3cea4843mr24785231fa.4.1718817072909; Wed, 19 Jun 2024 10:11:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718817072; cv=none; d=google.com; s=arc-20160816; b=ArgRNjEBm6G6UkmW3RfMkH15Jwbh3rAz75G1qq9DjUnQYTn6sqq+SEl2rcm9BnpYYu zL6dilD/piBEmSgA2IY7upUadxiPmfnMFs3GB9oyt0Ox9GT0ze2m0n6KmJMuziQr53Ue 3OBHl5+ke7tteI3qrTyT9l17IfmApYg1PDpXEoyq/6I3JBDfDMd+BokX4Oq1jVIexsh7 aXlAysX6JvWD3mtjzn08Q1ISTKhwekiWv//JIFrcIr5HdBloUMUsRMXjdVQU/wGtuSxV iG6kVqIMVwbo4WEMATw/Nfv4+W8c9VknMhZwr93csIRxFE84zdLGdLj1WSmHj5qmGZLz lSWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=2+hhTQpXClweNtPG8M658Sz4t8pZ11EzCxXJ34INaUE=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=PCTOaYNOlVcB3uVplO9dbQJL203wawzElDp4zAOIroQwhSVWBHXo5FAiA8+Dwp76fl qyh251z17dqM4shyGCfJk5gz3clj/97RT6+wceHRt1h/TTYHTKDTwHgM+eBU4SJ343Pf G02/bqyKVh/eIiWgQ6hVWcrjYIflx2dC2P4+EzrALfDPBbiJlgOuCTJz5XFckFrS2MGN fRujlgsVs5nX6729D0NSwkuV2twkC1w1H9WPjV1mUozJeCCeUhc0VHtc7gMGfGUZH7gr 37GPvtl76etHJtPCsyqqqwGRryWX0dqAKa1m8ycpg67aH3vyWn2jJvACmcxbahbQyhIR lvkQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=fN1OodLF; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6f56df9940si648829966b.691.2024.06.19.10.11.12; Wed, 19 Jun 2024 10:11:12 -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=@foxmail.com header.s=s201512 header.b=fN1OodLF; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 89EF368D82A; Wed, 19 Jun 2024 20:10:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-27.mail.qq.com (out203-205-251-27.mail.qq.com [203.205.251.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CEA1E68D828 for ; Wed, 19 Jun 2024 20:10:41 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1718817029; bh=O/bCmccoKPcbk7lt+z/3HB7XkXC8a9JnBQJUD8A+J8s=; h=From:To:Cc:Subject:Date; b=fN1OodLFcgQgNrvu9/h4j8vilmAhNcbWwdQGMg/IZFO/OnKrpRZQA17fhoi2eM7MA CzGI9aqXNY/Ry1q40/u+SsyM60+CTR6XxRYxjge2y62VfDyzmEOAUyzKljdY40SViX +ohLSJxXkc5jWn5F+Y7zCcVYUDL07TTb5jG7o9iE= Received: from ZHILIZHAO-MB1.tencent.com ([114.244.0.205]) by newxmesmtplogicsvrszc5-2.qq.com (NewEsmtp) with SMTP id 29B2FCD3; Thu, 20 Jun 2024 01:10:27 +0800 X-QQ-mid: xmsmtpt1718817027tef17u44d Message-ID: X-QQ-XMAILINFO: M4rXzlpNAA0NOQYXpIvw/41q3ryw77ghadGtOPfmNHOcV0NZaqhTu6T97A39Lj SBzucOdfr2R/jqmaHfohOGbbuD1FwkCqqHIyeQH1BaL5F+b8FOkmoNt3bGDJ7LzXymSgcO2H5bl1 xDkexEBBhs9pOuwDeT8KIHHKOQQ3za+FzHYj3Rq6J1Klc190Y897CnzuwfllbocHKHTOJlAZ0CQb Ix652RqceV3qFQiSvlq90NRn3ay9W8Rs0geQNy4zkhxvKjdFz8RliUh3DGjqTJ+wRsf8DtbNN0oT 7If+Lv4g6RajRH7+A3j+R8WTSliaDeFtIuCu6C9MY+sQ2ZHVXHf/vZds7y73MzrFSyL/4HSngkd6 zHsp18XbqnUFbvOKmjvZnAeIYnrrEAYTN0xNWoujjuJWTAwhrqJeNHD83Rv9KrBHThGbTAu4Qgu9 73ago3Ibs2/fSM5Q8jzNwIkgAkCusPpGCHmdpjqA2YGroP9C7/7AOfiaP3eUqS/LwzgLy2B6gJCj oPOqk7g2nvE6hC8PaLEk0kXeHQnvNitBd44JLs8mPA7jwWi9s5j5TM3hWxvbHXrljiLpIjoq4vVg 1dmZffgoVPGlQcTZuAYSiVqwyculrQF+iv2T8eBLs5OE3qNvebEdF6Sbqbkr7gvllt74oZ51sp5k mCF4Ip1sJjAVeOO4h1En1Jwd+2aLU0swT0lQDMeda5sdKqLOuWjMYhqTf2y0PLc8s3gVaQ9985YC AkDZAcT2VL+2IhoVmPdrpUyXAjkA0KIHzZAE9IRthU7ZD3dPt73npVV0ig6XRi/2roWYToAfQ9oM hJrDsvOtaLcwkVXXwADJfk9M1ygwzkgfEGClDG17ipyLWZvwEMvnWvfBKjs6imJJy3Lw1HCSi7Bg xCHYVUGasFKh7CbE1Z1ptZ4xh7JqYbHeTjxcGV/QfhOin1iqZJ5KcJ7L5sGMxPCyQlvtB295jlAe 0W+IpF3J4qFPMTiMl53pUDlff5ddfeo3wwzzJeHqs= X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jun 2024 01:10:23 +0800 X-OQ-MSGID: <20240619171025.16420-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] swscale/aarch64: Add bgr24 to yuv 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1M50/ZyUwj1E From: Zhao Zhili Test on Apple M1 with kperf bgr24_to_uv_8_c: 41.5 bgr24_to_uv_8_neon: 41.8 bgr24_to_uv_128_c: 133.5 bgr24_to_uv_128_neon: 94.3 bgr24_to_uv_1080_c: 960.5 bgr24_to_uv_1080_neon: 751.0 bgr24_to_uv_1920_c: 1695.3 bgr24_to_uv_1920_neon: 1357.3 bgr24_to_uv_half_8_c: 45.0 bgr24_to_uv_half_8_neon: 11.0 bgr24_to_uv_half_128_c: 130.5 bgr24_to_uv_half_128_neon: 51.8 bgr24_to_uv_half_1080_c: 877.3 bgr24_to_uv_half_1080_neon: 414.0 bgr24_to_uv_half_1920_c: 1540.0 bgr24_to_uv_half_1920_neon: 695.0 bgr24_to_y_8_c: 24.3 bgr24_to_y_8_neon: 12.8 bgr24_to_y_128_c: 94.3 bgr24_to_y_128_neon: 47.5 bgr24_to_y_1080_c: 611.5 bgr24_to_y_1080_neon: 437.5 bgr24_to_y_1920_c: 1077.3 bgr24_to_y_1920_neon: 765.3 --- v2: Use LDP to load BGR coefficients libswscale/aarch64/input.S | 71 +++++++++++++++++++++++++++--------- libswscale/aarch64/swscale.c | 32 +++++++++------- 2 files changed, 72 insertions(+), 31 deletions(-) diff --git a/libswscale/aarch64/input.S b/libswscale/aarch64/input.S index 33afa34111..cf8d062942 100644 --- a/libswscale/aarch64/input.S +++ b/libswscale/aarch64/input.S @@ -20,7 +20,7 @@ #include "libavutil/aarch64/asm.S" -.macro rgb24_to_yuv_load_rgb, src +.macro rgb_to_yuv_load_rgb src ld3 { v16.16b, v17.16b, v18.16b }, [\src] uxtl v19.8h, v16.8b // v19: r uxtl v20.8h, v17.8b // v20: g @@ -30,7 +30,7 @@ uxtl2 v24.8h, v18.16b // v24: b .endm -.macro rgb24_to_yuv_product, r, g, b, dst1, dst2, dst, coef0, coef1, coef2, right_shift +.macro rgb_to_yuv_product r, g, b, dst1, dst2, dst, coef0, coef1, coef2, right_shift mov \dst1\().16b, v6.16b // dst1 = const_offset mov \dst2\().16b, v6.16b // dst2 = const_offset smlal \dst1\().4s, \coef0\().4h, \r\().4h // dst1 += rx * r @@ -43,10 +43,15 @@ sqshrn2 \dst\().8h, \dst2\().4s, \right_shift // dst_higher_half = dst2 >> right_shift .endm -function ff_rgb24ToY_neon, export=1 +.macro rgbToY bgr cmp w4, #0 // check width > 0 + .if \bgr + ldp w12, w11, [x5] // w12: ry, w11: gy + ldr w10, [x5, #8] // w10: by + .else ldp w10, w11, [x5] // w10: ry, w11: gy ldr w12, [x5, #8] // w12: by + .endif b.le 3f mov w9, #256 // w9 = 1 << (RGB2YUV_SHIFT - 7) @@ -59,9 +64,9 @@ function ff_rgb24ToY_neon, export=1 dup v2.8h, w12 b.lt 2f 1: - rgb24_to_yuv_load_rgb x1 - rgb24_to_yuv_product v19, v20, v21, v25, v26, v16, v0, v1, v2, #9 - rgb24_to_yuv_product v22, v23, v24, v27, v28, v17, v0, v1, v2, #9 + rgb_to_yuv_load_rgb x1 + rgb_to_yuv_product v19, v20, v21, v25, v26, v16, v0, v1, v2, #9 + rgb_to_yuv_product v22, v23, v24, v27, v28, v17, v0, v1, v2, #9 sub w4, w4, #16 // width -= 16 add x1, x1, #48 // src += 48 cmp w4, #16 // width >= 16 ? @@ -83,12 +88,26 @@ function ff_rgb24ToY_neon, export=1 cbnz w4, 2b 3: ret +.endm + +function ff_rgb24ToY_neon, export=1 + rgbToY bgr=0 endfunc -.macro rgb24_load_uv_coeff half +function ff_bgr24ToY_neon, export=1 + rgbToY bgr=1 +endfunc + +.macro rgb_load_uv_coeff half, bgr + .if \bgr + ldp w12, w11, [x6, #12] + ldp w10, w15, [x6, #20] + ldp w14, w13, [x6, #28] + .else ldp w10, w11, [x6, #12] // w10: ru, w11: gu ldp w12, w13, [x6, #20] // w12: bu, w13: rv ldp w14, w15, [x6, #28] // w14: gv, w15: bv + .endif .if \half mov w9, #512 movk w9, #128, lsl #16 // w9: const_offset @@ -105,12 +124,12 @@ endfunc dup v6.4s, w9 .endm -function ff_rgb24ToUV_half_neon, export=1 +.macro rgbToUV_half bgr cmp w5, #0 // check width > 0 b.le 3f cmp w5, #8 - rgb24_load_uv_coeff half=1 + rgb_load_uv_coeff half=1, bgr=\bgr b.lt 2f 1: ld3 { v16.16b, v17.16b, v18.16b }, [x3] @@ -118,8 +137,8 @@ function ff_rgb24ToUV_half_neon, export=1 uaddlp v20.8h, v17.16b // v20: g uaddlp v21.8h, v18.16b // v21: b - rgb24_to_yuv_product v19, v20, v21, v22, v23, v16, v0, v1, v2, #10 - rgb24_to_yuv_product v19, v20, v21, v24, v25, v17, v3, v4, v5, #10 + rgb_to_yuv_product v19, v20, v21, v22, v23, v16, v0, v1, v2, #10 + rgb_to_yuv_product v19, v20, v21, v24, v25, v17, v3, v4, v5, #10 sub w5, w5, #8 // width -= 8 add x3, x3, #48 // src += 48 cmp w5, #8 // width >= 8 ? @@ -156,21 +175,29 @@ function ff_rgb24ToUV_half_neon, export=1 cbnz w5, 2b 3: ret +.endm + +function ff_rgb24ToUV_half_neon, export=1 + rgbToUV_half bgr=0 endfunc -function ff_rgb24ToUV_neon, export=1 +function ff_bgr24ToUV_half_neon, export=1 + rgbToUV_half bgr=1 +endfunc + +.macro rgbToUV bgr cmp w5, #0 // check width > 0 b.le 3f cmp w5, #16 - rgb24_load_uv_coeff half=0 + rgb_load_uv_coeff half=0, bgr=\bgr b.lt 2f 1: - rgb24_to_yuv_load_rgb x3 - rgb24_to_yuv_product v19, v20, v21, v25, v26, v16, v0, v1, v2, #9 - rgb24_to_yuv_product v22, v23, v24, v27, v28, v17, v0, v1, v2, #9 - rgb24_to_yuv_product v19, v20, v21, v25, v26, v18, v3, v4, v5, #9 - rgb24_to_yuv_product v22, v23, v24, v27, v28, v19, v3, v4, v5, #9 + rgb_to_yuv_load_rgb x3 + rgb_to_yuv_product v19, v20, v21, v25, v26, v16, v0, v1, v2, #9 + rgb_to_yuv_product v22, v23, v24, v27, v28, v17, v0, v1, v2, #9 + rgb_to_yuv_product v19, v20, v21, v25, v26, v18, v3, v4, v5, #9 + rgb_to_yuv_product v22, v23, v24, v27, v28, v19, v3, v4, v5, #9 sub w5, w5, #16 add x3, x3, #48 // src += 48 cmp w5, #16 @@ -199,4 +226,12 @@ function ff_rgb24ToUV_neon, export=1 cbnz w5, 2b 3: ret +.endm + +function ff_rgb24ToUV_neon, export=1 + rgbToUV bgr=0 +endfunc + +function ff_bgr24ToUV_neon, export=1 + rgbToUV bgr=1 endfunc diff --git a/libswscale/aarch64/swscale.c b/libswscale/aarch64/swscale.c index e4ea3309ba..c6594944c3 100644 --- a/libswscale/aarch64/swscale.c +++ b/libswscale/aarch64/swscale.c @@ -201,19 +201,18 @@ void ff_yuv2plane1_8_neon( default: break; \ } -void ff_rgb24ToY_neon(uint8_t *_dst, const uint8_t *src, const uint8_t *unused1, - const uint8_t *unused2, int width, - uint32_t *rgb2yuv, void *opq); - -void ff_rgb24ToUV_neon(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *unused0, - const uint8_t *src1, - const uint8_t *src2, int width, uint32_t *rgb2yuv, - void *opq); - -void ff_rgb24ToUV_half_neon(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *unused0, - const uint8_t *src1, - const uint8_t *src2, int width, uint32_t *rgb2yuv, - void *opq); +#define NEON_INPUT(name) \ +void ff_##name##ToY_neon(uint8_t *dst, const uint8_t *src, const uint8_t *, \ + const uint8_t *, int w, uint32_t *coeffs, void *); \ +void ff_##name##ToUV_neon(uint8_t *, uint8_t *, const uint8_t *, \ + const uint8_t *, const uint8_t *, int w, \ + uint32_t *coeffs, void *); \ +void ff_##name##ToUV_half_neon(uint8_t *, uint8_t *, const uint8_t *, \ + const uint8_t *, const uint8_t *, int w, \ + uint32_t *coeffs, void *) + +NEON_INPUT(bgr24); +NEON_INPUT(rgb24); void ff_lumRangeFromJpeg_neon(int16_t *dst, int width); void ff_chrRangeFromJpeg_neon(int16_t *dstU, int16_t *dstV, int width); @@ -247,6 +246,13 @@ av_cold void ff_sws_init_swscale_aarch64(SwsContext *c) c->yuv2planeX = ff_yuv2planeX_8_neon; } switch (c->srcFormat) { + case AV_PIX_FMT_BGR24: + c->lumToYV12 = ff_bgr24ToY_neon; + if (c->chrSrcHSubSample) + c->chrToYV12 = ff_bgr24ToUV_half_neon; + else + c->chrToYV12 = ff_bgr24ToUV_neon; + break; case AV_PIX_FMT_RGB24: c->lumToYV12 = ff_rgb24ToY_neon; if (c->chrSrcHSubSample) From patchwork Wed Jun 19 17:10:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50016 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9187:0:b0:482:c625:d099 with SMTP id s7csp369750vqg; Wed, 19 Jun 2024 10:11:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUTjECJ1CHAwEuThN+aciAtCOboxayN6DTcjKMnR5/reniPlEHH3/29qbGHrkv9B1VxEaEjZNPGEgHRq0dlnupSDxGWBGwPWfjqhA== X-Google-Smtp-Source: AGHT+IGElsoRSUAayOBpydxcEIBo/wSecJmEFnlpTza84oJ49WiaadnKKXfNOEMvv1/XOfPj5SeA X-Received: by 2002:a17:906:1e0c:b0:a6e:7720:7e39 with SMTP id a640c23a62f3a-a6f94c047efmr381415566b.8.1718817061961; Wed, 19 Jun 2024 10:11:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718817061; cv=none; d=google.com; s=arc-20160816; b=YTNOtKemsRjf2K2M3Lc5obQx7FcHaGektPL0ZPj0+Brl6J2RhY+T/Jo+8JvX9D29wt Cm0SRIx2K/y21fYyZNcJdj3SyhD4L4gFPIBparc5v2cE2D9hIDBAuAtYbSHKpidjnSto qyQRyMXDzXdNmBOXMFcx9BKGY936jnaY1nOz11349xz7OvbzCrYTF+4wx3EOOWcSneQT h5izjd6eyXgEfMAXHtxwCVqceX0eZzy5MEO2sEUekiVH9h1Z1mmccXpo93OtXxpLqVWp 8TUNwsHIj2CURLSgKqWTXSs/G1Wd2DF5AF2h5lphq8VHP9cb8Kt35j5dBrFXAvFRtXn6 AfKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=mO20qFiST8nU4NKv9k6NmkLX19qpP6wK0ORy/5f+WeI=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=WU73cqHmoe0sK1Q0O21Z6fPLLWFxrfNXY+EwDlWT4Yg2EiQfpIag3UF9DaBwhQrW0m a6Rb86DzQflj9sbnlBrhUJZ3l7XnRX+SlXe31ORht1AhEhN2YiEv7lk887i7Va2JLjxb r3M2sQmEItyFaPdTkxYdE9KNqAzzeRn1tRJn0gaTDgQ6Dwo06070nyOP635Xum6kio2E 3GJ+zfHXAYxvszNjjSS9Mv0JkcKeiPrUG7GnkiMmIyvAtIaIrytyYpYVGwk9l840qSrB w8X5LZXw2lm1NGVrPlLS8sQtnUCOIfwQckCuqQ7j6u2xxKY9Kuf3yQv7ouBzgYSIZeK3 dA8w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Jlq4+rc3; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6f56df9596si623617266b.669.2024.06.19.10.11.01; Wed, 19 Jun 2024 10:11:01 -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=@foxmail.com header.s=s201512 header.b=Jlq4+rc3; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8FEC668D833; Wed, 19 Jun 2024 20:10:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-72.mail.qq.com (out203-205-251-72.mail.qq.com [203.205.251.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C2F468D827 for ; Wed, 19 Jun 2024 20:10:40 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1718817029; bh=7xS6oUnJ5gi1eXDWKbzOEC2wOekesLEspsSl4iVJi/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Jlq4+rc3j177Sho9Yg2WH6y+G0KvdqfJxgDvTRgoP09HRSW7p1k74h0M4LEW411jy 6jb1TVF6BT641zNMKAhyOr0pmCmPXUY9Q4R+o/kOtYTQy4SyqlBA4a6KKWjq1OArwN 0h4MAKR831fON1eWblHQRR6yajZXvn0ZkSJjPKM8= Received: from ZHILIZHAO-MB1.tencent.com ([114.244.0.205]) by newxmesmtplogicsvrszc5-2.qq.com (NewEsmtp) with SMTP id 29B2FCD3; Thu, 20 Jun 2024 01:10:27 +0800 X-QQ-mid: xmsmtpt1718817028tobmp52yc Message-ID: X-QQ-XMAILINFO: OZiGlmjmGvyhLRRPAJv7Cj9H0b9/Y2C4Ji1ZfcrSbucBNkEZ2mu3G7tZW6qqzD p4rhSik9F+nZF/0a/bM4Gk3Hvzn4xI6HWnJOV5T12J08sEOLwSSgU40eH3mD/NmdY8fdnxgGe2cP 2pFID5dtOtfez+62PLlhkNgN+rbafgRePmnaa+kX/O2zrLduY+IoaK6klXSGvirnK2wXy56Aqptz FX2SmWoht5DuMGM8tfAGBnUL42d9igjwFjeBQhFybRixDeEpZheEZJ7bu21nqSqq9kuXbzRxc6Jx 48m3FcRxaqvjWkG++01Wr/RIrsVNFIbuqKWeT0o/lx3j4LKPv5D6iVDlGMewcrTYK+dK9Rm/REIO vwt2T04vJ67DerEm6lc4ZFIX4atIkbY7TBYsTi88PfJ/qvD7WBvNRDkJ16Ml+FDYD8Q1fs/cCuQP butUxyHj3ntXg8pF29FCqsAOz3tPn6+n6MA+HMjHLoGAlkqKUGW5TIXkuXcFVmPVcN9slJxsW8KZ xmXUl7z+S4MtXl2oGIvE9UB3GXiStmOg3LeRI2O0X1YZAfpJ9MOTAuXOton8sMlDvNej2kFaM9g5 BHcsooQvqMaSvXJvjmW5d3iIjTzLNN7Nd0vAFEZkqCz0lrZ2IP9ZwaivaJm2AcuzZmsxpbCNO3dG zqelUomYwDeour7ELJPMT8ualITNpKuW8P4ptI8uif/dQgPvoABdWUl549Fs9bhrOJKA6cSvu+7q lxx4dodh6DHbhVQUzIVSAINHinfpimmf1lX4/txHigLhREWAuDDJVqsLYb03UWA6XsxXtYWDf/fR UccLNTVVoEtjW2J2uLoazj9o0Lk4z0pg0KzON1ASrdvPIusbzxflrSgouKJ7yKxeBaOa7FWTKz/r /Xlck1EIEg91k6Lb4qcg++O7xkClBqSkDcMkHFqs5r+GBr1OiYE5xO5yaMkI6IP2no63fFXcdyrJ 8lbGdvSd81AJ1LtEntN7ww836wDDkv X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jun 2024 01:10:24 +0800 X-OQ-MSGID: <20240619171025.16420-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240619171025.16420-1-quinkblack@foxmail.com> References: <20240619171025.16420-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] swscale/aarch64: Add bgra/rgba to yuv 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: RvGr95xcPyy5 From: Zhao Zhili Test on Apple M1 with kperf bgra_to_uv_8_c: 13.4 bgra_to_uv_8_neon: 37.4 bgra_to_uv_128_c: 155.9 bgra_to_uv_128_neon: 91.7 bgra_to_uv_1080_c: 1173.2 bgra_to_uv_1080_neon: 822.7 bgra_to_uv_1920_c: 2078.2 bgra_to_uv_1920_neon: 1437.7 bgra_to_uv_half_8_c: 17.9 bgra_to_uv_half_8_neon: 37.4 bgra_to_uv_half_128_c: 103.9 bgra_to_uv_half_128_neon: 73.9 bgra_to_uv_half_1080_c: 850.2 bgra_to_uv_half_1080_neon: 484.2 bgra_to_uv_half_1920_c: 1479.2 bgra_to_uv_half_1920_neon: 824.2 bgra_to_y_8_c: 8.2 bgra_to_y_8_neon: 18.2 bgra_to_y_128_c: 101.4 bgra_to_y_128_neon: 74.9 bgra_to_y_1080_c: 739.4 bgra_to_y_1080_neon: 613.4 bgra_to_y_1920_c: 1298.7 bgra_to_y_1920_neon: 918.7 --- libswscale/aarch64/input.S | 69 +++++++++++++++++++++++++++++------- libswscale/aarch64/swscale.c | 16 +++++++++ 2 files changed, 72 insertions(+), 13 deletions(-) diff --git a/libswscale/aarch64/input.S b/libswscale/aarch64/input.S index cf8d062942..f73afcfe9d 100644 --- a/libswscale/aarch64/input.S +++ b/libswscale/aarch64/input.S @@ -20,8 +20,12 @@ #include "libavutil/aarch64/asm.S" -.macro rgb_to_yuv_load_rgb src +.macro rgb_to_yuv_load_rgb src, element=3 + .if \element == 3 ld3 { v16.16b, v17.16b, v18.16b }, [\src] + .else + ld4 { v16.16b, v17.16b, v18.16b, v19.16b }, [\src] + .endif uxtl v19.8h, v16.8b // v19: r uxtl v20.8h, v17.8b // v20: g uxtl v21.8h, v18.8b // v21: b @@ -43,7 +47,7 @@ sqshrn2 \dst\().8h, \dst2\().4s, \right_shift // dst_higher_half = dst2 >> right_shift .endm -.macro rgbToY bgr +.macro rgbToY bgr, element=3 cmp w4, #0 // check width > 0 .if \bgr ldp w12, w11, [x5] // w12: ry, w11: gy @@ -64,11 +68,11 @@ dup v2.8h, w12 b.lt 2f 1: - rgb_to_yuv_load_rgb x1 + rgb_to_yuv_load_rgb x1, \element rgb_to_yuv_product v19, v20, v21, v25, v26, v16, v0, v1, v2, #9 rgb_to_yuv_product v22, v23, v24, v27, v28, v17, v0, v1, v2, #9 sub w4, w4, #16 // width -= 16 - add x1, x1, #48 // src += 48 + add x1, x1, #(16*\element) cmp w4, #16 // width >= 16 ? stp q16, q17, [x0], #32 // store to dst b.ge 1b @@ -83,7 +87,7 @@ smaddl x13, w15, w12, x13 // x13 += by * b asr w13, w13, #9 // x13 >>= 9 sub w4, w4, #1 // width-- - add x1, x1, #3 // src += 3 + add x1, x1, #\element strh w13, [x0], #2 // store to dst cbnz w4, 2b 3: @@ -98,6 +102,14 @@ function ff_bgr24ToY_neon, export=1 rgbToY bgr=1 endfunc +function ff_rgba32ToY_neon, export=1 + rgbToY bgr=0, element=4 +endfunc + +function ff_bgra32ToY_neon, export=1 + rgbToY bgr=1, element=4 +endfunc + .macro rgb_load_uv_coeff half, bgr .if \bgr ldp w12, w11, [x6, #12] @@ -124,7 +136,7 @@ endfunc dup v6.4s, w9 .endm -.macro rgbToUV_half bgr +.macro rgbToUV_half bgr, element=3 cmp w5, #0 // check width > 0 b.le 3f @@ -132,7 +144,11 @@ endfunc rgb_load_uv_coeff half=1, bgr=\bgr b.lt 2f 1: + .if \element == 3 ld3 { v16.16b, v17.16b, v18.16b }, [x3] + .else + ld4 { v16.16b, v17.16b, v18.16b, v19.16b }, [x3] + .endif uaddlp v19.8h, v16.16b // v19: r uaddlp v20.8h, v17.16b // v20: g uaddlp v21.8h, v18.16b // v21: b @@ -140,7 +156,7 @@ endfunc rgb_to_yuv_product v19, v20, v21, v22, v23, v16, v0, v1, v2, #10 rgb_to_yuv_product v19, v20, v21, v24, v25, v17, v3, v4, v5, #10 sub w5, w5, #8 // width -= 8 - add x3, x3, #48 // src += 48 + add x3, x3, #(16*\element) cmp w5, #8 // width >= 8 ? str q16, [x0], #16 // store dst_u str q17, [x1], #16 // store dst_v @@ -148,9 +164,10 @@ endfunc cbz w5, 3f 2: ldrb w2, [x3] // w2: r1 - ldrb w4, [x3, #3] // w4: r2 + ldrb w4, [x3, #\element] // w4: r2 add w2, w2, w4 // w2 = r1 + r2 + .if \element == 3 ldrb w4, [x3, #1] // w4: g1 ldrb w7, [x3, #4] // w7: g2 add w4, w4, w7 // w4 = g1 + g2 @@ -158,6 +175,15 @@ endfunc ldrb w7, [x3, #2] // w7: b1 ldrb w8, [x3, #5] // w8: b2 add w7, w7, w8 // w7 = b1 + b2 + .else + ldrb w4, [x3, #1] // w4: g1 + ldrb w7, [x3, #5] // w7: g2 + add w4, w4, w7 // w4 = g1 + g2 + + ldrb w7, [x3, #2] // w7: b1 + ldrb w8, [x3, #6] // w8: b2 + add w7, w7, w8 // w7 = b1 + b2 + .endif smaddl x8, w2, w10, x9 // dst_u = ru * r + const_offset smaddl x8, w4, w11, x8 // dst_u += gu * g @@ -170,7 +196,8 @@ endfunc smaddl x8, w7, w15, x8 // dst_v += bv * b asr x8, x8, #10 // dst_v >>= 10 sub w5, w5, #1 - add x3, x3, #6 // src += 6 + ldrb w4, [x3, #1] // w4: g1 + add x3, x3, #(2*\element) strh w8, [x1], #2 // store dst_v cbnz w5, 2b 3: @@ -185,7 +212,15 @@ function ff_bgr24ToUV_half_neon, export=1 rgbToUV_half bgr=1 endfunc -.macro rgbToUV bgr +function ff_rgba32ToUV_half_neon, export=1 + rgbToUV_half bgr=0, element=4 +endfunc + +function ff_bgra32ToUV_half_neon, export=1 + rgbToUV_half bgr=1, element=4 +endfunc + +.macro rgbToUV bgr, element=3 cmp w5, #0 // check width > 0 b.le 3f @@ -193,13 +228,13 @@ endfunc rgb_load_uv_coeff half=0, bgr=\bgr b.lt 2f 1: - rgb_to_yuv_load_rgb x3 + rgb_to_yuv_load_rgb x3, \element rgb_to_yuv_product v19, v20, v21, v25, v26, v16, v0, v1, v2, #9 rgb_to_yuv_product v22, v23, v24, v27, v28, v17, v0, v1, v2, #9 rgb_to_yuv_product v19, v20, v21, v25, v26, v18, v3, v4, v5, #9 rgb_to_yuv_product v22, v23, v24, v27, v28, v19, v3, v4, v5, #9 sub w5, w5, #16 - add x3, x3, #48 // src += 48 + add x3, x3, #(16*\element) cmp w5, #16 stp q16, q17, [x0], #32 // store to dst_u stp q18, q19, [x1], #32 // store to dst_v @@ -221,7 +256,7 @@ endfunc smaddl x8, w4, w15, x8 // x8 += bv * b asr w8, w8, #9 // x8 >>= 9 sub w5, w5, #1 // width-- - add x3, x3, #3 // src += 3 + add x3, x3, #\element strh w8, [x1], #2 // store to dst_v cbnz w5, 2b 3: @@ -235,3 +270,11 @@ endfunc function ff_bgr24ToUV_neon, export=1 rgbToUV bgr=1 endfunc + +function ff_rgba32ToUV_neon, export=1 + rgbToUV bgr=0, element=4 +endfunc + +function ff_bgra32ToUV_neon, export=1 + rgbToUV bgr=1, element=4 +endfunc diff --git a/libswscale/aarch64/swscale.c b/libswscale/aarch64/swscale.c index c6594944c3..92af662014 100644 --- a/libswscale/aarch64/swscale.c +++ b/libswscale/aarch64/swscale.c @@ -212,7 +212,9 @@ void ff_##name##ToUV_half_neon(uint8_t *, uint8_t *, const uint8_t *, \ uint32_t *coeffs, void *) NEON_INPUT(bgr24); +NEON_INPUT(bgra32); NEON_INPUT(rgb24); +NEON_INPUT(rgba32); void ff_lumRangeFromJpeg_neon(int16_t *dst, int width); void ff_chrRangeFromJpeg_neon(int16_t *dstU, int16_t *dstV, int width); @@ -253,6 +255,13 @@ av_cold void ff_sws_init_swscale_aarch64(SwsContext *c) else c->chrToYV12 = ff_bgr24ToUV_neon; break; + case AV_PIX_FMT_BGRA: + c->lumToYV12 = ff_bgra32ToY_neon; + if (c->chrSrcHSubSample) + c->chrToYV12 = ff_bgra32ToUV_half_neon; + else + c->chrToYV12 = ff_bgra32ToUV_neon; + break; case AV_PIX_FMT_RGB24: c->lumToYV12 = ff_rgb24ToY_neon; if (c->chrSrcHSubSample) @@ -260,6 +269,13 @@ av_cold void ff_sws_init_swscale_aarch64(SwsContext *c) else c->chrToYV12 = ff_rgb24ToUV_neon; break; + case AV_PIX_FMT_RGBA: + c->lumToYV12 = ff_rgba32ToY_neon; + if (c->chrSrcHSubSample) + c->chrToYV12 = ff_rgba32ToUV_half_neon; + else + c->chrToYV12 = ff_rgba32ToUV_neon; + break; default: break; } From patchwork Wed Jun 19 17:10:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50015 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9187:0:b0:482:c625:d099 with SMTP id s7csp369637vqg; Wed, 19 Jun 2024 10:10:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWaWDTq2Xm+Bns9SDTEAv9cFbyW9jtCKE4EGs6C41hFsbDc3YXV2b97AcO0pn3l6yS9jZYYquF9uEp/06XWeaRo07UOyS1Cfs/kiQ== X-Google-Smtp-Source: AGHT+IE1Mjv+N+f9Y9BCXoiPvdt9nKJnR0jMEEyyV4JRlavtjqm632dJQkKLh2PSnpgSh4o3DzyC X-Received: by 2002:a19:7719:0:b0:52b:bd23:1e9 with SMTP id 2adb3069b0e04-52ccaa4eb27mr1519830e87.1.1718817050711; Wed, 19 Jun 2024 10:10:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718817050; cv=none; d=google.com; s=arc-20160816; b=f41PnAZBO8Fm4MUN0LMBMJw9fUdGZiSRivtE50mdW7uozbZ6qHepAu684AHP2knocf /vhT/pl7iY78KZKxoT2L7/+QUIKkY2sG4a7flBPDJM2q7xosP/2+dYwL8yJSEbtDi9j0 Tsl1iU3g19cirAtbpH/R3qDoph/6RdTnBqcdMKwqjylu/JZckXowQvNo/9wXmGzJOjgX qo0vbi0lqRA3yEdGGSULJqD7CoS417ZEopZixPmzBE9n4prVORhzq9Az+t5X9lPr/bRg FqLhOoldh7rmA2YG8+zjEn8S48wYCvXHJH0yQVD79u8qKbluVDDyATkYbNmwPvqCncBX iMsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=YQQkvRN4SVF8XWmJ+ytXm1XQRyGKF7QHA5Ey79s9yS0=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=dhCkpbJ0zDV7W2FgWXc2AxANxGQIPAS3RMyPOcloSfsSPgyJhcTwC7xCjybCXJT50u o/x8ybwB1546MYJbW1hAF9TaBqQsd7LcKLzihlaVhWaxnjAlINxQ5se4xsfNrYCo0cBG S8T2CWBgmx1KSIvoFPZ+Uzsxl8kJ1wSMc5n/15zLfcSaICnAnirU2KlpZix/TKAR8o66 vhk+k5+7WYj49uE/6YoiLo2wsq2S26W4E/atk84l8dCKA1UYy9tBk3RqX3ZFeuzCw0Uq Rotqy7+ajmBlK6c1ULHxQ9FRr0CGvhP9NmWHSubVFkk0L+XALyqGIHvqDSan0kkqq0MM kkQA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Eue27TzH; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6f56e264d0si640673566b.713.2024.06.19.10.10.48; Wed, 19 Jun 2024 10:10:50 -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=@foxmail.com header.s=s201512 header.b=Eue27TzH; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 84A4168D827; Wed, 19 Jun 2024 20:10:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-53.mail.qq.com (out203-205-251-53.mail.qq.com [203.205.251.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD56F68D762 for ; Wed, 19 Jun 2024 20:10:39 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1718817030; bh=U4Ocp0UM0cbPRBJPpG7+wlIlWnQmkKdLw5hJo6cGw4U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Eue27TzHWZIk2zSkIM/GM+PaLa4rB6d6gZMRNZpJwIDdBaeeHkV3dzDHc7pDAFCxV WoPzLYzfpg6fTnzzT3smZ75614Ck3fWfFcBMUk6cLQg83bJWi2Qpm2DuUTRvOeZDkG LE+BP/8roKnRxSIU7u9kuiNaMs/dmu10wIkB/tb0= Received: from ZHILIZHAO-MB1.tencent.com ([114.244.0.205]) by newxmesmtplogicsvrszc5-2.qq.com (NewEsmtp) with SMTP id 29B2FCD3; Thu, 20 Jun 2024 01:10:27 +0800 X-QQ-mid: xmsmtpt1718817029t31f42dam Message-ID: X-QQ-XMAILINFO: MIAHdi1iQo+z2f1LY3UH/1h58dS0apIFz0y/VvgP0/Ov9XDJQNcoQSanv9pFCk RJe50chq63phz6YsD8WCShcRma+wT2czjv87b/lwTwkckjcRm9CYum03tiiXAWEF5joIOSlyCZuI Eqel5fi//TexNjlBV6oASSY+/MZb64wykEugpVgf/x1OsYWTGIgf2GPDB5AXxk1mQsDIWCRslH4u qMZDAGvS7y77RRX029e5uMmswB5x0coej4L5t9C0EFtfv2vMlk7xbD4gXbCg23SSqsjv3RoMp2Xg pap8YD9zf0TrKInC56k4805Rr/MMmlVSv2rX22T7HGJ9uU9m/gSrU87B5XJizT17VwWqfWM7EU0g utEPYb0d7k4kvJRJMnTe1Ok0yX04fsiL7NklIVAShyyXbpCLe5gX/FyG+Q430f10euM9GyHJPPgR xBKZvPzCtN738HXmUQzASc+YUHaWX3Uu7LoAblUJpxH3NwVyCVxjhudpL9EpJPlHBrA94Dh7dOv/ cScoMYGnvbiiKx+6ZBMnsJtF8bcpS1YrQfs2X2uvRR3WlzfQX8kcW5mPJNxVXGVeKlbsshlU+Kd0 iYCOnBvVb6uKfbbWn7aUZJ/Kzx7aOgUm39kO99KIPfL9hJAdFOdWvE3nduFb03iMPujDbWwnCml8 C4HRbX2RQwCuG6Q5fufLHFdxh7puy3bjCv6y3egYP3ovAjh2IkxBK3ZZ3lrE3EKjvGEDVLM+6vxY eZzcrM/bvtIzAQ3eLGN0ZcKaeVMQRhVT3YC0vN1Ifk/YIz5Pr+woBP3IlwZt53Br9gE3fIN1s8G4 SjLySJ5tsKvplF6ep9Z+aPxAsCQukB7TpmAkDnk08IW3xf7I567S7uFP5UELnLrm3dLuAi8tsSJK O12vyLHaIohz8BfVKpE7CidRtK4Lh9B69ax5LO4VDgAQZsYyhEfe01DoAv3vbzbh6Q69XlAGZI71 uGd3TqVW+BTHL0pvoB95qJU3ISFGb4SIkw7SvcwLYDVnl/+EOhWPbfSnppxupW X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jun 2024 01:10:25 +0800 X-OQ-MSGID: <20240619171025.16420-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240619171025.16420-1-quinkblack@foxmail.com> References: <20240619171025.16420-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] swscale/aarch64: Add argb/abgr to yuv 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2vW+b5EirRUP From: Zhao Zhili Test on Apple M1 with kperf: abgr_to_uv_8_c: 19.4 abgr_to_uv_8_neon: 29.9 abgr_to_uv_128_c: 146.4 abgr_to_uv_128_neon: 85.1 abgr_to_uv_1080_c: 1162.6 abgr_to_uv_1080_neon: 819.6 abgr_to_uv_1920_c: 2063.6 abgr_to_uv_1920_neon: 1435.1 abgr_to_uv_half_8_c: 16.4 abgr_to_uv_half_8_neon: 35.6 abgr_to_uv_half_128_c: 108.6 abgr_to_uv_half_128_neon: 75.4 abgr_to_uv_half_1080_c: 883.4 abgr_to_uv_half_1080_neon: 460.6 abgr_to_uv_half_1920_c: 1553.6 abgr_to_uv_half_1920_neon: 817.6 abgr_to_y_8_c: 6.1 abgr_to_y_8_neon: 40.6 abgr_to_y_128_c: 99.9 abgr_to_y_128_neon: 67.4 abgr_to_y_1080_c: 735.9 abgr_to_y_1080_neon: 534.6 abgr_to_y_1920_c: 1279.4 abgr_to_y_1920_neon: 932.6 Disable vectorization in clang: abgr_to_uv_8_c: 20.9 abgr_to_uv_8_neon: 44.1 abgr_to_uv_128_c: 555.6 abgr_to_uv_128_neon: 105.9 abgr_to_uv_1080_c: 4773.1 abgr_to_uv_1080_neon: 846.1 abgr_to_uv_1920_c: 8499.9 abgr_to_uv_1920_neon: 1436.6 abgr_to_uv_half_8_c: 13.9 abgr_to_uv_half_8_neon: 167.9 abgr_to_uv_half_128_c: 338.9 abgr_to_uv_half_128_neon: 60.6 abgr_to_uv_half_1080_c: 2906.9 abgr_to_uv_half_1080_neon: 466.1 abgr_to_uv_half_1920_c: 5084.4 abgr_to_uv_half_1920_neon: 832.9 abgr_to_y_8_c: 9.6 abgr_to_y_8_neon: 18.6 abgr_to_y_128_c: 372.4 abgr_to_y_128_neon: 61.4 abgr_to_y_1080_c: 3168.9 abgr_to_y_1080_neon: 513.9 abgr_to_y_1920_c: 6187.6 abgr_to_y_1920_neon: 918.9 --- libswscale/aarch64/input.S | 104 ++++++++++++++++++++++++++++------- libswscale/aarch64/swscale.c | 17 ++++++ 2 files changed, 100 insertions(+), 21 deletions(-) diff --git a/libswscale/aarch64/input.S b/libswscale/aarch64/input.S index f73afcfe9d..94b79a1d98 100644 --- a/libswscale/aarch64/input.S +++ b/libswscale/aarch64/input.S @@ -34,6 +34,16 @@ uxtl2 v24.8h, v18.16b // v24: b .endm +.macro argb_to_yuv_load_rgb src + ld4 { v16.16b, v17.16b, v18.16b, v19.16b }, [\src] + uxtl v21.8h, v19.8b // v21: b + uxtl2 v24.8h, v19.16b // v24: b + uxtl v19.8h, v17.8b // v19: r + uxtl v20.8h, v18.8b // v20: g + uxtl2 v22.8h, v17.16b // v22: r + uxtl2 v23.8h, v18.16b // v23: g +.endm + .macro rgb_to_yuv_product r, g, b, dst1, dst2, dst, coef0, coef1, coef2, right_shift mov \dst1\().16b, v6.16b // dst1 = const_offset mov \dst2\().16b, v6.16b // dst2 = const_offset @@ -47,7 +57,7 @@ sqshrn2 \dst\().8h, \dst2\().4s, \right_shift // dst_higher_half = dst2 >> right_shift .endm -.macro rgbToY bgr, element=3 +.macro rgbToY bgr, element=3, alpha_first=0 cmp w4, #0 // check width > 0 .if \bgr ldp w12, w11, [x5] // w12: ry, w11: gy @@ -68,7 +78,11 @@ dup v2.8h, w12 b.lt 2f 1: + .if \alpha_first + argb_to_yuv_load_rgb x1 + .else rgb_to_yuv_load_rgb x1, \element + .endif rgb_to_yuv_product v19, v20, v21, v25, v26, v16, v0, v1, v2, #9 rgb_to_yuv_product v22, v23, v24, v27, v28, v17, v0, v1, v2, #9 sub w4, w4, #16 // width -= 16 @@ -78,9 +92,15 @@ b.ge 1b cbz x4, 3f 2: + .if \alpha_first + ldrb w13, [x1, #1] // w13: r + ldrb w14, [x1, #2] // w14: g + ldrb w15, [x1, #3] // w15: b + .else ldrb w13, [x1] // w13: r ldrb w14, [x1, #1] // w14: g ldrb w15, [x1, #2] // w15: b + .endif smaddl x13, w13, w10, x9 // x13 = ry * r + const_offset smaddl x13, w14, w11, x13 // x13 += gy * g @@ -94,6 +114,14 @@ ret .endm +function ff_argb32ToY_neon, export=1 + rgbToY bgr=0, element=4, alpha_first=1 +endfunc + +function ff_abgr32ToY_neon, export=1 + rgbToY bgr=1, element=4, alpha_first=1 +endfunc + function ff_rgb24ToY_neon, export=1 rgbToY bgr=0 endfunc @@ -136,7 +164,21 @@ endfunc dup v6.4s, w9 .endm -.macro rgbToUV_half bgr, element=3 +.macro rgb_load_add_half off_r1, off_r2, off_g1, off_g2, off_b1, off_b2 + ldrb w2, [x3, #\off_r1] // w2: r1 + ldrb w4, [x3, #\off_r2] // w4: r2 + add w2, w2, w4 // w2 = r1 + r2 + + ldrb w4, [x3, #\off_g1] // w4: g1 + ldrb w7, [x3, #\off_g2] // w7: g2 + add w4, w4, w7 // w4 = g1 + g2 + + ldrb w7, [x3, #\off_b1] // w7: b1 + ldrb w8, [x3, #\off_b2] // w8: b2 + add w7, w7, w8 // w7 = b1 + b2 +.endm + +.macro rgbToUV_half bgr, element=3, alpha_first=0 cmp w5, #0 // check width > 0 b.le 3f @@ -149,9 +191,15 @@ endfunc .else ld4 { v16.16b, v17.16b, v18.16b, v19.16b }, [x3] .endif + .if \alpha_first + uaddlp v21.8h, v19.16b + uaddlp v20.8h, v18.16b + uaddlp v19.8h, v17.16b + .else uaddlp v19.8h, v16.16b // v19: r uaddlp v20.8h, v17.16b // v20: g uaddlp v21.8h, v18.16b // v21: b + .endif rgb_to_yuv_product v19, v20, v21, v22, v23, v16, v0, v1, v2, #10 rgb_to_yuv_product v19, v20, v21, v24, v25, v17, v3, v4, v5, #10 @@ -163,27 +211,15 @@ endfunc b.ge 1b cbz w5, 3f 2: - ldrb w2, [x3] // w2: r1 - ldrb w4, [x3, #\element] // w4: r2 - add w2, w2, w4 // w2 = r1 + r2 - +.if \alpha_first + rgb_load_add_half 1, 5, 2, 6, 3, 7 +.else .if \element == 3 - ldrb w4, [x3, #1] // w4: g1 - ldrb w7, [x3, #4] // w7: g2 - add w4, w4, w7 // w4 = g1 + g2 - - ldrb w7, [x3, #2] // w7: b1 - ldrb w8, [x3, #5] // w8: b2 - add w7, w7, w8 // w7 = b1 + b2 + rgb_load_add_half 0, 3, 1, 4, 2, 5 .else - ldrb w4, [x3, #1] // w4: g1 - ldrb w7, [x3, #5] // w7: g2 - add w4, w4, w7 // w4 = g1 + g2 - - ldrb w7, [x3, #2] // w7: b1 - ldrb w8, [x3, #6] // w8: b2 - add w7, w7, w8 // w7 = b1 + b2 + rgb_load_add_half 0, 4, 1, 5, 2, 6 .endif +.endif smaddl x8, w2, w10, x9 // dst_u = ru * r + const_offset smaddl x8, w4, w11, x8 // dst_u += gu * g @@ -204,6 +240,14 @@ endfunc ret .endm +function ff_argb32ToUV_half_neon, export=1 + rgbToUV_half bgr=0, element=4, alpha_first=1 +endfunc + +function ff_abgr32ToUV_half_neon, export=1 + rgbToUV_half bgr=1, element=4, alpha_first=1 +endfunc + function ff_rgb24ToUV_half_neon, export=1 rgbToUV_half bgr=0 endfunc @@ -220,7 +264,7 @@ function ff_bgra32ToUV_half_neon, export=1 rgbToUV_half bgr=1, element=4 endfunc -.macro rgbToUV bgr, element=3 +.macro rgbToUV bgr, element=3, alpha_first=0 cmp w5, #0 // check width > 0 b.le 3f @@ -228,7 +272,11 @@ endfunc rgb_load_uv_coeff half=0, bgr=\bgr b.lt 2f 1: + .if \alpha_first + argb_to_yuv_load_rgb x3 + .else rgb_to_yuv_load_rgb x3, \element + .endif rgb_to_yuv_product v19, v20, v21, v25, v26, v16, v0, v1, v2, #9 rgb_to_yuv_product v22, v23, v24, v27, v28, v17, v0, v1, v2, #9 rgb_to_yuv_product v19, v20, v21, v25, v26, v18, v3, v4, v5, #9 @@ -241,9 +289,15 @@ endfunc b.ge 1b cbz w5, 3f 2: + .if \alpha_first + ldrb w16, [x3, #1] // w16: r + ldrb w17, [x3, #2] // w17: g + ldrb w4, [x3, #3] // w4: b + .else ldrb w16, [x3] // w16: r ldrb w17, [x3, #1] // w17: g ldrb w4, [x3, #2] // w4: b + .endif smaddl x8, w16, w10, x9 // x8 = ru * r + const_offset smaddl x8, w17, w11, x8 // x8 += gu * g @@ -263,6 +317,14 @@ endfunc ret .endm +function ff_argb32ToUV_neon, export=1 + rgbToUV bgr=0, element=4, alpha_first=1 +endfunc + +function ff_abgr32ToUV_neon, export=1 + rgbToUV bgr=1, element=4, alpha_first=1 +endfunc + function ff_rgb24ToUV_neon, export=1 rgbToUV bgr=0 endfunc diff --git a/libswscale/aarch64/swscale.c b/libswscale/aarch64/swscale.c index 92af662014..eb907284e7 100644 --- a/libswscale/aarch64/swscale.c +++ b/libswscale/aarch64/swscale.c @@ -211,6 +211,8 @@ void ff_##name##ToUV_half_neon(uint8_t *, uint8_t *, const uint8_t *, \ const uint8_t *, const uint8_t *, int w, \ uint32_t *coeffs, void *) +NEON_INPUT(abgr32); +NEON_INPUT(argb32); NEON_INPUT(bgr24); NEON_INPUT(bgra32); NEON_INPUT(rgb24); @@ -248,6 +250,21 @@ av_cold void ff_sws_init_swscale_aarch64(SwsContext *c) c->yuv2planeX = ff_yuv2planeX_8_neon; } switch (c->srcFormat) { + case AV_PIX_FMT_ABGR: + c->lumToYV12 = ff_abgr32ToY_neon; + if (c->chrSrcHSubSample) + c->chrToYV12 = ff_abgr32ToUV_half_neon; + else + c->chrToYV12 = ff_abgr32ToUV_neon; + break; + + case AV_PIX_FMT_ARGB: + c->lumToYV12 = ff_argb32ToY_neon; + if (c->chrSrcHSubSample) + c->chrToYV12 = ff_argb32ToUV_half_neon; + else + c->chrToYV12 = ff_argb32ToUV_neon; + break; case AV_PIX_FMT_BGR24: c->lumToYV12 = ff_bgr24ToY_neon; if (c->chrSrcHSubSample)