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)