From patchwork Fri Jun 7 13:44:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 49675 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1035634vqo; Fri, 7 Jun 2024 06:45:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVzr227R+VbYKJvJ82JB2WbH5gF3VoBZ138fwxmAZ7BATsYHmcUNzoZY7x0w7ALfCWf/lTgQZ9cQ6We2Q66TeW9LgdOOm/TSfk8LA== X-Google-Smtp-Source: AGHT+IGE1H++OWsfPEv3e8ErHjncgP26lEss1S39jjus8ZEy0/FnzQFrCgT2+kIU+zgP83T6fhOg X-Received: by 2002:a17:906:a099:b0:a5a:8673:cccd with SMTP id a640c23a62f3a-a6cbc6ca3d4mr203704866b.30.1717767955208; Fri, 07 Jun 2024 06:45:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717767955; cv=none; d=google.com; s=arc-20160816; b=sqBh86cWNeNA5QMRC7ZOKLsUaTA7FzriGyNM7mpa479nCAxaaFwg7DxKTxOYhcxTOs ezcvXjVmQjWP0VFaYs76xFwvDdIEqGc09d5xdP0TphSidOG4WRhCmf+ra/m2oe7E0iTN S+Buwnp12e1Pq68Amkt799UrN11GGvlELSd1z8T5lJ1+/JFhDwOeqNeR1sIrPg60QXyL Zqto7Y2CDM4VS0EmRF+aFRFsUxmKnK3LCNTdODlGmwvKZO1gat3vKdMLYG3d7B+2CpFD ytcjqUvyP45ND7fybq6jmXKeCAezZDiPlc+yeC7fPxllhCGzmMZhkh7sbaXW7GeH2BnT gvpg== 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=JFYkD+z5srjryHAGXVZRI7AkEHEwtR/dSQCnlXA0mvA=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=L4dJ0cpLJIM1yZMev/9d1pqfSDClGarbaS9W+BZ0aSFLReMi6X3UbF7TuTqeeBjb0x uQQaUl7Hb1o30bi5ZEQ8gyAsGdVZoPDYymanmoIv9kQA6rP71fXPnwdsxBy5eshVpo1A schBnNhN3BpcUpNKuwDWDSv0tkLHXJsjiLegd56OTm5cCqvLsnibBb5pUBCWqzKdhQz2 Aie0Qm1IAzVlm5YUVATvva26OQne4NmJAJwUt4SbweJD//y8XsgdKE8+APaKlN7vrYSm n3TMhUaXGcLhLwj926oPOV8QcDTOWJGylrP5mmvl4CHtqCh9LLygKwuvUsHgPjZE7UGD /P8Q==; 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="tE/AI930"; 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-a6ef67b2b57si15689066b.929.2024.06.07.06.45.53; Fri, 07 Jun 2024 06:45:55 -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="tE/AI930"; 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 0197868D807; Fri, 7 Jun 2024 16:45:22 +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 C456268D70A for ; Fri, 7 Jun 2024 16:45:09 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1717767899; bh=hh9t0RLN3sGzSUTll+2gYBnklrpCOhvDasbA9edE98A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tE/AI9306ZJKaAB1FQCIkjPwdbWVYHnQ6XVXqrcfV4SPChpNGRE9IaZ8pkLYGBQMi GcnsyHFCP7IVj7hsX/mOQWk6SjNTGkf2sEb2vG48HNAyuwORa3T/aecFcfHyNgCjdO 8S6sQcT9Bjj5dC7/rKTjUOrkuaMDAOra/Fd0j/JA= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.186]) by newxmesmtplogicsvrszc5-2.qq.com (NewEsmtp) with SMTP id B39104BF; Fri, 07 Jun 2024 21:44:57 +0800 X-QQ-mid: xmsmtpt1717767899twakoq1qs Message-ID: X-QQ-XMAILINFO: OUMxvQDaATie6WnO2Q4U+BAb0YC7wuhZvTcZvrIPLH/LBXAMcTJI6dqNi33u4s YuGQxYJnK6ysEJiIvXneG5VmVJ493XqhiZz3vYuLbTDzs9IkyHhgpFyqFwavXxyp6ID+uatvc4/K lCCo8U1JcS4KQ805dvp+kALeF7sxpJDtX2s7iXc+mEAtD4I7i33/gAK4v4l3z8hAP8thB3H82RWv 3B5rt+P5ugUyNHVtZEnydgib/5Cd27VFrZU63U9z9amupGP4aoz34riO70FA1Niw+/aMEiJzMfKW oMr2Q28tnITUcyhXAwJMiHIZSMquK/RxDOQuCQEP5Y/ikhh8+m3h1L9ge6osLl1VO4Krv6pTCQuc evVPLQZtZzLqpiqyA4oswNUMglw6el2cFqBvjuFDF69g2uoOU5kDo4voevnud+yZSM1mKYbanvpu QIHoDh0v5hkwoTnLRX0x1yxCCD6LstIuzxm6gZPc2ytfrjPnCd8C4BbuYXpjkSlXxMfzW6j1MgjE RzPfGjkJ4drCiJoqOLLxZMpOpvfSOnmPMWJO5o2Orn55YefZUiQhflwhv1fcBGKSQ6ozvYHuP6tj oZSgjVVHU37gx9HjQiylhEJVKoObjuf+jNL1M9sPfp0SoxGOl4ijifUClLBhrkOy/9PqtJFZGcTk gRt+oB35y3cCXlCwbcawRswfBYN6MyXlHA3FMul/Md9zDIr3qf1NjqRCvas4i4dg3D9O5xkOjWnu iyS6ZQF+64ZKQhZ1xu+2aSm54n0yTiY59CXeJJOcwW17iFatI/4RQA+NFYLh81lVlAY1iqtap6Y/ cgMz3ICfnKgZhp/lWN1IZqAZre/qPgU19GRie/l4Y3pxFwBAPu7CuZIg7iSlaXNgHad7Sb9qqM/l SAqemzN91OISbcumGGpNpLONCHiMC3alRf/Ae4uFwdtd1kGfqVB2SIH7OUKRVocxGYc5UoRXYAdt wlgCEcs5fbfJsZeMVSX8ICaU3G1G80n9G0+VwY+WeB4vbtGeXcI72VKDB3j+noc3UHdjK2Fbb/1U XftQwVtPCRorkej+Q94cXGz7x9wv+5+K8l0AQUTw== X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jun 2024 21:44:52 +0800 X-OQ-MSGID: <20240607134452.94467-4-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240607134452.94467-1-quinkblack@foxmail.com> References: <20240607134452.94467-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 4/4] swscale/aarch64: Add rgb24 to yuv implementation 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: xXpInlq17/e3 From: Zhao Zhili Test on Apple M1: rgb24_to_uv_8_c: 0.0 rgb24_to_uv_8_neon: 0.2 rgb24_to_uv_128_c: 1.0 rgb24_to_uv_128_neon: 0.5 rgb24_to_uv_1080_c: 7.0 rgb24_to_uv_1080_neon: 5.7 rgb24_to_uv_1920_c: 12.5 rgb24_to_uv_1920_neon: 9.5 rgb24_to_uv_half_8_c: 0.2 rgb24_to_uv_half_8_neon: 0.2 rgb24_to_uv_half_128_c: 1.0 rgb24_to_uv_half_128_neon: 0.5 rgb24_to_uv_half_1080_c: 6.2 rgb24_to_uv_half_1080_neon: 3.0 rgb24_to_uv_half_1920_c: 11.2 rgb24_to_uv_half_1920_neon: 5.2 rgb24_to_y_8_c: 0.2 rgb24_to_y_8_neon: 0.0 rgb24_to_y_128_c: 0.5 rgb24_to_y_128_neon: 0.5 rgb24_to_y_1080_c: 4.7 rgb24_to_y_1080_neon: 3.2 rgb24_to_y_1920_c: 8.0 rgb24_to_y_1920_neon: 5.7 On Pixel 6: rgb24_to_uv_8_c: 30.7 rgb24_to_uv_8_neon: 56.9 rgb24_to_uv_128_c: 213.9 rgb24_to_uv_128_neon: 173.2 rgb24_to_uv_1080_c: 1649.9 rgb24_to_uv_1080_neon: 1424.4 rgb24_to_uv_1920_c: 2907.9 rgb24_to_uv_1920_neon: 2480.7 rgb24_to_uv_half_8_c: 36.2 rgb24_to_uv_half_8_neon: 33.4 rgb24_to_uv_half_128_c: 167.9 rgb24_to_uv_half_128_neon: 99.4 rgb24_to_uv_half_1080_c: 1293.9 rgb24_to_uv_half_1080_neon: 778.7 rgb24_to_uv_half_1920_c: 2292.7 rgb24_to_uv_half_1920_neon: 1328.7 rgb24_to_y_8_c: 19.7 rgb24_to_y_8_neon: 27.7 rgb24_to_y_128_c: 129.9 rgb24_to_y_128_neon: 96.7 rgb24_to_y_1080_c: 995.4 rgb24_to_y_1080_neon: 767.7 rgb24_to_y_1920_c: 1747.4 rgb24_to_y_1920_neon: 1337.2 Note both tests use clang as compiler, which has vectorization enabled by default with -O3. Signed-off-by: Zhao Zhili --- v3: Fix comments. libswscale/aarch64/Makefile | 1 + libswscale/aarch64/input.S | 202 +++++++++++++++++++++++++++++++++++ libswscale/aarch64/swscale.c | 25 +++++ 3 files changed, 228 insertions(+) create mode 100644 libswscale/aarch64/input.S diff --git a/libswscale/aarch64/Makefile b/libswscale/aarch64/Makefile index da1d909561..adfd90a1b6 100644 --- a/libswscale/aarch64/Makefile +++ b/libswscale/aarch64/Makefile @@ -3,6 +3,7 @@ OBJS += aarch64/rgb2rgb.o \ aarch64/swscale_unscaled.o \ NEON-OBJS += aarch64/hscale.o \ + aarch64/input.o \ aarch64/output.o \ aarch64/rgb2rgb_neon.o \ aarch64/yuv2rgb_neon.o \ diff --git a/libswscale/aarch64/input.S b/libswscale/aarch64/input.S new file mode 100644 index 0000000000..33afa34111 --- /dev/null +++ b/libswscale/aarch64/input.S @@ -0,0 +1,202 @@ +/* + * Copyright (c) 2024 Zhao Zhili + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/aarch64/asm.S" + +.macro rgb24_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 + uxtl v21.8h, v18.8b // v21: b + uxtl2 v22.8h, v16.16b // v22: r + uxtl2 v23.8h, v17.16b // v23: g + uxtl2 v24.8h, v18.16b // v24: b +.endm + +.macro rgb24_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 + smlal \dst1\().4s, \coef1\().4h, \g\().4h // dst1 += gx * g + smlal \dst1\().4s, \coef2\().4h, \b\().4h // dst1 += bx * b + smlal2 \dst2\().4s, \coef0\().8h, \r\().8h // dst2 += rx * r + smlal2 \dst2\().4s, \coef1\().8h, \g\().8h // dst2 += gx * g + smlal2 \dst2\().4s, \coef2\().8h, \b\().8h // dst2 += bx * b + sqshrn \dst\().4h, \dst1\().4s, \right_shift // dst_lower_half = dst1 >> right_shift + sqshrn2 \dst\().8h, \dst2\().4s, \right_shift // dst_higher_half = dst2 >> right_shift +.endm + +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 + + 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 + + cmp w4, #16 + dup v0.8h, w10 + dup v1.8h, w11 + 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 + sub w4, w4, #16 // width -= 16 + add x1, x1, #48 // src += 48 + cmp w4, #16 // width >= 16 ? + stp q16, q17, [x0], #32 // store to dst + b.ge 1b + cbz x4, 3f +2: + ldrb w13, [x1] // w13: r + ldrb w14, [x1, #1] // w14: g + ldrb w15, [x1, #2] // w15: b + + smaddl x13, w13, w10, x9 // x13 = ry * r + const_offset + smaddl x13, w14, w11, x13 // x13 += gy * g + 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 + strh w13, [x0], #2 // store to dst + cbnz w4, 2b +3: + 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 + .if \half + mov w9, #512 + movk w9, #128, lsl #16 // w9: const_offset + .else + mov w9, #256 + movk w9, #64, lsl #16 // w9: const_offset + .endif + dup v0.8h, w10 + dup v1.8h, w11 + dup v2.8h, w12 + dup v3.8h, w13 + dup v4.8h, w14 + dup v5.8h, w15 + dup v6.4s, w9 +.endm + +function ff_rgb24ToUV_half_neon, export=1 + cmp w5, #0 // check width > 0 + b.le 3f + + cmp w5, #8 + rgb24_load_uv_coeff half=1 + b.lt 2f +1: + ld3 { v16.16b, v17.16b, v18.16b }, [x3] + uaddlp v19.8h, v16.16b // v19: r + 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 + sub w5, w5, #8 // width -= 8 + add x3, x3, #48 // src += 48 + cmp w5, #8 // width >= 8 ? + str q16, [x0], #16 // store dst_u + str q17, [x1], #16 // store dst_v + b.ge 1b + cbz w5, 3f +2: + ldrb w2, [x3] // w2: r1 + ldrb w4, [x3, #3] // w4: r2 + add w2, w2, w4 // w2 = r1 + r2 + + 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 + + smaddl x8, w2, w10, x9 // dst_u = ru * r + const_offset + smaddl x8, w4, w11, x8 // dst_u += gu * g + smaddl x8, w7, w12, x8 // dst_u += bu * b + asr x8, x8, #10 // dst_u >>= 10 + strh w8, [x0], #2 // store dst_u + + smaddl x8, w2, w13, x9 // dst_v = rv * r + const_offset + smaddl x8, w4, w14, x8 // dst_v += gv * g + 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 + strh w8, [x1], #2 // store dst_v + cbnz w5, 2b +3: + ret +endfunc + +function ff_rgb24ToUV_neon, export=1 + cmp w5, #0 // check width > 0 + b.le 3f + + cmp w5, #16 + rgb24_load_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 + sub w5, w5, #16 + add x3, x3, #48 // src += 48 + cmp w5, #16 + stp q16, q17, [x0], #32 // store to dst_u + stp q18, q19, [x1], #32 // store to dst_v + b.ge 1b + cbz w5, 3f +2: + ldrb w16, [x3] // w16: r + ldrb w17, [x3, #1] // w17: g + ldrb w4, [x3, #2] // w4: b + + smaddl x8, w16, w10, x9 // x8 = ru * r + const_offset + smaddl x8, w17, w11, x8 // x8 += gu * g + smaddl x8, w4, w12, x8 // x8 += bu * b + asr w8, w8, #9 // x8 >>= 9 + strh w8, [x0], #2 // store to dst_u + + smaddl x8, w16, w13, x9 // x8 = rv * r + const_offset + smaddl x8, w17, w14, x8 // x8 += gv * g + 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 + strh w8, [x1], #2 // store to dst_v + cbnz w5, 2b +3: + ret +endfunc diff --git a/libswscale/aarch64/swscale.c b/libswscale/aarch64/swscale.c index bbd9719a44..4c4ea39dc1 100644 --- a/libswscale/aarch64/swscale.c +++ b/libswscale/aarch64/swscale.c @@ -201,6 +201,20 @@ 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); + av_cold void ff_sws_init_swscale_aarch64(SwsContext *c) { int cpu_flags = av_get_cpu_flags(); @@ -212,5 +226,16 @@ av_cold void ff_sws_init_swscale_aarch64(SwsContext *c) if (c->dstBpc == 8) { c->yuv2planeX = ff_yuv2planeX_8_neon; } + switch (c->srcFormat) { + case AV_PIX_FMT_RGB24: + c->lumToYV12 = ff_rgb24ToY_neon; + if (c->chrSrcHSubSample) + c->chrToYV12 = ff_rgb24ToUV_half_neon; + else + c->chrToYV12 = ff_rgb24ToUV_neon; + break; + default: + break; + } } }