From patchwork Mon Nov 21 22:11:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 39378 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2560387pzb; Mon, 21 Nov 2022 14:12:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf43SnIOsn4ahxqtqXNIrC4QxhpLHDyQcgnw4SZgpPhXKRZSAR5q62hBenA7tneEtmVshZJa X-Received: by 2002:a17:906:1953:b0:7a2:36c7:31eb with SMTP id b19-20020a170906195300b007a236c731ebmr16375683eje.491.1669068765045; Mon, 21 Nov 2022 14:12:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669068765; cv=none; d=google.com; s=arc-20160816; b=xKLvdaMVhl+UCGfEn37wQe++s1YFjfpQhmIkjL298T1luwTYCT8bWusV8GzG8n80W4 o/LD2VoopG4d83gA8L5zfAudlfhWSfj1reokY2/VuVp+XZaspnB4RDPp+kY5pe6ukA+M xwNzbzYOiltkY4p8KuynLwSbngPOor/C6FFNMO9yajFt2Ql5oUscMM87dPe+E/+UaDYl KwfHzT/F4vE1Q3SH+gxn7wUDdNrrTCdrDtTHl7PnppFXlqAR6fXad2yOnVcAL4Cfm4VQ fD8yMkqLA4lmctb4coIuorM0nSfYqfTKTMKbrqmLyfvKKFxdLzZ69IDWBsbREFkMVjem oILw== 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=zzSx/PzQX/99lBUkkLkNTsawqboRNz7PWCax3Aqbol4=; b=F71NA/3ClcA3QPkWU9G8DpcG0mu1KkrM9IYiOxmzVIUtV03YQVrIONKVL0/n38o4fy 1BfzzpLATa6ApU2G8gg92KKDDCqT23DA0Lzh6XuBl0vW18PqjJ1Dz/TRlacYnEaW/I4a sBfRPJvFyLmevVs1WgaAxIILIdlBi3Iah0ct4LHZ4Rymu8rHtn/aUZnBQZ6MB9fvJ8UJ BBwFakL5xO0rBJMeg/XKuaOPVTJ7dR/icAPhu0arZWz75lZPE9sCEnV+41sthi2daOne kJk6yCyIJN39mrTYSE+nemCxg8PG1bS3nOnHo3+pjtkh53898WBv/H7zxToEHayAPyUE BjSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=YdTLBDdT; 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 t5-20020a056402524500b004614db9083csi11518379edd.313.2022.11.21.14.12.35; Mon, 21 Nov 2022 14:12:45 -0800 (PST) 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=YdTLBDdT; 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 5177068BA06; Tue, 22 Nov 2022 00:12:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34AF768B752 for ; Tue, 22 Nov 2022 00:12:20 +0200 (EET) Received: by mail-pf1-f169.google.com with SMTP id v28so12575628pfi.12 for ; Mon, 21 Nov 2022 14:12:20 -0800 (PST) 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=ACrPAbJLLW/JHnoPDEVprafOoDIxvY4DVAC8pUAY/wA=; b=YdTLBDdTryoBs+Tufhc3M229jSXe4P4gS8t9aVm0zupQrDOnr8/0oNUs+FSDgCNL7X TJmOxGWnJTJM2x+UR9yPwMfDh0RZE/jN/6TCn4UGAayfrnCb79rQGU6Aza6yYnvEkwED KTpbfMqW2gjGRJTaUTYsdxwOSS+rJnpmCiTvXvyP3QFRVsGDYRRxrkyh1w5YfRsDm0la VCpnT+baT6B/jwC6Axy8jdzyYkPl4vl1eZIqaVL/mpCiTGb21OSANVqdNr8I9fpQyBpZ 0tDYsGi1x+CX5pLJ/mDwt+5jh6aXZX5yWJUBgCAFcJ3dzRuTtyOP/FU2GalFxjHkKps3 44Hw== 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=ACrPAbJLLW/JHnoPDEVprafOoDIxvY4DVAC8pUAY/wA=; b=Nkl4mbKyaAfh3jl4e4MuRDV6RoxbSDvlBOQhGkFmGP89js6Bv874ngW2Ej5FhqqJbU d+4JYcgR9uOzdsLYSHLG8NWwJdJ19s4hp1oZVGGelZ7c65xK9gWj2nuJRuZ0xTyd+FHN 4qzgy+v4xA390YrKSdkne3qo0caX75gW5eJI47TUMU2uYP0+lwyN+ySJbhHTkUuGV1sj 7l3xGgS0gqLK5RpT+oa0Z8hLWT/KmnWTUmUtEX7+XHEZKz5YtOVhadqRi1w10YGzBTxB cejGzTMl5sc5kn7vusjUeMH/BFu/nDBjqDgJmT3OCxQRAnDSSl1NFQoCDd8arIs8Gf/2 oRBQ== X-Gm-Message-State: ANoB5pndaZM4q41WfcJ1inSigq7JYlSHHhlkMSlU1IlfMupgoFXTAoWR KRZo8UUf+mIxv1sEsNsuOToem8m/T50= X-Received: by 2002:a63:711e:0:b0:477:5654:c37e with SMTP id m30-20020a63711e000000b004775654c37emr9608310pgc.206.1669068737567; Mon, 21 Nov 2022 14:12:17 -0800 (PST) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id b8-20020aa78ec8000000b0056b8b17f914sm9111095pfr.216.2022.11.21.14.12.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Nov 2022 14:12:17 -0800 (PST) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Nov 2022 14:11:43 -0800 Message-Id: <20221121221146.426-2-mindmark@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20221121221146.426-1-mindmark@gmail.com> References: <20221121221146.426-1-mindmark@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: lrh0Tc1J4WPO From: Mark Reid --- libswscale/input.c | 120 +++++++++++++++++++++++++++++++++++++++++++++ libswscale/utils.c | 6 +++ 2 files changed, 126 insertions(+) diff --git a/libswscale/input.c b/libswscale/input.c index d5676062a2..a305be5ac2 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -1284,6 +1284,96 @@ 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_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; @@ -1663,6 +1753,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 +2075,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 +2112,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 85640a143f..2c520f68d1 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 }, }; @@ -1572,6 +1576,8 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, srcFormat != AV_PIX_FMT_GBRAP16BE && srcFormat != AV_PIX_FMT_GBRAP16LE && srcFormat != AV_PIX_FMT_GBRPF32BE && srcFormat != AV_PIX_FMT_GBRPF32LE && srcFormat != AV_PIX_FMT_GBRAPF32BE && srcFormat != AV_PIX_FMT_GBRAPF32LE && + srcFormat != AV_PIX_FMT_RGBF32BE && srcFormat != AV_PIX_FMT_RGBF32LE && + srcFormat != AV_PIX_FMT_RGBAF32BE && srcFormat != AV_PIX_FMT_RGBAF32LE && ((dstW >> c->chrDstHSubSample) <= (srcW >> 1) || (flags & SWS_FAST_BILINEAR))) c->chrSrcHSubSample = 1;