From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id E4C6149823 for ; Wed, 19 Jun 2024 17:10:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6071A68D832; Wed, 19 Jun 2024 20:10:44 +0300 (EEST) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; } -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".