From patchwork Mon Oct 31 00:32:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 39069 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp619755pzj; Sun, 30 Oct 2022 17:33:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7MRrS2Nx3/zPkIAQ6yt3T1ELBD/GHbp+wQ7EZR1D+jbbx3DfZU4S7d1kWRTQUa02VJpxvX X-Received: by 2002:a17:906:8442:b0:7ad:960b:ef61 with SMTP id e2-20020a170906844200b007ad960bef61mr10601020ejy.702.1667176397847; Sun, 30 Oct 2022 17:33:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667176397; cv=none; d=google.com; s=arc-20160816; b=QdDi9sXBJs//9Ra1USDNr7AcMNMRRI9Rt5Pa2INoaX8QFCB4pv5/X3a6c0+Pq5zM/8 bvCtpJGZzv1DoLrBxGEsqO+E4nT9CxFzHBgJVOOv142o5B9LPvHixahYI7DHKwolFa76 YphBceY9/yHN+76trtBpG8V787+KGUSjwKPVSxEhcPoOcAJoLW5H8ujselhDKCsDIJV6 VvMsHZs/ThDjZ10+Z8e6k8vPzOKX0nJtF7TF0PGvqaYtk+21VwszrtlqQfsNQi/M4Ydr jaIt25hvofi6+1ToCJKuejudmwNTgE8Xp729RLEqWCJ6Avm+HjzNwJcww9yFmIo0bQZw BjpA== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=M502uE2T8NvYnuZMAQkZjwPvGCY6CXRT8CAdV7M2uTs=; b=lbu/LLozgoBdtAiHgQKsz9UImYAJqHki8ByxFuRCSVpQXwQaKUvNSDmWPNo82OyRUL 7zapJA/JPPFKSFOfytZp/DC8tk0kobZsLeFpBoD8HlJ47kzyfczEJn7/lUb2CurU03wD /EXmT0jqNHfDeOtNzTNk3GkNCgikVvYTHqp5ipYRYDTv5PnXmnaFSNXcsyDTB8GHUBsE BMxHM5zvRV9wkz7gbwFhVYE58AiUyS+FYkA5xgsQuJXI3bUm7dQAsQje1fG58mJVmqtz rSkHOd0JViH7iSmxRaQKz1copn7QW2M5lqhxJkY/8DcPT609o0S1hirfujAi7M890rjh DuWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HFxE5D69; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b6-20020aa7c6c6000000b00462764a8b8esi5040080eds.592.2022.10.30.17.33.17; Sun, 30 Oct 2022 17:33:17 -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=@gmail.com header.s=20210112 header.b=HFxE5D69; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A6A968BDCC; Mon, 31 Oct 2022 02:33:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40ED568BD28 for ; Mon, 31 Oct 2022 02:33:01 +0200 (EET) Received: by mail-pj1-f42.google.com with SMTP id o7so5877853pjj.1 for ; Sun, 30 Oct 2022 17:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lEQnxzIUumeilp+UNMA6dwRS1QqCHDKdOyTz1nNHhG4=; b=HFxE5D69X2JG04kT5PtOsPmj49ThBV58elNv7+jgIZV70/orzpUwSsrSEos/XjJ0eP SisaGqQ8AXaqpfoY+WyBW9Ud+IGfkCzPTtYOycy+Ns13lrLIUuHSRrZV4Nk0bl9srG5g +oYKwTvt4l2rr7d5Qldg35Gi39h2PR2fKiH40XU6szaimQhVdaXfyZnUWpqJ5DHXTqg/ MaN0ijVhwbLC1LIDV4F27zqJDDvuOwGk+cAXcqcGKD9PhaOPfTS+GJ8L1Gw/scCCAEcz N18Oe8oYvU+fzNLNOQ9VCcsQQkzzSTxwsVjBO2bP/ZY2xcgFdS3tBEdE/Ama8IgnmsuC HJ3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lEQnxzIUumeilp+UNMA6dwRS1QqCHDKdOyTz1nNHhG4=; b=fnHqx3KWnLxb+JmWCv+TNMDmuVhTzYfmZ6SwkjT17BDW41TNKU0k3xN1DDO56GMfId hrJxED4ESiBtnHvdpO4/Wg3mk4o56Wrw6UDQsiD/QXVVQBDbVBTrteSzopxWYSRAsBUH IW7JWCxqeHJl5muj1hqnRzycBpjcUdzt81XIHbGHUo8wB7vTIbMozhtlJNITvseEnHM5 4DQK3Ifvnp2mMgyA0Ye/47lTKEPU0rUuWFlfbnNpUH+6748Gkj0Qr93eMfnSGVLuWxu9 eaDCPDyTwwgLiUDZWI82roFbSNGF27qK/LfeWT6SOGPp4ZkkFG4FnNDyNaLNpimgDO8d Nmyw== X-Gm-Message-State: ACrzQf2z5DpJDAzeVErtM+MFf9lBOXA//iNX4bsOGCwzPTQtOff3fbVk FK8AVQ7+ZjATgWCJj7wIls4mbE4D9JA= X-Received: by 2002:a17:90a:f294:b0:213:cb7e:632d with SMTP id fs20-20020a17090af29400b00213cb7e632dmr6301683pjb.117.1667176378578; Sun, 30 Oct 2022 17:32:58 -0700 (PDT) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id m18-20020a62a212000000b0056bd737fdf3sm3175699pff.123.2022.10.30.17.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 17:32:57 -0700 (PDT) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Oct 2022 17:32:32 -0700 Message-Id: <20221031003235.348-2-mindmark@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20221031003235.348-1-mindmark@gmail.com> References: <20221031003235.348-1-mindmark@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/4] swscale/input: add rgbaf32 input support 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: Mark Reid Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: E7/rMYgb13ZF From: Mark Reid --- libswscale/input.c | 172 +++++++++++++++++++++++++++++++++++++++++++++ libswscale/utils.c | 4 ++ 2 files changed, 176 insertions(+) diff --git a/libswscale/input.c b/libswscale/input.c index 7ff7bfaa01..4683284b0b 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -1284,6 +1284,136 @@ static void rgbaf16##endian_name##ToA_c(uint8_t *_dst, const uint8_t *_src, cons rgbaf16_funcs_endian(le, 0) rgbaf16_funcs_endian(be, 1) +#define rdpx(src) (is_be ? av_int2float(AV_RB32(&src)): av_int2float(AV_RL32(&src))) + +static av_always_inline void rgbaf32ToUV_half_endian(uint16_t *dstU, uint16_t *dstV, int is_be, + const float *src, int width, + int32_t *rgb2yuv, int comp) +{ + int32_t ru = rgb2yuv[RU_IDX], gu = rgb2yuv[GU_IDX], bu = rgb2yuv[BU_IDX]; + int32_t rv = rgb2yuv[RV_IDX], gv = rgb2yuv[GV_IDX], bv = rgb2yuv[BV_IDX]; + int i; + for (i = 0; i < width; i++) { + int r = (lrintf(av_clipf(65535.0f * rdpx(src[i*(comp*2)+0]), 0.0f, 65535.0f)) + + lrintf(av_clipf(65535.0f * rdpx(src[i*(comp*2)+4]), 0.0f, 65535.0f))) >> 1; + int g = (lrintf(av_clipf(65535.0f * rdpx(src[i*(comp*2)+1]), 0.0f, 65535.0f)) + + lrintf(av_clipf(65535.0f * rdpx(src[i*(comp*2)+5]), 0.0f, 65535.0f))) >> 1; + int b = (lrintf(av_clipf(65535.0f * rdpx(src[i*(comp*2)+2]), 0.0f, 65535.0f)) + + lrintf(av_clipf(65535.0f * rdpx(src[i*(comp*2)+6]), 0.0f, 65535.0f))) >> 1; + + dstU[i] = (ru*r + gu*g + bu*b + (0x10001<<(RGB2YUV_SHIFT-1))) >> RGB2YUV_SHIFT; + dstV[i] = (rv*r + gv*g + bv*b + (0x10001<<(RGB2YUV_SHIFT-1))) >> RGB2YUV_SHIFT; + } +} + +static av_always_inline void rgbaf32ToUV_endian(uint16_t *dstU, uint16_t *dstV, int is_be, + const float *src, int width, + int32_t *rgb2yuv, int comp) +{ + int32_t ru = rgb2yuv[RU_IDX], gu = rgb2yuv[GU_IDX], bu = rgb2yuv[BU_IDX]; + int32_t rv = rgb2yuv[RV_IDX], gv = rgb2yuv[GV_IDX], bv = rgb2yuv[BV_IDX]; + int i; + for (i = 0; i < width; i++) { + int r = lrintf(av_clipf(65535.0f * rdpx(src[i*comp+0]), 0.0f, 65535.0f)); + int g = lrintf(av_clipf(65535.0f * rdpx(src[i*comp+1]), 0.0f, 65535.0f)); + int b = lrintf(av_clipf(65535.0f * rdpx(src[i*comp+2]), 0.0f, 65535.0f)); + + dstU[i] = (ru*r + gu*g + bu*b + (0x10001<<(RGB2YUV_SHIFT-1))) >> RGB2YUV_SHIFT; + dstV[i] = (rv*r + gv*g + bv*b + (0x10001<<(RGB2YUV_SHIFT-1))) >> RGB2YUV_SHIFT; + } +} + +static av_always_inline void rgbaf32ToY_endian(uint16_t *dst, const float *src, int is_be, + int width, int32_t *rgb2yuv, int comp) +{ + int32_t ry = rgb2yuv[RY_IDX], gy = rgb2yuv[GY_IDX], by = rgb2yuv[BY_IDX]; + int i; + for (i = 0; i < width; i++) { + int r = lrintf(av_clipf(65535.0f * rdpx(src[i*comp+0]), 0.0f, 65535.0f)); + int g = lrintf(av_clipf(65535.0f * rdpx(src[i*comp+1]), 0.0f, 65535.0f)); + int b = lrintf(av_clipf(65535.0f * rdpx(src[i*comp+2]), 0.0f, 65535.0f)); + + dst[i] = (ry*r + gy*g + by*b + (0x2001<<(RGB2YUV_SHIFT-1))) >> RGB2YUV_SHIFT; + } +} + +static av_always_inline void rgbaf32ToA_endian(uint16_t *dst, const float *src, int is_be, + int width, void *opq) +{ + int i; + for (i=0; isrcFormat; @@ -1570,6 +1700,18 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_RGBAF16LE: c->chrToYV12 = rgbaf16leToUV_half_c; break; + case AV_PIX_FMT_RGBF32BE: + c->chrToYV12 = rgbf32beToUV_half_c; + break; + case AV_PIX_FMT_RGBAF32BE: + c->chrToYV12 = rgbaf32beToUV_half_c; + break; + case AV_PIX_FMT_RGBF32LE: + c->chrToYV12 = rgbf32leToUV_half_c; + break; + case AV_PIX_FMT_RGBAF32LE: + c->chrToYV12 = rgbaf32leToUV_half_c; + break; } } else { switch (srcFormat) { @@ -1663,6 +1805,18 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_RGBAF16LE: c->chrToYV12 = rgbaf16leToUV_c; break; + case AV_PIX_FMT_RGBF32BE: + c->chrToYV12 = rgbf32beToUV_c; + break; + case AV_PIX_FMT_RGBAF32BE: + c->chrToYV12 = rgbaf32beToUV_c; + break; + case AV_PIX_FMT_RGBF32LE: + c->chrToYV12 = rgbf32leToUV_c; + break; + case AV_PIX_FMT_RGBAF32LE: + c->chrToYV12 = rgbaf32leToUV_c; + break; } } @@ -1973,6 +2127,18 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_RGBAF16LE: c->lumToYV12 = rgbaf16leToY_c; break; + case AV_PIX_FMT_RGBF32BE: + c->lumToYV12 = rgbf32beToY_c; + break; + case AV_PIX_FMT_RGBAF32BE: + c->lumToYV12 = rgbaf32beToY_c; + break; + case AV_PIX_FMT_RGBF32LE: + c->lumToYV12 = rgbf32leToY_c; + break; + case AV_PIX_FMT_RGBAF32LE: + c->lumToYV12 = rgbaf32leToY_c; + break; } if (c->needAlpha) { if (is16BPS(srcFormat) || isNBPS(srcFormat)) { @@ -1998,6 +2164,12 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_RGBAF16LE: c->alpToYV12 = rgbaf16leToA_c; break; + case AV_PIX_FMT_RGBAF32BE: + c->alpToYV12 = rgbaf32beToA_c; + break; + case AV_PIX_FMT_RGBAF32LE: + c->alpToYV12 = rgbaf32leToA_c; + break; case AV_PIX_FMT_YA8: c->alpToYV12 = uyvyToY_c; break; diff --git a/libswscale/utils.c b/libswscale/utils.c index 45baa22b23..6da1f21e25 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -266,6 +266,10 @@ static const FormatEntry format_entries[] = { [AV_PIX_FMT_VUYX] = { 1, 1 }, [AV_PIX_FMT_RGBAF16BE] = { 1, 0 }, [AV_PIX_FMT_RGBAF16LE] = { 1, 0 }, + [AV_PIX_FMT_RGBF32BE] = { 1, 0 }, + [AV_PIX_FMT_RGBF32LE] = { 1, 0 }, + [AV_PIX_FMT_RGBAF32BE] = { 1, 0 }, + [AV_PIX_FMT_RGBAF32LE] = { 1, 0 }, [AV_PIX_FMT_XV30LE] = { 1, 1 }, [AV_PIX_FMT_XV36LE] = { 1, 1 }, }; From patchwork Mon Oct 31 00:32:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 39070 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp619806pzj; Sun, 30 Oct 2022 17:33:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7rjee4lbNLuFxDN2hVqTJNRYz2lfeT6QgKLCqF6lq7uD2u4SfdN9xYLhQ1n5XBLJGMkA5Y X-Received: by 2002:a17:907:a48:b0:7a7:3714:1629 with SMTP id be8-20020a1709070a4800b007a737141629mr9864213ejc.569.1667176405440; Sun, 30 Oct 2022 17:33:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667176405; cv=none; d=google.com; s=arc-20160816; b=btkjqDXGjO9NMrmWANGbwFqRCQXLSHFI5ngJtQbteaWoMvb1skvkDT2ppR9IiTcqO7 6EXHzsxesAQJ+grjs4yLg3JvXfXXOnb+GhwtOr9ADrVFC8JeOr5fkJLZW9jorMIJ644Z pGdxxeK9fyUkHE/VJzZ1UIFbeBqwIB0FFLzpHJ25BBuJkLwnuQ9SAwyAlY0eJNSY19/8 0xiMBDB1Ng+Q5t3aaOGq5mgbwGoi+K6Zo9+AAengxWgYoXASB6HCx3ORiZxZCm2Ysb3m 7361tCA48TLU/9m7QXy9FCpsyylsd+SgC5Jw6NlxT/b/BD4Dl3AMz/9CRD47wRsnY++G VzGg== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=PJejlmHKBPtnBvgMJKwti1U4pMM0fAtqlrmBURAsoig=; b=rk2t1XkPTXXcMcmxPU09lxslxbkTrSoFbQ/4D0T9NUt7+vUa/mK6Jyb4+Lhy5xs9Bl 2boHWVLGIHXAku2b3Q9COWXxUAUeyzDXR6L6b3I2Eu7UvGIvWqeiz6op21T9arI7jFTV eK/xTu2+2P7zZhQqsN686mg4kGV+EPl+vLaKRhWGnJK7sShx5bi9SLbAHOHie4JKan/H eoowBloiHaMxrEJYjfEhLBUwhtqx0X+xwLTG2NUpnzyO0BS+/3iU4QC3sBXmXYe2l72i j8qBu24cl5hfaox5cJYOYNHvQRBQRizovjpNvUnvRyM2ra/dDUWyojGKWuCuHS69ideW qbjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AmhJkNJp; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b16-20020a1709063f9000b00780488c11bbsi5548466ejj.388.2022.10.30.17.33.25; Sun, 30 Oct 2022 17:33:25 -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=@gmail.com header.s=20210112 header.b=AmhJkNJp; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 897E468BDD0; Mon, 31 Oct 2022 02:33:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83CFE68BCD2 for ; Mon, 31 Oct 2022 02:33:02 +0200 (EET) Received: by mail-pg1-f169.google.com with SMTP id 128so9412174pga.1 for ; Sun, 30 Oct 2022 17:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gA54uSmepfSWjONf2GDMCk9UPzM21oyq2EuT7HkLuD4=; b=AmhJkNJpRjpmTSsz+LSZbS0awCs3egFFhY4l6S+7CTrvjwqGAwaHPJ/L1LWg2gewGO kjSdCKS7A00iOU3UkzxLifyp6D13DKQcwyc2SVZX+HWOQIt7t8ZfKn5Sgh63sxdknxTf pifHMfjVXZYoCYio7+TuSncRRMEBJmFUvdwNNYvJq7aIcFozgSUiwaXkd9Tvaof5AaAK tE/eixWGB0yOV5VppkvT6dc1JUxP6zWzvM5Qnz8OdWWl03ZL98ORvmDH7AqbyybTXcuu 6attvPXm0mAh7ESGJhqAgW7Brey9V7S02KVBEr+4HLB2484wVeh2f7K5ct2o8QEH6wuP 5P2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gA54uSmepfSWjONf2GDMCk9UPzM21oyq2EuT7HkLuD4=; b=ApoG/cWtPLtrHJzzzorm8QL6R6r906hG7r1Kcx4mlOxE+AaTc6F0QxdtMFJ/vPXNl9 VCf+lXiDVbjgF+wdOdabTVe29VhXcFojXR/Bq82obep6vkieox7O/kxjiyKsAbLYN2oN Bgh7n2ajUH1VbWHUTMJjA4qLqoUViKX1VV0prRs3e1CQbWiHsB/X8IqjRvZU4Gv+UA8o TluQBdWteQ2Da8mf7e9RZEayMgcZ64yOcD6d3uwpWboTYiu+yMjvfUDUZdoLHrR9H9QH Qvo4BgJGD3VBcKZjJ5LGqSWMKHIUbsY37I5ApS82Hq/DXpKgHxa8e5Qse+HfRY9N7M3Y GhBQ== X-Gm-Message-State: ACrzQf3T+okHsmjeMlnZSr8+zQj7WlkZw82+d2lAB7q5VkPLvTfa/5hg 6PCuGXYVLLAQEoGDRGskfEVt1jHyVf0= X-Received: by 2002:a63:2a55:0:b0:46f:8fcd:a853 with SMTP id q82-20020a632a55000000b0046f8fcda853mr7421469pgq.145.1667176380235; Sun, 30 Oct 2022 17:33:00 -0700 (PDT) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id m18-20020a62a212000000b0056bd737fdf3sm3175699pff.123.2022.10.30.17.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 17:32:59 -0700 (PDT) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Oct 2022 17:32:33 -0700 Message-Id: <20221031003235.348-3-mindmark@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20221031003235.348-1-mindmark@gmail.com> References: <20221031003235.348-1-mindmark@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/4] avfilter/vf_hflip: add support for packed rgb float formats 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: Mark Reid Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WadAxlI6yX/K From: Mark Reid --- libavfilter/vf_hflip_init.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/libavfilter/vf_hflip_init.h b/libavfilter/vf_hflip_init.h index d0319f463d..31173f73fc 100644 --- a/libavfilter/vf_hflip_init.h +++ b/libavfilter/vf_hflip_init.h @@ -86,6 +86,29 @@ static void hflip_qword_c(const uint8_t *ssrc, uint8_t *ddst, int w) dst[j] = src[-j]; } +static void hflip_b96_c(const uint8_t *ssrc, uint8_t *ddst, int w) +{ + const uint32_t *in = (const uint32_t *)ssrc; + uint32_t *out = (uint32_t *)ddst; + + for (int j = 0; j < w; j++, out += 3, in -= 3) { + out[0] = in[0]; + out[1] = in[1]; + out[2] = in[2]; + } +} + +static void hflip_b128_c(const uint8_t *ssrc, uint8_t *ddst, int w) +{ + const uint64_t *in = (const uint64_t *)ssrc; + uint64_t *out = (uint64_t *)ddst; + + for (int j = 0; j < w; j++, out += 2, in -= 2) { + out[0] = in[0]; + out[1] = in[1]; + } +} + static av_unused int ff_hflip_init(FlipContext *s, int step[4], int nb_planes) { for (int i = 0; i < nb_planes; i++) { @@ -97,6 +120,8 @@ static av_unused int ff_hflip_init(FlipContext *s, int step[4], int nb_planes) case 4: s->flip_line[i] = hflip_dword_c; break; case 6: s->flip_line[i] = hflip_b48_c; break; case 8: s->flip_line[i] = hflip_qword_c; break; + case 12: s->flip_line[i] = hflip_b96_c; break; + case 16: s->flip_line[i] = hflip_b128_c; break; default: return AVERROR_BUG; } From patchwork Mon Oct 31 00:32:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 39071 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp619832pzj; Sun, 30 Oct 2022 17:33:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM57oaBGkehFhayYQlwIK6QCQVxJzG1jNYNaEdKQw2EskY9ESEQfH4WVGiaVCLUHty9kbFUY X-Received: by 2002:a05:6402:158d:b0:463:2343:b980 with SMTP id c13-20020a056402158d00b004632343b980mr6400495edv.150.1667176413223; Sun, 30 Oct 2022 17:33:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667176413; cv=none; d=google.com; s=arc-20160816; b=str/4r+9NiBKZ/BsNLY2G57UGbqoVSaAO/cLW4Mb6MRYY8rVifL/PaDVxoq2iAC4Nt AZeTp5bREyRpG06J1SVde5Nj6z3b8+k9I603jbWZ74Gjvm4H9W7lsOs2RdMYxk8P4TWC ciN9oUhoExWGdsfglTOrnCdPIze+AsgYaBcDZrGOoVvc396kcdwGVf/zf4EhaQEkudTe HTjuHahwNc0tf2r+uf53hYm4Hj1G2DsNTWmJMvkXcnTiXRSLw2QBSbEWutINOaFs2NEs IFpFYz/pX5nlaNsvRton32Su8JaWLdntsbA/sdXnWYRddxaqnW5w78zhhSVk+0RGPs6U 3pUA== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=boMg8rZ0alfHDA3iE/A2krjQnDhL41J8Bi73ikJeBbs=; b=IMAjO3mygK4j6X+et+md9PxSq5s0+srm52LA1nIRHIYk8RNIbln+GF/TJJjChe0Fbz GEHQZbQ3/AQPdqLytG2FXwicEiVlifhd/uWT6aZqOq/PuXMH08mJ69y4nLNfd65zDsAx /6an/1+k92KWfXZD1w7Ew7Ip3oGP1+dRzkN4KXy9HCN/6D4iYp3BFdY7y7CtxHqrDojs ESV5dW5xdn/6BPMACBqfcr2Z1L/27AxeSzXr3d8YULTwAi8EcNLREXP5IS9InRb1hQD2 SqC5GonqRI79RpVNMMwjTJ5wu+Rb5E3222UKakN4Mrmr57FsVN4J4aqpCmoJql1xwAAo ALwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=MGKRUhFw; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cr17-20020a170906d55100b0078db8fe2834si6760272ejc.245.2022.10.30.17.33.32; Sun, 30 Oct 2022 17:33:33 -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=@gmail.com header.s=20210112 header.b=MGKRUhFw; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 902B968BDAC; Mon, 31 Oct 2022 02:33:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1653E68BD36 for ; Mon, 31 Oct 2022 02:33:04 +0200 (EET) Received: by mail-pg1-f169.google.com with SMTP id e129so9377366pgc.9 for ; Sun, 30 Oct 2022 17:33:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LksnUiNcu42gqrIrPD1I6aZ/atWUfj86EsUXolhc2Qk=; b=MGKRUhFwOk8NutKSN0Z1vI4t1ocYN7GAUT5RL7Mb7CpuAWcL3mRGIXtQ95PdTpjbPe /iV0HxXrP5kyxCPLC6I9fgM9OnhRKofKYrFMXHCRlGinYsIsh/bpa33cflHfU9n3jCUe N7V9Js+EDicdsOi2T9V0J/pccJ/6ayPy5VxsvzykO4Y17rXafTI6PY9Tasq5YoIg5lnG 9gSjxHjmgN+p7BmMfD+7pOfKZMeVEIJb+wYqpRRQiYw2BjhtTrpumb1OUrSwGenYMxlq v3/r6kBf+kTnLKTY3doBfCJuiaeV+Pn3CWVpXIeDnW8tdSYPUHWPYLjAG10n6Rr1djmf jvJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LksnUiNcu42gqrIrPD1I6aZ/atWUfj86EsUXolhc2Qk=; b=ijbjqIODwBtMQrSCVNKgmrjRqtB1awwr/SYQOiynG5tjasp+B3zqQF3qB3lpvPGO53 vpdPIwCRLPD8SGG56DN0PotpC4D/1bdgxKFo0ctinTi0mmqNsOyMEyk19Ho7d7lKIlas XEx7y7zaWnV6paDGqBsEOUFKtunk9nrMFJsvkM4xUMM8Wefo0gIhOE5F318C0VpYo++S f3TjylqqT0jA7+H9hyCwsRE80/nf9IxGnaad8WA3spnNDyDU+FXVDbur35cmY191/b59 JdpHDC50SN0LjVBqHKOTnVowQdrOg7GXOMynBzwUNMceE+4OUTssqJvmF6vHk3cXcXPW e28Q== X-Gm-Message-State: ACrzQf2cJYJo0XobW3S3t5GNQOnSny/kBBEGQkkhLcFg251VCZ9TSPAx dDXUCoh12H6HaUyHcPtskLrR2U+ZxEQ= X-Received: by 2002:a63:ee43:0:b0:46e:ffdb:5628 with SMTP id n3-20020a63ee43000000b0046effdb5628mr10247958pgk.463.1667176381789; Sun, 30 Oct 2022 17:33:01 -0700 (PDT) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id m18-20020a62a212000000b0056bd737fdf3sm3175699pff.123.2022.10.30.17.33.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 17:33:00 -0700 (PDT) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Oct 2022 17:32:34 -0700 Message-Id: <20221031003235.348-4-mindmark@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20221031003235.348-1-mindmark@gmail.com> References: <20221031003235.348-1-mindmark@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/4] avfilter/vf_transpose: add support for packed rgb float formats 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: Mark Reid Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DE3IILJKSUkq From: Mark Reid --- libavfilter/vf_transpose.c | 44 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index 469e66729f..1023d6fe82 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -174,6 +174,46 @@ static void transpose_8x8_64_c(uint8_t *src, ptrdiff_t src_linesize, transpose_block_64_c(src, src_linesize, dst, dst_linesize, 8, 8); } +static inline void transpose_block_96_c(uint8_t *src, ptrdiff_t src_linesize, + uint8_t *dst, ptrdiff_t dst_linesize, + int w, int h) +{ + int x, y; + for (y = 0; y < h; y++, dst += dst_linesize, src += 12) { + for (x = 0; x < w; x++) { + *((uint32_t *)(dst+0 + 12*x)) = *((uint32_t *)(src+0 + x*src_linesize)); + *((uint32_t *)(dst+4 + 12*x)) = *((uint32_t *)(src+4 + x*src_linesize)); + *((uint32_t *)(dst+8 + 12*x)) = *((uint32_t *)(src+8 + x*src_linesize)); + } + } +} + +static void transpose_8x8_96_c(uint8_t *src, ptrdiff_t src_linesize, + uint8_t *dst, ptrdiff_t dst_linesize) +{ + transpose_block_96_c(src, src_linesize, dst, dst_linesize, 8, 8); +} + + +static inline void transpose_block_128_c(uint8_t *src, ptrdiff_t src_linesize, + uint8_t *dst, ptrdiff_t dst_linesize, + int w, int h) +{ + int x, y; + for (y = 0; y < h; y++, dst += dst_linesize, src += 16) { + for (x = 0; x < w; x++) { + *((uint64_t *)(dst+0 + 16*x)) = *((uint64_t *)(src+0 + x*src_linesize)); + *((uint64_t *)(dst+8 + 16*x)) = *((uint64_t *)(src+8 + x*src_linesize)); + } + } +} + +static void transpose_8x8_128_c(uint8_t *src, ptrdiff_t src_linesize, + uint8_t *dst, ptrdiff_t dst_linesize) +{ + transpose_block_128_c(src, src_linesize, dst, dst_linesize, 8, 8); +} + static int config_props_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -232,6 +272,10 @@ static int config_props_output(AVFilterLink *outlink) v->transpose_8x8 = transpose_8x8_48_c; break; case 8: v->transpose_block = transpose_block_64_c; v->transpose_8x8 = transpose_8x8_64_c; break; + case 12: v->transpose_block = transpose_block_96_c; + v->transpose_8x8 = transpose_8x8_96_c; break; + case 16: v->transpose_block = transpose_block_128_c; + v->transpose_8x8 = transpose_8x8_128_c; break; } } From patchwork Mon Oct 31 00:32:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 39072 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp619863pzj; Sun, 30 Oct 2022 17:33:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4qkv6n9ttE5KBh/BJoPsxx6v2KB2H/ECTdEG/4lWhPn0IRFuCH4coR/CKNh7v2oS9WjAud X-Received: by 2002:a17:906:dac8:b0:741:545b:796a with SMTP id xi8-20020a170906dac800b00741545b796amr10302962ejb.240.1667176421521; Sun, 30 Oct 2022 17:33:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667176421; cv=none; d=google.com; s=arc-20160816; b=W5R0EM6FPauZtEso81ENKinCvG/2MV6nhRDal2r6Q5E9IWtE/HlKvhShW3q8EvOz02 I53Zy8YXr2R8uYhLvHEEP/njo2eIScbttrm9+rJeZlmyaTHocB3R1z2SnAC7zrNQwz4E VWZ5ktvhXS0GqzSTciLVFNahy8And7tahEkxDFt7rmR7V3wDp4c02CJPtuxIkYsFZP+3 C4Y+L4rRdR+WE3m0X+6J+M3RR6mJEMQJD6X+lNFzX/5vmk9tYYM0Q8NUutcEJwItEOKd 3l85G8qi6yzbZ7ifVAAb64hNppc/5TYFXTxLcqZT5BCsBBi43PX+tTbifntMt5lCxGqe +ITA== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=EUgfTODpnX3957JkBH2GqZqg6UyXanZ1YUFih7MxM7A=; b=kqo3xh1il5vukssT9E97yLQNTP4tIEMIhTsdmk8ibarpY1hLm1efsZMQ+wSRmGKiL/ RNm+WkcXBvokVbrBmp2qESD6bcEQQv71TB6jhP8XOy0Kk3p/fFhU7CVWu0ZIKxlx238K 3fX/VAx3gOju8/ZiYH6PK2FPjBInUrPnR9LXb5Ktq+NuhUcSuUOiirCMKH/qVt36eNE1 aigxXRx6aJIU5Qiu1H1EEAJrHhAFe+c64yNLM42V52e+LuzrbyCa8gWy4NAyUq3zagDM Qt4rB2uPKh1jxRbC3in1rf+od8B2AiZY9M2Pxq30VjZ9jwOEItkBPJyyW9sEEo2X/1vD Q8jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=OtpCQ25m; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hp10-20020a1709073e0a00b00732fcbcfedesi6866193ejc.623.2022.10.30.17.33.41; Sun, 30 Oct 2022 17:33:41 -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=@gmail.com header.s=20210112 header.b=OtpCQ25m; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 751EC68BDE6; Mon, 31 Oct 2022 02:33:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3B7068BDD1 for ; Mon, 31 Oct 2022 02:33:05 +0200 (EET) Received: by mail-pg1-f171.google.com with SMTP id r18so9364947pgr.12 for ; Sun, 30 Oct 2022 17:33:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=U4L0OrnbvB5RQhWf2TTdgACl7SgwZMH2ZrYQk0EOgsQ=; b=OtpCQ25mnpiaYK1dwCgSqgJ0AgOkEeZjIU/KMJvuQAR89fKzMWYCJjkk4DeCQ+I43x zTPCEl8PHpGPeZ0Tfi0+hOhmUynG+0PE96xustDH0yQrBqhI1GEkreQy+m6nUFwxwtnb ihFho0tPOpm5/0073es4L9rdvP770WD+sXq8UTYCmOZOVWi9sPVl0o/TMRciDwXlnf21 +xJWY89UAjclnfnOdnfj5RamRZ1W2BL5qP/5/FYevOAGVQkmYYrjhI+qA/ZGcK5BGwsV XEOBuFRNk8B+Vy0W8h+qCU3KNsHbM4Thd9NIE9sGdZEUDcsF8DUwsNvIVxan84bkc3gn PhmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=U4L0OrnbvB5RQhWf2TTdgACl7SgwZMH2ZrYQk0EOgsQ=; b=JWiaDBW/IIcn1+Nd8MCkLl1JTlE07qWKvDkf3mEg13/SWJWfsmghYiTR1yh+1tl5RB dN5rUeiyz0OcQGZwEgofI4mcmXfxEDsiQHI77tx8fAZ2t0n5iwh1Ch8wpwVigrJu/N9e oyOjAb3L+FvKpoDur+suf/LgLH44AvBg+o43BV3/BwZY9yq+okZBf2s2IyOgjuF5CqUi x28ZZfymC6ru4AuOLHbM01ikUVOmVZmDTs4fokGVq/bPX/L75HWuEZYxXPpZLhBXdpqX jtlqBe1lvVr7aH+h0QME17cAyKtB6+Wiw25zN+4iCV1nu2vPywo3egEHuatvEmEYecxM 6IlQ== X-Gm-Message-State: ACrzQf3YhIY+ZYxvrfmIl5RgRNWOstKONU/0ro8w/H9Qm27EZt9NuS9s OXB1okBZ4E5DLNg2+3Pl7ONcnqCeJeA= X-Received: by 2002:a65:5242:0:b0:46e:9bac:178 with SMTP id q2-20020a655242000000b0046e9bac0178mr10320737pgp.300.1667176383309; Sun, 30 Oct 2022 17:33:03 -0700 (PDT) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id m18-20020a62a212000000b0056bd737fdf3sm3175699pff.123.2022.10.30.17.33.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 17:33:02 -0700 (PDT) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Oct 2022 17:32:35 -0700 Message-Id: <20221031003235.348-5-mindmark@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20221031003235.348-1-mindmark@gmail.com> References: <20221031003235.348-1-mindmark@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/4] swscale/output: add rgbaf32 output support 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: Mark Reid Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BvgUEljKVrJt From: Mark Reid --- libswscale/output.c | 92 ++++++++++++++++++++++++ libswscale/swscale_unscaled.c | 4 +- libswscale/tests/floatimg_cmp.c | 4 +- libswscale/utils.c | 16 +++-- libswscale/yuv2rgb.c | 2 + tests/ref/fate/filter-pixdesc-rgbaf32be | 1 + tests/ref/fate/filter-pixdesc-rgbaf32le | 1 + tests/ref/fate/filter-pixdesc-rgbf32be | 1 + tests/ref/fate/filter-pixdesc-rgbf32le | 1 + tests/ref/fate/filter-pixfmts-copy | 4 ++ tests/ref/fate/filter-pixfmts-crop | 4 ++ tests/ref/fate/filter-pixfmts-field | 4 ++ tests/ref/fate/filter-pixfmts-fieldorder | 4 ++ tests/ref/fate/filter-pixfmts-hflip | 4 ++ tests/ref/fate/filter-pixfmts-il | 4 ++ tests/ref/fate/filter-pixfmts-null | 4 ++ tests/ref/fate/filter-pixfmts-scale | 4 ++ tests/ref/fate/filter-pixfmts-transpose | 4 ++ tests/ref/fate/filter-pixfmts-vflip | 4 ++ tests/ref/fate/sws-floatimg-cmp | 16 +++++ 20 files changed, 170 insertions(+), 8 deletions(-) create mode 100644 tests/ref/fate/filter-pixdesc-rgbaf32be create mode 100644 tests/ref/fate/filter-pixdesc-rgbaf32le create mode 100644 tests/ref/fate/filter-pixdesc-rgbf32be create mode 100644 tests/ref/fate/filter-pixdesc-rgbf32le diff --git a/libswscale/output.c b/libswscale/output.c index 0e1c1225a0..e2ec9cbdf5 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -2474,6 +2474,92 @@ yuv2gbrpf32_full_X_c(SwsContext *c, const int16_t *lumFilter, } } +static void +yuv2rgbaf32_full_X_c(SwsContext *c, const int16_t *lumFilter, + const int16_t **lumSrcx, int lumFilterSize, + const int16_t *chrFilter, const int16_t **chrUSrcx, + const int16_t **chrVSrcx, int chrFilterSize, + const int16_t **alpSrcx, uint8_t *dest, + int dstW, int y) +{ + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->dstFormat); + int i; + int alpha = desc->flags & AV_PIX_FMT_FLAG_ALPHA; + int hasAlpha = alpha && alpSrcx; + int pixelStep = alpha ? 4 : 3; + uint32_t *dest32 = (uint32_t*)dest; + const int32_t **lumSrc = (const int32_t**)lumSrcx; + const int32_t **chrUSrc = (const int32_t**)chrUSrcx; + const int32_t **chrVSrc = (const int32_t**)chrVSrcx; + const int32_t **alpSrc = (const int32_t**)alpSrcx; + static const float float_mult = 1.0f / 65535.0f; + uint32_t a = av_float2int(1.0f); + + for (i = 0; i < dstW; i++) { + int j; + int Y = -0x40000000; + int U = -(128 << 23); + int V = -(128 << 23); + int R, G, B, A; + + for (j = 0; j < lumFilterSize; j++) + Y += lumSrc[j][i] * (unsigned)lumFilter[j]; + + for (j = 0; j < chrFilterSize; j++) { + U += chrUSrc[j][i] * (unsigned)chrFilter[j]; + V += chrVSrc[j][i] * (unsigned)chrFilter[j]; + } + + Y >>= 14; + Y += 0x10000; + U >>= 14; + V >>= 14; + + if (hasAlpha) { + A = -0x40000000; + + for (j = 0; j < lumFilterSize; j++) + A += alpSrc[j][i] * (unsigned)lumFilter[j]; + + A >>= 1; + A += 0x20002000; + a = av_float2int(float_mult * (float)(av_clip_uintp2(A, 30) >> 14)); + } + + Y -= c->yuv2rgb_y_offset; + Y *= c->yuv2rgb_y_coeff; + Y += 1 << 13; + R = V * c->yuv2rgb_v2r_coeff; + G = V * c->yuv2rgb_v2g_coeff + U * c->yuv2rgb_u2g_coeff; + B = U * c->yuv2rgb_u2b_coeff; + + R = av_clip_uintp2(Y + R, 30); + G = av_clip_uintp2(Y + G, 30); + B = av_clip_uintp2(Y + B, 30); + + dest32[0] = av_float2int(float_mult * (float)(R >> 14)); + dest32[1] = av_float2int(float_mult * (float)(G >> 14)); + dest32[2] = av_float2int(float_mult * (float)(B >> 14)); + if (alpha) + dest32[3] = a; + + dest32 += pixelStep; + } + if ((!isBE(c->dstFormat)) != (!HAVE_BIGENDIAN)) { + dest32 = (uint32_t*)dest; + for (i = 0; i < dstW; i++) { + dest32[0] = av_bswap32(dest32[0]); + dest32[1] = av_bswap32(dest32[1]); + dest32[2] = av_bswap32(dest32[2]); + if (alpha) + dest32[3] = av_bswap32(dest32[3]); + + dest32 += pixelStep; + } + } + +} + static void yuv2ya8_1_c(SwsContext *c, const int16_t *buf0, const int16_t *ubuf[2], const int16_t *vbuf[2], @@ -2986,6 +3072,12 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, } break; + case AV_PIX_FMT_RGBF32LE: + case AV_PIX_FMT_RGBF32BE: + case AV_PIX_FMT_RGBAF32LE: + case AV_PIX_FMT_RGBAF32BE: + *yuv2packedX = yuv2rgbaf32_full_X_c; + break; case AV_PIX_FMT_RGB24: *yuv2packedX = yuv2rgb24_full_X_c; *yuv2packed2 = yuv2rgb24_full_2_c; diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 8838cc8b53..fb151cd371 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -2159,7 +2159,9 @@ void ff_get_unscaled_swscale(SwsContext *c) /* bswap 32 bits per pixel/component formats */ if (IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRPF32) || - IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRAPF32)) + IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GBRAPF32) || + IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGBF32) || + IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGBAF32)) c->convert_unscaled = bswap_32bpc; if (usePal(srcFormat) && isByteRGB(dstFormat)) diff --git a/libswscale/tests/floatimg_cmp.c b/libswscale/tests/floatimg_cmp.c index 5c67594fb6..9559c93aac 100644 --- a/libswscale/tests/floatimg_cmp.c +++ b/libswscale/tests/floatimg_cmp.c @@ -54,7 +54,9 @@ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GBRP10LE, AV_PIX_FMT_GBRAP10LE, AV_PIX_FMT_GBRP12LE, AV_PIX_FMT_GBRAP12LE, AV_PIX_FMT_GBRP14LE, - AV_PIX_FMT_GBRP16LE, AV_PIX_FMT_GBRAP16LE + AV_PIX_FMT_GBRP16LE, AV_PIX_FMT_GBRAP16LE, + AV_PIX_FMT_RGBF32LE, AV_PIX_FMT_RGBAF32LE, + AV_PIX_FMT_RGBF32BE, AV_PIX_FMT_RGBAF32BE }; const char *usage = "floatimg_cmp -pixel_format -size -ref \n"; diff --git a/libswscale/utils.c b/libswscale/utils.c index 6da1f21e25..0bbb799516 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -266,10 +266,10 @@ static const FormatEntry format_entries[] = { [AV_PIX_FMT_VUYX] = { 1, 1 }, [AV_PIX_FMT_RGBAF16BE] = { 1, 0 }, [AV_PIX_FMT_RGBAF16LE] = { 1, 0 }, - [AV_PIX_FMT_RGBF32BE] = { 1, 0 }, - [AV_PIX_FMT_RGBF32LE] = { 1, 0 }, - [AV_PIX_FMT_RGBAF32BE] = { 1, 0 }, - [AV_PIX_FMT_RGBAF32LE] = { 1, 0 }, + [AV_PIX_FMT_RGBF32BE] = { 1, 1 }, + [AV_PIX_FMT_RGBF32LE] = { 1, 1 }, + [AV_PIX_FMT_RGBAF32BE] = { 1, 1 }, + [AV_PIX_FMT_RGBAF32LE] = { 1, 1 }, [AV_PIX_FMT_XV30LE] = { 1, 1 }, [AV_PIX_FMT_XV36LE] = { 1, 1 }, }; @@ -1512,7 +1512,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, } } } - if (isPlanarRGB(dstFormat)) { + if (isPlanarRGB(dstFormat) || isFloat(dstFormat)) { if (!(flags & SWS_FULL_CHR_H_INT)) { av_log(c, AV_LOG_DEBUG, "%s output is not supported with half chroma resolution, switching to full\n", @@ -1544,7 +1544,11 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, dstFormat != AV_PIX_FMT_BGR4_BYTE && dstFormat != AV_PIX_FMT_RGB4_BYTE && dstFormat != AV_PIX_FMT_BGR8 && - dstFormat != AV_PIX_FMT_RGB8 + dstFormat != AV_PIX_FMT_RGB8 && + dstFormat != AV_PIX_FMT_RGBF32LE && + dstFormat != AV_PIX_FMT_RGBF32BE && + dstFormat != AV_PIX_FMT_RGBAF32LE && + dstFormat != AV_PIX_FMT_RGBAF32BE ) { av_log(c, AV_LOG_WARNING, "full chroma interpolation for destination format '%s' not yet implemented\n", diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index 9c3f5e23c6..7ad9d2c9dc 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -999,6 +999,8 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], break; case 32: case 64: + case 96: + case 128: base = (c->dstFormat == AV_PIX_FMT_RGB32_1 || c->dstFormat == AV_PIX_FMT_BGR32_1) ? 8 : 0; rbase = base + (isRgb ? 16 : 0); diff --git a/tests/ref/fate/filter-pixdesc-rgbaf32be b/tests/ref/fate/filter-pixdesc-rgbaf32be new file mode 100644 index 0000000000..def2537716 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-rgbaf32be @@ -0,0 +1 @@ +pixdesc-rgbaf32be 8c618ffd38084857013b0f50d2cee0dd diff --git a/tests/ref/fate/filter-pixdesc-rgbaf32le b/tests/ref/fate/filter-pixdesc-rgbaf32le new file mode 100644 index 0000000000..01913ecaa7 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-rgbaf32le @@ -0,0 +1 @@ +pixdesc-rgbaf32le bb5239a00a3ec2b1f1d569733a1e03a2 diff --git a/tests/ref/fate/filter-pixdesc-rgbf32be b/tests/ref/fate/filter-pixdesc-rgbf32be new file mode 100644 index 0000000000..77e40f20b9 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-rgbf32be @@ -0,0 +1 @@ +pixdesc-rgbf32be ca6c4115dc368a192a67d06bd47f369f diff --git a/tests/ref/fate/filter-pixdesc-rgbf32le b/tests/ref/fate/filter-pixdesc-rgbf32le new file mode 100644 index 0000000000..c0cb4d60f0 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-rgbf32le @@ -0,0 +1 @@ +pixdesc-rgbf32le 290153561ddc3266b253fa075e040578 diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index b28a114c7b..9aa653d12d 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -90,6 +90,10 @@ rgb8 7ac6008c84d622c2fc50581706e17576 rgba b6e1b441c365e03b5ffdf9b7b68d9a0c rgba64be ae2ae04b5efedca3505f47c4dd6ea6ea rgba64le b91e1d77f799eb92241a2d2d28437b15 +rgbaf32be abb244bb1af2247bbba7b4eac0357f6b +rgbaf32le 99b2afe809649e58eea0a188fd6ab3f2 +rgbf32be e4a0b47e8ecb2e7e461915227ebd4edd +rgbf32le 2979d6bfe509a55486e55e4de63d67d1 uyvy422 3bcf3c80047592f2211fae3260b1b65d vuya 3d5e934651cae1ce334001cb1829ad22 vuyx 3f68ea6ec492b30d867cb5401562264e diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index bdb2536f7d..9bb54cf9f0 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -88,6 +88,10 @@ rgb8 9b364a8f112ad9459fec47a51cc03b30 rgba 9488ac85abceaf99a9309eac5a87697e rgba64be 89910046972ab3c68e2a348302cc8ca9 rgba64le fea8ebfc869b52adf353778f29eac7a7 +rgbaf32be 48be3ace31f293fa2bf174c583c46b50 +rgbaf32le a2a358ecc5fe53a684d3de994134c4ce +rgbf32be ad982fbaf08c908658e66cb4330257cd +rgbf32le 14b944af62af458fa53da118721a258f vuya 76578a705ff3a37559653c1289bd03dd vuyx 5d2bae51a2f4892bd5f177f190cc323b x2bgr10le 84de725b85662c362862820dc4a309aa diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 4e5a798471..5c8817a5c7 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -90,6 +90,10 @@ rgb8 62c3b9e2a171de3d894a8eeb271c85e8 rgba ee616262ca6d67b7ecfba4b36c602ce3 rgba64be 23c8c0edaabe3eaec89ce69633fb0048 rgba64le dfdba4de4a7cac9abf08852666c341d3 +rgbaf32be f081b6c6df6094d36563b78dccdbc97a +rgbaf32le e461aff4408751a03f8effd0e16be47c +rgbf32be d71855f12b960ab02b787c99bc0e4cf1 +rgbf32le a4251c66110290418f15cb1e334a7f0d uyvy422 1c49e44ab3f060e85fc4a3a9464f045e vuya f72bcf29d75cd143d0c565f7cc49119a vuyx 6257cd1ce11330660e9fa9c675acbdcc diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index bebaf07371..05b288dbe3 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -79,6 +79,10 @@ rgb8 6deae05ccac5c50bd0d9c9fe8e124557 rgba 1fdf872a087a32cd35b80cc7be399578 rgba64be 5598f44514d122b9a57c5c92c20bbc61 rgba64le b34e6e30621ae579519a2d91a96a0acf +rgbaf32be 9a7c2182fd89218172f07e3b37f9728e +rgbaf32le 940e87c0ddb7a86f9df438591b4870e6 +rgbf32be f23c5dd85e312471e3def0204051d264 +rgbf32le fec06f561663e7d01dec08c1c337f068 uyvy422 75de70e31c435dde878002d3f22b238a vuya a3891d4168ff208948fd0b3ba0910495 vuyx d7a900e970c9a69ed41f8b220114b9fa diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index fd5e9723fd..02a734d8af 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -88,6 +88,10 @@ rgb8 68a3a575badadd9e4f90226209f11699 rgba 51961c723ea6707e0a410cd3f21f15d3 rgba64be c910444019f4cfbf4d995227af55da8d rgba64le 0c810d8b3a6bca10321788e1cb145340 +rgbaf32be 6077603ed554db4149f82d891e1d1120 +rgbaf32le 3081376a3a9e90fd2849751dfd69094b +rgbf32be 0e5ffacba8dc768acfa50fc590dddac6 +rgbf32le 542380fd2490e3227b70373eace3bade vuya 7e530261e7ac4eae4fd616fd7572d0b8 vuyx 3ce9890363cad3984521293be1eb679c x2bgr10le 827cc659f29378e00c5a7d2c0ada8f9a diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index ec9d809721..48701fe9a3 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -89,6 +89,10 @@ rgb8 93f9fa5ecf522abe13ed34f21831fdfe rgba 625d8f4bd39c4bdbf61eb5e4713aecc9 rgba64be db70d33aa6c06f3e0a1c77bd11284261 rgba64le a8a2daae04374a27219bc1c890204007 +rgbaf32be e803073624dee4ce4c10d5d22f95b788 +rgbaf32le f87c6898ef385fb7239b16677a450326 +rgbf32be 3696160d95d41564a1a375ddeab82d70 +rgbf32le 71d9d0c83ded4c0866ea0673c1eed8d0 uyvy422 d6ee3ca43356d08c392382b24b22cda5 vuya b9deab5ba249dd608b709c09255a4932 vuyx 49cc92fcc002ec0f312017014dd68c0c diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index b28a114c7b..9aa653d12d 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -90,6 +90,10 @@ rgb8 7ac6008c84d622c2fc50581706e17576 rgba b6e1b441c365e03b5ffdf9b7b68d9a0c rgba64be ae2ae04b5efedca3505f47c4dd6ea6ea rgba64le b91e1d77f799eb92241a2d2d28437b15 +rgbaf32be abb244bb1af2247bbba7b4eac0357f6b +rgbaf32le 99b2afe809649e58eea0a188fd6ab3f2 +rgbf32be e4a0b47e8ecb2e7e461915227ebd4edd +rgbf32le 2979d6bfe509a55486e55e4de63d67d1 uyvy422 3bcf3c80047592f2211fae3260b1b65d vuya 3d5e934651cae1ce334001cb1829ad22 vuyx 3f68ea6ec492b30d867cb5401562264e diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 525306ec12..b22a6d639d 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -90,6 +90,10 @@ rgb8 bcdc033b4ef0979d060dbc8893d4db58 rgba 85bb5d03cea1c6e8002ced3373904336 rgba64be ee73e57923af984b31cc7795d13929da rgba64le 783d2779adfafe3548bdb671ec0de69e +rgbaf32be 0ccc31b373d6465ab72247ae42f395ce +rgbaf32le 3eb06a5ba1c2341f12a30ff2539d5de0 +rgbf32be 11d0d9722abf9ea4fdce370920ff5820 +rgbf32le a9c247ff3d50e07bd7d0f777b9f82b32 uyvy422 aeb4ba4f9f003ae21f6d18089198244f vuya ffa817e283bf6a0b6fba21b07523ccaa vuyx ba182200e20e0c82765eba15217848d3 diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose index 24f4249639..868a784731 100644 --- a/tests/ref/fate/filter-pixfmts-transpose +++ b/tests/ref/fate/filter-pixfmts-transpose @@ -82,6 +82,10 @@ rgb8 c90feb30c3c9391ef5f470209d7b7a15 rgba 4d76a9542143752a4ac30f82f88f68f1 rgba64be a60041217f4c0cd796d19d3940a12a41 rgba64le ad47197774858858ae7b0c177dffa459 +rgbaf32be 83d7d66f59a8b62c40aa59c81188584d +rgbaf32le d9cb46bfebebadaf838bb13d243feabe +rgbf32be b090912ac60da12be5f84672d223300f +rgbf32le 4b4e06621fb626952fc632f5049453ba vuya 9ece18a345beb17cd19e09e443eca4bf vuyx 4c2929cd1c6e5512f62e802f482f0ef2 x2bgr10le 4aa774b6d8f6d446a64f1f288e5c97eb diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index b7b0526588..b999109ff8 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -90,6 +90,10 @@ rgb8 7df049b6094f8a5e084d74462f6d6cde rgba c1a5908572737f2ae1e5d8218af65f4b rgba64be 17e6273323b5779b5f3f775f150c1011 rgba64le 48f45b10503b7dd140329c3dd0d54c98 +rgbaf32be cd7a7ce6f70ef8ca4a05d69458c6c40d +rgbaf32le 4516303140dd7ff5bc02e4ae0c94b46d +rgbf32be f416f773dd17dd15ca0845b47bf5ff44 +rgbf32le 16c50e897557972203c7e637080dc885 uyvy422 3a237e8376264e0cfa78f8a3fdadec8a vuya fb849f76e56181e005c31fce75d7038c vuyx 7a8079a97610e2c1c97aa8832b58a102 diff --git a/tests/ref/fate/sws-floatimg-cmp b/tests/ref/fate/sws-floatimg-cmp index 251042f1c3..d524dd612f 100644 --- a/tests/ref/fate/sws-floatimg-cmp +++ b/tests/ref/fate/sws-floatimg-cmp @@ -118,3 +118,19 @@ gbrpf32le -> gbrap16le -> gbrpf32le avg diff: 0.000249 min diff: 0.000000 max diff: 0.000990 +gbrpf32le -> rgbf32le -> gbrpf32le +avg diff: 0.000249 +min diff: 0.000000 +max diff: 0.000990 +gbrpf32le -> rgbaf32le -> gbrpf32le +avg diff: 0.000249 +min diff: 0.000000 +max diff: 0.000990 +gbrpf32le -> rgbf32be -> gbrpf32le +avg diff: 0.000249 +min diff: 0.000000 +max diff: 0.000990 +gbrpf32le -> rgbaf32be -> gbrpf32le +avg diff: 0.000249 +min diff: 0.000000 +max diff: 0.000990