From patchwork Mon Jun 24 13:02:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50124 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp2000269vqz; Mon, 24 Jun 2024 06:12:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXKewbgc1HLxR7SfYWFbFYqRDkkQTxd21pjUS7vBsEjbgC6BSJg1fZe2YiANA+FKjArhYD6yHOkBRprtUijQQ66NUBBRM6wQrhugw== X-Google-Smtp-Source: AGHT+IFmYsX2+eY6usBbaNjvj1/pZnqJtsCVJs2Du8XBQIvpbdMvbYsFICapXGKbneOlkMbpvciU X-Received: by 2002:a17:907:6a0e:b0:a6f:e05b:b1f5 with SMTP id a640c23a62f3a-a7245c84f13mr334957766b.6.1719234766573; Mon, 24 Jun 2024 06:12:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719234766; cv=none; d=google.com; s=arc-20160816; b=ymy39vnC7Flth0A3Jn4doyk/DcALWSC893lWkn1GeoC92gH3D/cOfoW2J8KG4msJLt HfUXPtN0NDEAr6Qv+C1wMyyref09Uh5vs5EnlaTxiKpTC6YzYfU9bLTpf5Vdi6BsHY7B XLdDyNrS0Mu3Y937b78USy3EPStteGEhCJ5AMv3uK3ApGAHghiF1msCJdQu4gIj/BMiG 9zMY4WUnyj2Hu8pEeUj//g+hgQnsfZPYNVTjujLH0I+Z28lJp92iEDMJGec4hgtiR6gC TXyXNI09u3BS6VL8WaeOZxxJKUn4IXEVw4Xw1kvoZDeQvGDKl9sewgnooN2W6y+wdDLJ w2cQ== 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=cu6MwSTzFUlSCOBjCyv1qEKly6/g+ptBMMT3ErPRcR0=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=kh8wYktNTqdZq7ir3f68qf4RfmzLzfP9NbPeqjNdQUCOEYwD8TqQ3iN2Q/wfc7Qk68 tzxqXAZ0teZ/t/v6rPaYiloBI36chggqvuKlJMFu9BOpDKnf4FtVQgxvAy2ZHaqPnMNP 7zqVR+dFT8NVdkpEzsdPgKTUi89lYXNMAEV/YVfYNesq7i4trYqZucR2n/44jK6VVgCQ 0jRqx8sMG/R29VC20NtX+pwPMhS/4LITVr5eEGforWUUwoK1IS07VPL+SdzMzfNeQ+67 8cVrTAhnMSAgvTcg2vAi3Dhjv2szvnqB7dLZPr1DRr01EIxtPsg289TKZE0UtxJ1F53k IvWg==; 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=lTuIPRym; 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-a6fcf579dcbsi383388266b.877.2024.06.24.06.12.46; Mon, 24 Jun 2024 06:12:46 -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=lTuIPRym; 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 1C6BC68D62E; Mon, 24 Jun 2024 16:02:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-242.mail.qq.com (out203-205-221-242.mail.qq.com [203.205.221.242]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFE5568D0E4 for ; Mon, 24 Jun 2024 16:02:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1719234137; bh=8WYXPGxnKhEGtYyFmoqHbV07jZjAb6611Iimmve4s/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lTuIPRymMW0eDIKMHErvLFxQeRQpoj9Bf7spTCSUimhFoRJQNAexKVR4UGDcg6NNj j/O+Ouf7qBm5zBb8NthoU/8g5MAmEtdZr0hhLiDLE0KNDODXhDZ+Gl0S2YIvggeFLU gfofo4o1KUyjmSvmIDQ/ZJa79yqbm0qSWIaoUN3s= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.191]) by newxmesmtplogicsvrszb9-1.qq.com (NewEsmtp) with SMTP id 903582A; Mon, 24 Jun 2024 21:02:16 +0800 X-QQ-mid: xmsmtpt1719234136t474dzsvx Message-ID: X-QQ-XMAILINFO: NGZp1yYNf7Y+F1vsZ8ABarUf7w3+Sd4cKl9q+y5ecmzfSwavFr1GQVIEPf8yFk xLWbTG77+vOBSy5QChyKgdlj7zTBdOF5XtLyLNxAisgCdbTjJjSiBhuJwIJfxn+2e1jo0l1jAaOO 2e4K0Mw9p5+2EmUH6T9h92sKV1wr/ASzaxkS4XuwtlYiwf7B3xTuDhChUXOId2OdsaW0Ty9d6aZI 8+R4cxNvlXLIK3wbe5e7LgzDPb7ffsBjZ3UdoCZZWJkde/sQgNtADbjaDI5ntThPhNCY136Gij1n aP+0wn2qVtLfFM7s2BaUNCkTPT/xtGUk+7MZsqRch3lxuAkzPD33JBuHZIwCMurwDQsgsNyUeV7U uwmSPUZzU58TOa6Bnl3ptyKVMop56s7clSo8LTi9OzfBbj9rusryZT9jk+jOxGEpT53V12T90aIg 04yyF3L7r7qAdlFVPxi8nYesA1cLFoifC7fMUOANdW+0Pb/NKuqH/NP4PK08eoTksUX95S5tHEay cH5xahiz23X+0cxD763SkG0SR2aIDt4tucE54env4jXURAIu4AkE0FaLJw77FU5RNJYFc/JRFzrV RBTdIlAomAd/x2SHqt0SfYmnPPbPdEUlIP9yu2mwrUdrWPw68xKu0NzYfVAirCazb7cFRrwYcB9Q TfaPD6yZofOJ7n75vRstbhIJA/H7+CwzfBRO0Tx/8hypR9O6b731l7GcZRaZP8rbNGvavpui5kHG rMl4b5cPbtgEfVrSeRHbGhg2MXH+KzWiWltXl0RycV8Uq8/vFog9oA1YGIQjmFbt0sWrNwa9lPFE qF0p4cH7CJQ2QwIIDwaXnnWsreSIahJzWPRgXJDvTOiIG3a/fZcIriyhu4Q0EM7NmN+3SImmeJsM mHrUD47CqaS2/6+hL97hqzhXl3rwJ/TPTZ2lz9Sn3gQjngVt45eJz2iI+7Z1a6QUdkNGOWGVOc1g oUngUKLQ5DQ1LT41myzIUnc5PE1paFdsvi/3beAmJCwinLyUc7AkOaaaZzfVECHOj5FMv824ofJz nSn4hgwPiCmGISxtaBi0Ks6B4X43cPC1Mk7qzmN52u2EOJUJcDyT/XoDNdj3Q= X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 21:02:11 +0800 X-OQ-MSGID: <20240624130213.71634-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: UcBkTDyKJiJ0 From: Zhao Zhili Test on Apple M1 with kperf : -O3 : -O3 -fno-vectorize bgr24_to_uv_8_c : 28.5 : 52.5 bgr24_to_uv_8_neon : 54.5 : 59.7 bgr24_to_uv_128_c : 294.0 : 830.7 bgr24_to_uv_128_neon : 99.7 : 112.0 bgr24_to_uv_1080_c : 965.0 : 6624.0 bgr24_to_uv_1080_neon : 751.5 : 754.7 bgr24_to_uv_1920_c : 1693.2 : 11554.5 bgr24_to_uv_1920_neon : 1292.5 : 1307.5 bgr24_to_uv_half_8_c : 54.2 : 37.0 bgr24_to_uv_half_8_neon : 27.2 : 22.5 bgr24_to_uv_half_128_c : 127.2 : 392.5 bgr24_to_uv_half_128_neon : 63.0 : 52.0 bgr24_to_uv_half_1080_c : 880.2 : 3329.0 bgr24_to_uv_half_1080_neon : 401.5 : 390.7 bgr24_to_uv_half_1920_c : 1585.7 : 6390.7 bgr24_to_uv_half_1920_neon : 694.7 : 698.7 bgr24_to_y_8_c : 21.7 : 22.5 bgr24_to_y_8_neon : 797.2 : 25.5 bgr24_to_y_128_c : 88.0 : 280.5 bgr24_to_y_128_neon : 63.7 : 55.0 bgr24_to_y_1080_c : 616.7 : 2208.7 bgr24_to_y_1080_neon : 900.0 : 452.0 bgr24_to_y_1920_c : 1093.2 : 3894.7 bgr24_to_y_1920_neon : 777.2 : 767.5 --- libswscale/aarch64/input.S | 71 ++++++++++++++++++++++++++---------- libswscale/aarch64/swscale.c | 32 +++++++++------- 2 files changed, 71 insertions(+), 32 deletions(-) diff --git a/libswscale/aarch64/input.S b/libswscale/aarch64/input.S index 33afa34111..2cfec4cb6a 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,12 +43,20 @@ sqshrn2 \dst\().8h, \dst2\().4s, \right_shift // dst_higher_half = dst2 >> right_shift .endm +function ff_bgr24ToY_neon, export=1 + cmp w4, #0 // check width > 0 + ldp w12, w11, [x5] // w12: ry, w11: gy + ldr w10, [x5, #8] // w10: by + b.gt 4f + ret +endfunc + function ff_rgb24ToY_neon, export=1 cmp w4, #0 // check width > 0 ldp w10, w11, [x5] // w10: ry, w11: gy ldr w12, [x5, #8] // w12: by b.le 3f - +4: mov w9, #256 // w9 = 1 << (RGB2YUV_SHIFT - 7) movk w9, #8, lsl #16 // w9 += 32 << (RGB2YUV_SHIFT - 1) dup v6.4s, w9 // w9: const_offset @@ -59,9 +67,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 ? @@ -85,10 +93,7 @@ function ff_rgb24ToY_neon, export=1 ret endfunc -.macro rgb24_load_uv_coeff half - 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 +.macro rgb_set_uv_coeff half .if \half mov w9, #512 movk w9, #128, lsl #16 // w9: const_offset @@ -105,12 +110,26 @@ endfunc dup v6.4s, w9 .endm +function ff_bgr24ToUV_half_neon, export=1 + cmp w5, #0 // check width > 0 + b.le 3f + + ldp w12, w11, [x6, #12] + ldp w10, w15, [x6, #20] + ldp w14, w13, [x6, #28] + b 4f +endfunc + function ff_rgb24ToUV_half_neon, export=1 cmp w5, #0 // check width > 0 b.le 3f + 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 +4: cmp w5, #8 - rgb24_load_uv_coeff half=1 + rgb_set_uv_coeff half=1 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 ? @@ -158,19 +177,33 @@ function ff_rgb24ToUV_half_neon, export=1 ret endfunc +function ff_bgr24ToUV_neon, export=1 + cmp w5, #0 // check width > 0 + b.le 3f + + ldp w12, w11, [x6, #12] + ldp w10, w15, [x6, #20] + ldp w14, w13, [x6, #28] + b 4f +endfunc + function ff_rgb24ToUV_neon, export=1 cmp w5, #0 // check width > 0 b.le 3f + 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 +4: cmp w5, #16 - rgb24_load_uv_coeff half=0 + rgb_set_uv_coeff half=0 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 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 Mon Jun 24 13:02:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50122 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1993037vqz; Mon, 24 Jun 2024 06:02:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVWFbqwVlUlcQEoWAM8NZmuM12jV9ZNg0VLOrP6mZ6HIo6N5LeazD42hTftyzwVqDhQZifIl83xnSPZ0A84rv0BJ1sew4p53IJpmg== X-Google-Smtp-Source: AGHT+IE5HGkG8Sqmq/MeB8Mw5siwiIurvOdqC+jPMC5oAHc4oiuaNyBAjVBeO69P/QfB78ToZMuM X-Received: by 2002:a50:a6d9:0:b0:57c:571f:e52d with SMTP id 4fb4d7f45d1cf-57d4a2e9bfamr3857034a12.36.1719234170893; Mon, 24 Jun 2024 06:02:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719234170; cv=none; d=google.com; s=arc-20160816; b=dt4Q/fJvJUypoiwdxdRQtGiekY9jWpJzhTXX5RpHRycgKdOnl4d7NVoFw7vQdJzc8O /gsoGRTD86fCEhwDBV6tgSEwA5tTczFPXujpRHVvdBYNo0OGiUTOvNhnWj+bgYRb4l0m 2+HytJoLRdE7z5PqesFHwVwx1L4YSPnn4hIwOlPgwJPwKCch22/l/C48HIiQTvERV7lh xRiOFuSRMIgR8HenHAILAvjmUzjDFB1XSqPneBcsZwL/ueuPBb1XFrsB+PTaqstE5WgF BLXAfTdahmAWbkv8ieS55/CfKbSE67vgXsmR7GOU9CYRRljo7Oftq/2zcZ8+ufrU9EaK gXbQ== 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=ouEp7hUAXA0SlC/Cmg9BVCtk0eIYANhb9cdNHO06Pcw=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=qQqrVNxPnFWEj7CslqP5PB+N5to4mTJJhUBVWDrS8hyW5jyTZDSK2oKD2n7kcRW2g9 Gy4MCDfiiC07NoV4d8nMpkU9uJQmYY3Or6A9fIpU6du1oAHMdv+X0iEe371MUbmsYPmp oqKF/BGpWC33AlW0E338wuNiL68x8BdX6Y9ADlxkikFl7KRe4NfF2R/Ip3M67aJoc0UZ TNRfYkpev0f84jBulXDk3tpaIEJ3DFPPud003UywaluYT8OYDlzsgbeC6CP1aJmwfKOj yQKSDuDJa3KK/bXuFVVGk4UHusRpxql0YgYnfK99Poh4M+EBnamHh6l+ixF67kGdU5I4 mHUg==; 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=mj+MjrGL; 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 4fb4d7f45d1cf-57d434e3836si2610691a12.379.2024.06.24.06.02.50; Mon, 24 Jun 2024 06:02: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=mj+MjrGL; 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 8D6F268D641; Mon, 24 Jun 2024 16:02:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-205.mail.qq.com (out203-205-221-205.mail.qq.com [203.205.221.205]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2043468D0E4 for ; Mon, 24 Jun 2024 16:02:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1719234139; bh=SB48REO2xZOpLudWpwnGscOxaMpzCDFZ5LtB/U4iGMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mj+MjrGL5jTlDwE2Sj0G3Ldng6PZjCIbt7dyq83Now5JSMpzoDtZnnnMKrVVBoIUq 4kquZqjlMgE4SbOrxhf5jtcdu3MXBHNSbcFXgP81CeCHj3i1BNhsmeQvYxicO6HnbS Gww5qGGXUwuUOtvt2MbLEbxJZh7QBQqIo7zJL4xg= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.191]) by newxmesmtplogicsvrszb9-1.qq.com (NewEsmtp) with SMTP id 903582A; Mon, 24 Jun 2024 21:02:16 +0800 X-QQ-mid: xmsmtpt1719234137tncjpc36l Message-ID: X-QQ-XMAILINFO: OQhZ3T0tjf0aFdI8CfCcq2tRPlbrGRTy6rZc0SBBnC9XicVLxsr7doq6KLDWAG G+ZFY4S+31iV2ftHBDFPGoxFFFWhbOC9cBh/5z4zV5VWR9HZziFrNBufpyj1lrfxf0vnhSqDA3nl AvsSyNYCWUvWsrAXvc8Z/o7yMRyM4ZlwlAU/TosGIe7UeRq6718YL007cX5frSz7BDC4ucv+7GnN u7AafSrwfMmEVQKxswwE4LSbxNRHo6k1j5/yPCI30Mut0D2fl4iC7FjDwFbkRbeduTSxNHhGkvyF ZDuqARl10CssZm6z3DwQfCD05zKM2UHYZqRz7yNKr+lLIAw4+G6AiMBdWvyAgFn+nc6TfCSAdxuj +AVfsTzNHWqpYTaRID4hHEY+1qlSYEzfPOsZLdHqusdqB0r/dbMwmM3awg9hqI1tuDNrIW1VE5pF jmC5eXp1MYaPhvBxuWt+JODy6DGXXjvlVVMmxEvdXmz1N24ul2fpvQEo54cbIWrQ2Nd63lN/n3UO aovgBQJO59TF45o+/Cls5QSZOFK1qioVw6YiLrONU8hlqilLU9yiVUXHR4UxBYcBtgYfSGaXP8UQ UWG5SuGzdLAQ4ibcBrs+Hvhzon6mNbhPK1kEK0ZI0QI5sIzCi6SDxM50GC8xdooFOqHCAMhalLzb oB1wjw/0Upo+Kozr+lHWW5/xeaqYKXOGswwn0B6K+fSYFb3aEToTgVFwv67jJQkfzVjfqa/oVYqx SDsxj+fYDMiAznmliysl2SouK/Phg3jZQV/WejATgm3o5N3RVVf6K3pnG8eGSBr7wHVkSfMEWVt2 itrL76puQak0clv0hhx1fmuR0klwerpbxeQmRLK0fWjrcqzeHcwo8+FACuUKHkinTXZSyPj5vs1Y b+Ag3dOmh1qrkYjUB5yFuYQRdzF2IoBe8krYMRDRx5qwiMh6GyJW0QnM/t5I2EbXyggP3t73eN3G 9/+yR+sFTYrQnd3ThJW3PmLeVmn6RK2a9Hy8m98PEd1MYC2gjSuHr1NVweXEaKsv2U4HWUY4T6hQ zEiOnj0SEQaq8apMFrT1dTyoHyGZg= X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 21:02:12 +0800 X-OQ-MSGID: <20240624130213.71634-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240624130213.71634-1-quinkblack@foxmail.com> References: <20240624130213.71634-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: V6x+v4eDI/13 From: Zhao Zhili Test on Apple M1 with kperf : -O3 : -O3 -fno-vectorize bgra_to_uv_8_c : 13.4 : 27.5 bgra_to_uv_8_neon : 37.4 : 41.7 bgra_to_uv_128_c : 155.9 : 550.2 bgra_to_uv_128_neon : 91.7 : 92.7 bgra_to_uv_1080_c : 1173.2 : 4558.2 bgra_to_uv_1080_neon : 822.7 : 809.5 bgra_to_uv_1920_c : 2078.2 : 8115.2 bgra_to_uv_1920_neon : 1437.7 : 1438.7 bgra_to_uv_half_8_c : 17.9 : 14.2 bgra_to_uv_half_8_neon : 37.4 : 10.5 bgra_to_uv_half_128_c : 103.9 : 326.0 bgra_to_uv_half_128_neon : 73.9 : 68.7 bgra_to_uv_half_1080_c : 850.2 : 3732.0 bgra_to_uv_half_1080_neon : 484.2 : 490.0 bgra_to_uv_half_1920_c : 1479.2 : 4942.7 bgra_to_uv_half_1920_neon : 824.2 : 824.7 bgra_to_y_8_c : 8.2 : 29.5 bgra_to_y_8_neon : 18.2 : 32.7 bgra_to_y_128_c : 101.4 : 361.5 bgra_to_y_128_neon : 74.9 : 73.7 bgra_to_y_1080_c : 739.4 : 3018.0 bgra_to_y_1080_neon : 613.4 : 544.2 bgra_to_y_1920_c : 1298.7 : 5326.0 bgra_to_y_1920_neon : 918.7 : 934.2 --- libswscale/aarch64/input.S | 68 +++++++++++++++++++++++++++--------- libswscale/aarch64/swscale.c | 16 +++++++++ 2 files changed, 68 insertions(+), 16 deletions(-) diff --git a/libswscale/aarch64/input.S b/libswscale/aarch64/input.S index 2cfec4cb6a..ce5b042371 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,8 @@ sqshrn2 \dst\().8h, \dst2\().4s, \right_shift // dst_higher_half = dst2 >> right_shift .endm -function ff_bgr24ToY_neon, export=1 +.macro rgbToY_neon fmt_bgr, fmt_rgb, element +function ff_\fmt_bgr\()ToY_neon, export=1 cmp w4, #0 // check width > 0 ldp w12, w11, [x5] // w12: ry, w11: gy ldr w10, [x5, #8] // w10: by @@ -51,7 +56,7 @@ function ff_bgr24ToY_neon, export=1 ret endfunc -function ff_rgb24ToY_neon, export=1 +function ff_\fmt_rgb\()ToY_neon, export=1 cmp w4, #0 // check width > 0 ldp w10, w11, [x5] // w10: ry, w11: gy ldr w12, [x5, #8] // w12: by @@ -67,11 +72,11 @@ function ff_rgb24ToY_neon, export=1 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 @@ -86,12 +91,17 @@ function ff_rgb24ToY_neon, export=1 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: ret endfunc +.endm + +rgbToY_neon bgr24, rgb24, element=3 + +rgbToY_neon bgra32, rgba32, element=4 .macro rgb_set_uv_coeff half .if \half @@ -110,7 +120,8 @@ endfunc dup v6.4s, w9 .endm -function ff_bgr24ToUV_half_neon, export=1 +.macro rgbToUV_half_neon fmt_bgr, fmt_rgb, element +function ff_\fmt_bgr\()ToUV_half_neon, export=1 cmp w5, #0 // check width > 0 b.le 3f @@ -120,7 +131,7 @@ function ff_bgr24ToUV_half_neon, export=1 b 4f endfunc -function ff_rgb24ToUV_half_neon, export=1 +function ff_\fmt_rgb\()ToUV_half_neon, export=1 cmp w5, #0 // check width > 0 b.le 3f @@ -132,7 +143,11 @@ function ff_rgb24ToUV_half_neon, export=1 rgb_set_uv_coeff half=1 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 +155,7 @@ function ff_rgb24ToUV_half_neon, export=1 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 +163,10 @@ function ff_rgb24ToUV_half_neon, export=1 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 +174,15 @@ function ff_rgb24ToUV_half_neon, export=1 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,14 +195,20 @@ function ff_rgb24ToUV_half_neon, export=1 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 + add x3, x3, #(2*\element) strh w8, [x1], #2 // store dst_v cbnz w5, 2b 3: ret endfunc +.endm -function ff_bgr24ToUV_neon, export=1 +rgbToUV_half_neon bgr24, rgb24, element=3 + +rgbToUV_half_neon bgra32, rgba32, element=4 + +.macro rgbToUV_neon fmt_bgr, fmt_rgb, element +function ff_\fmt_bgr\()ToUV_neon, export=1 cmp w5, #0 // check width > 0 b.le 3f @@ -187,7 +218,7 @@ function ff_bgr24ToUV_neon, export=1 b 4f endfunc -function ff_rgb24ToUV_neon, export=1 +function ff_\fmt_rgb\()ToUV_neon, export=1 cmp w5, #0 // check width > 0 b.le 3f @@ -199,13 +230,13 @@ function ff_rgb24ToUV_neon, export=1 rgb_set_uv_coeff half=0 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 @@ -227,9 +258,14 @@ function ff_rgb24ToUV_neon, export=1 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: ret endfunc +.endm + +rgbToUV_neon bgr24, rgb24, element=3 + +rgbToUV_neon bgra32, rgba32, element=4 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 Mon Jun 24 13:02:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50123 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1993214vqz; Mon, 24 Jun 2024 06:03:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJwNVkT8WibQA8oKjWHzZfUFR7AnJERw5R66qajC0Xr9VnxZEGpT7ao3fa/WaXWxtes1wcxId7HXydpbokY8N1InmGQV3l7q2DXQ== X-Google-Smtp-Source: AGHT+IERWSP7UBi5dYG8uePmJFveTmO01YiJ6ggI0FC2vW+3/pxuIRHEbB1a7me26KdRhrX142lc X-Received: by 2002:a50:ab5c:0:b0:57c:b82e:884b with SMTP id 4fb4d7f45d1cf-57d44c590a2mr4493483a12.19.1719234182725; Mon, 24 Jun 2024 06:03:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719234182; cv=none; d=google.com; s=arc-20160816; b=fLH5dEzkYfyufl2eK2+9c41vAN2wbLEkY19z4kabINjZgrBU1jj/zTy4EF53KDbHPo 9rVbHgpXODxs11jBS8qSbJpzuiX1nj2cJA1vpjqW4d6VJTJTVFitwe6akccc+zcCIDgJ pCte+owriy6+9wvk9gLD/MAURPNo55ybbKHXYPK4PYwggd9tUuYCxziwicBVopEVQL/E WfjerBVFUwKKDW/prlmGHQmwv2KUXGlLdkIvnZUdguU1Zj9Uh5XuMhIS9a9y66OTfjAd pID5ioARUKjgcOMp9g1IpmIQH46KSNXz1e4liELlx7di9/u4YGRUqmD95RMYrNokfe11 tFww== 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=u7umA0OBWaEhkabh+txJ+4spS5X/BpvzwDD0qL8vdpc=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=amZZ80ovolcgXpf6Ex1Q9o0kj+2kUd4DJNC/vu6+LW7XMCJYTe31cGl5CVSfbSnoMx pgkgF8XjRekkEK5JzT79/3ZdblblV1+ltRp1xv3YwCEgSOgN4ZolM7wct0cFhlgX2IRl sw8UFuLxosLT4Sh4uE2N22ulOlxFQTu9x21oR78RvZml/ofqTBVe9v5CydJAfmdzbkG7 iHEr3uuqmb7CoJjuv1Q4ruJIfY2nwla6IiuUo6+Q0YFyweXXrmq5FmYGqjzsj87eeidV HUJDaA6djOmJUEH3qO0l8dYwfaLxBS0heI3kfsh956IRECQz608gSdLkJqwL1XYNa1D7 BKww==; 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=JGZaxi6+; 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 4fb4d7f45d1cf-57d3b08984fsi3073338a12.352.2024.06.24.06.03.02; Mon, 24 Jun 2024 06:03:02 -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=JGZaxi6+; 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 1A98A68D647; Mon, 24 Jun 2024 16:02:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6083A68D62F for ; Mon, 24 Jun 2024 16:02:30 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1719234141; bh=5ZyZJtiV3UMGR2G8M+EPLTuQ6Bk5unIE5vU3uaAskvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JGZaxi6+/UH8IAqknxAmyuehjVMwP1nf7fpCKJnkWYgs0H9QVK7RZA5bLEzT3PAnu bx7Tjnq0xHm54Ae73zPytKd2xCtrCWa9GjrWmpqKxdvQ71nbn2GrbIeery0GQImIG2 to+xzenBeWNZZmJX6De6NyURc/HhepeArzIF7FCk= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.191]) by newxmesmtplogicsvrszb9-1.qq.com (NewEsmtp) with SMTP id 903582A; Mon, 24 Jun 2024 21:02:16 +0800 X-QQ-mid: xmsmtpt1719234138t2p9rdvbr Message-ID: X-QQ-XMAILINFO: MllZffuBkEb5bEV2DH2nTCPGE4syQ/q7urD/WaFK8re8vGISxtvBY0SSRqvhQz dF3XhOY32r0QSktDXTWZQkGw0LgPYO1PqDiXIfAurV2Giz6qcKUosFoYua9rCVbCo4xiIshVzjrz AsN847HXtfpmWA4DT986Xd+zaRMcq2HErkPczemYMQUgt1RRgUDqW6Z16anv9twv9hLKCDDZzFuM mHHfDyP2LPQAnqbzFBkSUhPtzuxV+chj12Ma6oBDfH55HMLYoO9mfScIKSQA5kNkpKEV1e11JNg0 dChVTacsNg+8j5m/DWE6bpzQ1xrRMyXWzJA80G8yCiwGwkUFygmv98PJl1M17mRvZnQN1FrAGBcU LL33+db5QhQ5uEVjodgkGInuu+x5UOAfPmCM8jYMGJREYTDuMo7S6wr+LM2Dtb74cEZtYnLHdMNm O9Czhhxg5u72Deh3Nu12vls/MAghII20oAQEl8ugqL3Gqvo56CExgH9JMnzD3dibukUC9XDVn1y/ 42WX0yZIs2C9q6oiAo3NPGuqlCO3oyTxspnd4eTw/W3kQHCUzdWU7Aehq7/RnFne0pZsFUQPzX1K tL2Qr+fW6H8h1eokiPpW7khOUBkXXSz6ONIfEr0TZuuxkyuDHwG7HiA50wZGejbhEx5Q+u6Hx6PS czDD0YK+AdWGOpSIov5Hp7FpZ6XDKN7xshEosZC9mBi0UKLS8tFMmwWTIwe+PQIXBRkcwn2BlU/U +hCUwW4SJYLknPNSODuNwtJlTq7xLtH1lUpS42QHFPzjMUNyg14zmwGiSSqTLsx0Ertu7LeSyZIf KS2pY7+72/+P7gjx+yGdf6oRz/TCv83hkAkRAK3ntvXfZGj9FU75ogj0+FQPSVEc6MzjF4VDK8Nx ln4PHpsgHDHCg1Y28ZOT3Kti7FEsk1bAlZ1vR7SFupP2965l2ICFufcGxURXC4TXWqLXAxxLBnlW C82L1tKalxLoC2EiGz7HIlD0yHSXXQeb0Voh5B6xdtf8QBqba5ocy1QrrH5gBAkrVMeE15cVioFz 6b8YAMGh+6lVmmXV9KdxKWE92pXhQ= X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jun 2024 21:02:13 +0800 X-OQ-MSGID: <20240624130213.71634-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240624130213.71634-1-quinkblack@foxmail.com> References: <20240624130213.71634-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: 4Me3RnCjfWWv From: Zhao Zhili Test on Apple M1 with kperf: : -O3 : -O3 -fno-vectorize abgr_to_uv_8_c : 19.4 : 26.1 abgr_to_uv_8_neon : 29.9 : 51.1 abgr_to_uv_128_c : 146.4 : 558.9 abgr_to_uv_128_neon : 85.1 : 83.4 abgr_to_uv_1080_c : 1162.6 : 4786.4 abgr_to_uv_1080_neon : 819.6 : 826.6 abgr_to_uv_1920_c : 2063.6 : 8492.1 abgr_to_uv_1920_neon : 1435.1 : 1447.1 abgr_to_uv_half_8_c : 16.4 : 11.4 abgr_to_uv_half_8_neon : 35.6 : 20.4 abgr_to_uv_half_128_c : 108.6 : 359.4 abgr_to_uv_half_128_neon : 75.4 : 42.6 abgr_to_uv_half_1080_c : 883.4 : 2885.6 abgr_to_uv_half_1080_neon : 460.6 : 481.1 abgr_to_uv_half_1920_c : 1553.6 : 5106.9 abgr_to_uv_half_1920_neon : 817.6 : 820.4 abgr_to_y_8_c : 6.1 : 26.4 abgr_to_y_8_neon : 40.6 : 6.4 abgr_to_y_128_c : 99.9 : 390.1 abgr_to_y_128_neon : 67.4 : 55.9 abgr_to_y_1080_c : 735.9 : 3170.4 abgr_to_y_1080_neon : 534.6 : 536.6 abgr_to_y_1920_c : 1279.4 : 6016.4 abgr_to_y_1920_neon : 932.6 : 927.6 --- libswscale/aarch64/input.S | 86 +++++++++++++++++++++++++++--------- libswscale/aarch64/swscale.c | 17 +++++++ 2 files changed, 82 insertions(+), 21 deletions(-) diff --git a/libswscale/aarch64/input.S b/libswscale/aarch64/input.S index ce5b042371..5cb18711fb 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_neon fmt_bgr, fmt_rgb, element +.macro rgbToY_neon fmt_bgr, fmt_rgb, element, alpha_first=0 function ff_\fmt_bgr\()ToY_neon, export=1 cmp w4, #0 // check width > 0 ldp w12, w11, [x5] // w12: ry, w11: gy @@ -72,7 +82,11 @@ function ff_\fmt_rgb\()ToY_neon, export=1 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 @@ -82,9 +96,15 @@ function ff_\fmt_rgb\()ToY_neon, export=1 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 @@ -103,6 +123,8 @@ rgbToY_neon bgr24, rgb24, element=3 rgbToY_neon bgra32, rgba32, element=4 +rgbToY_neon abgr32, argb32, element=4, alpha_first=1 + .macro rgb_set_uv_coeff half .if \half mov w9, #512 @@ -120,7 +142,21 @@ rgbToY_neon bgra32, rgba32, element=4 dup v6.4s, w9 .endm -.macro rgbToUV_half_neon fmt_bgr, fmt_rgb, element +.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_neon fmt_bgr, fmt_rgb, element, alpha_first=0 function ff_\fmt_bgr\()ToUV_half_neon, export=1 cmp w5, #0 // check width > 0 b.le 3f @@ -148,9 +184,15 @@ function ff_\fmt_rgb\()ToUV_half_neon, export=1 .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 @@ -162,27 +204,15 @@ function ff_\fmt_rgb\()ToUV_half_neon, export=1 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 @@ -207,7 +237,9 @@ rgbToUV_half_neon bgr24, rgb24, element=3 rgbToUV_half_neon bgra32, rgba32, element=4 -.macro rgbToUV_neon fmt_bgr, fmt_rgb, element +rgbToUV_half_neon abgr32, argb32, element=4, alpha_first=1 + +.macro rgbToUV_neon fmt_bgr, fmt_rgb, element, alpha_first=0 function ff_\fmt_bgr\()ToUV_neon, export=1 cmp w5, #0 // check width > 0 b.le 3f @@ -230,7 +262,11 @@ function ff_\fmt_rgb\()ToUV_neon, export=1 rgb_set_uv_coeff half=0 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 @@ -243,9 +279,15 @@ function ff_\fmt_rgb\()ToUV_neon, export=1 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 @@ -269,3 +311,5 @@ endfunc rgbToUV_neon bgr24, rgb24, element=3 rgbToUV_neon bgra32, rgba32, element=4 + +rgbToUV_neon abgr32, argb32, element=4, alpha_first=1 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)