From patchwork Wed Jun 19 17:10:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50017 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9187:0:b0:482:c625:d099 with SMTP id s7csp369861vqg; Wed, 19 Jun 2024 10:11:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUMgbwIq4V90ecrSkAiYuEaA46DkaEFb82IR8rh6msfy5yEmulW57DxHpS9BOzkFMOYSZYhiz297NWfOYRpZcFVEvXQT7PcYueK9A== X-Google-Smtp-Source: AGHT+IHleqfUShhNGCtzblQAvfhfkfUjNjnLzMgPV1Qnl0cgtVg3aHdm0bULQ+WB7Ku4CgHl4ZrB X-Received: by 2002:a2e:9659:0:b0:2ec:f8a:6f0f with SMTP id 38308e7fff4ca-2ec3cea4843mr24785231fa.4.1718817072909; Wed, 19 Jun 2024 10:11:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718817072; cv=none; d=google.com; s=arc-20160816; b=ArgRNjEBm6G6UkmW3RfMkH15Jwbh3rAz75G1qq9DjUnQYTn6sqq+SEl2rcm9BnpYYu zL6dilD/piBEmSgA2IY7upUadxiPmfnMFs3GB9oyt0Ox9GT0ze2m0n6KmJMuziQr53Ue 3OBHl5+ke7tteI3qrTyT9l17IfmApYg1PDpXEoyq/6I3JBDfDMd+BokX4Oq1jVIexsh7 aXlAysX6JvWD3mtjzn08Q1ISTKhwekiWv//JIFrcIr5HdBloUMUsRMXjdVQU/wGtuSxV iG6kVqIMVwbo4WEMATw/Nfv4+W8c9VknMhZwr93csIRxFE84zdLGdLj1WSmHj5qmGZLz lSWA== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=2+hhTQpXClweNtPG8M658Sz4t8pZ11EzCxXJ34INaUE=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=PCTOaYNOlVcB3uVplO9dbQJL203wawzElDp4zAOIroQwhSVWBHXo5FAiA8+Dwp76fl qyh251z17dqM4shyGCfJk5gz3clj/97RT6+wceHRt1h/TTYHTKDTwHgM+eBU4SJ343Pf G02/bqyKVh/eIiWgQ6hVWcrjYIflx2dC2P4+EzrALfDPBbiJlgOuCTJz5XFckFrS2MGN fRujlgsVs5nX6729D0NSwkuV2twkC1w1H9WPjV1mUozJeCCeUhc0VHtc7gMGfGUZH7gr 37GPvtl76etHJtPCsyqqqwGRryWX0dqAKa1m8ycpg67aH3vyWn2jJvACmcxbahbQyhIR lvkQ==; 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=fN1OodLF; 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-a6f56df9940si648829966b.691.2024.06.19.10.11.12; Wed, 19 Jun 2024 10:11:12 -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=fN1OodLF; 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 89EF368D82A; Wed, 19 Jun 2024 20:10:45 +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 CEA1E68D828 for ; Wed, 19 Jun 2024 20:10:41 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1718817029; bh=O/bCmccoKPcbk7lt+z/3HB7XkXC8a9JnBQJUD8A+J8s=; h=From:To:Cc:Subject:Date; b=fN1OodLFcgQgNrvu9/h4j8vilmAhNcbWwdQGMg/IZFO/OnKrpRZQA17fhoi2eM7MA CzGI9aqXNY/Ry1q40/u+SsyM60+CTR6XxRYxjge2y62VfDyzmEOAUyzKljdY40SViX +ohLSJxXkc5jWn5F+Y7zCcVYUDL07TTb5jG7o9iE= 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: xmsmtpt1718817027tef17u44d Message-ID: X-QQ-XMAILINFO: M4rXzlpNAA0NOQYXpIvw/41q3ryw77ghadGtOPfmNHOcV0NZaqhTu6T97A39Lj SBzucOdfr2R/jqmaHfohOGbbuD1FwkCqqHIyeQH1BaL5F+b8FOkmoNt3bGDJ7LzXymSgcO2H5bl1 xDkexEBBhs9pOuwDeT8KIHHKOQQ3za+FzHYj3Rq6J1Klc190Y897CnzuwfllbocHKHTOJlAZ0CQb Ix652RqceV3qFQiSvlq90NRn3ay9W8Rs0geQNy4zkhxvKjdFz8RliUh3DGjqTJ+wRsf8DtbNN0oT 7If+Lv4g6RajRH7+A3j+R8WTSliaDeFtIuCu6C9MY+sQ2ZHVXHf/vZds7y73MzrFSyL/4HSngkd6 zHsp18XbqnUFbvOKmjvZnAeIYnrrEAYTN0xNWoujjuJWTAwhrqJeNHD83Rv9KrBHThGbTAu4Qgu9 73ago3Ibs2/fSM5Q8jzNwIkgAkCusPpGCHmdpjqA2YGroP9C7/7AOfiaP3eUqS/LwzgLy2B6gJCj oPOqk7g2nvE6hC8PaLEk0kXeHQnvNitBd44JLs8mPA7jwWi9s5j5TM3hWxvbHXrljiLpIjoq4vVg 1dmZffgoVPGlQcTZuAYSiVqwyculrQF+iv2T8eBLs5OE3qNvebEdF6Sbqbkr7gvllt74oZ51sp5k mCF4Ip1sJjAVeOO4h1En1Jwd+2aLU0swT0lQDMeda5sdKqLOuWjMYhqTf2y0PLc8s3gVaQ9985YC AkDZAcT2VL+2IhoVmPdrpUyXAjkA0KIHzZAE9IRthU7ZD3dPt73npVV0ig6XRi/2roWYToAfQ9oM hJrDsvOtaLcwkVXXwADJfk9M1ygwzkgfEGClDG17ipyLWZvwEMvnWvfBKjs6imJJy3Lw1HCSi7Bg xCHYVUGasFKh7CbE1Z1ptZ4xh7JqYbHeTjxcGV/QfhOin1iqZJ5KcJ7L5sGMxPCyQlvtB295jlAe 0W+IpF3J4qFPMTiMl53pUDlff5ddfeo3wwzzJeHqs= X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jun 2024 01:10:23 +0800 X-OQ-MSGID: <20240619171025.16420-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: 1M50/ZyUwj1E From: Zhao Zhili Test on Apple M1 with kperf bgr24_to_uv_8_c: 41.5 bgr24_to_uv_8_neon: 41.8 bgr24_to_uv_128_c: 133.5 bgr24_to_uv_128_neon: 94.3 bgr24_to_uv_1080_c: 960.5 bgr24_to_uv_1080_neon: 751.0 bgr24_to_uv_1920_c: 1695.3 bgr24_to_uv_1920_neon: 1357.3 bgr24_to_uv_half_8_c: 45.0 bgr24_to_uv_half_8_neon: 11.0 bgr24_to_uv_half_128_c: 130.5 bgr24_to_uv_half_128_neon: 51.8 bgr24_to_uv_half_1080_c: 877.3 bgr24_to_uv_half_1080_neon: 414.0 bgr24_to_uv_half_1920_c: 1540.0 bgr24_to_uv_half_1920_neon: 695.0 bgr24_to_y_8_c: 24.3 bgr24_to_y_8_neon: 12.8 bgr24_to_y_128_c: 94.3 bgr24_to_y_128_neon: 47.5 bgr24_to_y_1080_c: 611.5 bgr24_to_y_1080_neon: 437.5 bgr24_to_y_1920_c: 1077.3 bgr24_to_y_1920_neon: 765.3 --- v2: Use LDP to load BGR coefficients libswscale/aarch64/input.S | 71 +++++++++++++++++++++++++++--------- libswscale/aarch64/swscale.c | 32 +++++++++------- 2 files changed, 72 insertions(+), 31 deletions(-) diff --git a/libswscale/aarch64/input.S b/libswscale/aarch64/input.S index 33afa34111..cf8d062942 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,10 +43,15 @@ sqshrn2 \dst\().8h, \dst2\().4s, \right_shift // dst_higher_half = dst2 >> right_shift .endm -function ff_rgb24ToY_neon, export=1 +.macro rgbToY bgr cmp w4, #0 // check width > 0 + .if \bgr + ldp w12, w11, [x5] // w12: ry, w11: gy + ldr w10, [x5, #8] // w10: by + .else ldp w10, w11, [x5] // w10: ry, w11: gy ldr w12, [x5, #8] // w12: by + .endif b.le 3f mov w9, #256 // w9 = 1 << (RGB2YUV_SHIFT - 7) @@ -59,9 +64,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 ? @@ -83,12 +88,26 @@ function ff_rgb24ToY_neon, export=1 cbnz w4, 2b 3: ret +.endm + +function ff_rgb24ToY_neon, export=1 + rgbToY bgr=0 endfunc -.macro rgb24_load_uv_coeff half +function ff_bgr24ToY_neon, export=1 + rgbToY bgr=1 +endfunc + +.macro rgb_load_uv_coeff half, bgr + .if \bgr + ldp w12, w11, [x6, #12] + ldp w10, w15, [x6, #20] + ldp w14, w13, [x6, #28] + .else 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 + .endif .if \half mov w9, #512 movk w9, #128, lsl #16 // w9: const_offset @@ -105,12 +124,12 @@ endfunc dup v6.4s, w9 .endm -function ff_rgb24ToUV_half_neon, export=1 +.macro rgbToUV_half bgr cmp w5, #0 // check width > 0 b.le 3f cmp w5, #8 - rgb24_load_uv_coeff half=1 + rgb_load_uv_coeff half=1, bgr=\bgr 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 ? @@ -156,21 +175,29 @@ function ff_rgb24ToUV_half_neon, export=1 cbnz w5, 2b 3: ret +.endm + +function ff_rgb24ToUV_half_neon, export=1 + rgbToUV_half bgr=0 endfunc -function ff_rgb24ToUV_neon, export=1 +function ff_bgr24ToUV_half_neon, export=1 + rgbToUV_half bgr=1 +endfunc + +.macro rgbToUV bgr cmp w5, #0 // check width > 0 b.le 3f cmp w5, #16 - rgb24_load_uv_coeff half=0 + rgb_load_uv_coeff half=0, bgr=\bgr 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 @@ -199,4 +226,12 @@ function ff_rgb24ToUV_neon, export=1 cbnz w5, 2b 3: ret +.endm + +function ff_rgb24ToUV_neon, export=1 + rgbToUV bgr=0 +endfunc + +function ff_bgr24ToUV_neon, export=1 + rgbToUV bgr=1 endfunc 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)