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)