From patchwork Wed Nov 23 19:35:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 39395 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4022816pzb; Wed, 23 Nov 2022 11:36:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf7RW611tdidiWCjUJ5swufAFowf9kDA2ZTXaYL/OuGq/9OtpeMFgf10bMcfWy9AxN8g2005 X-Received: by 2002:a17:906:4d16:b0:78b:15dc:2355 with SMTP id r22-20020a1709064d1600b0078b15dc2355mr10262497eju.306.1669232180944; Wed, 23 Nov 2022 11:36:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669232180; cv=none; d=google.com; s=arc-20160816; b=t3R3+g5O1LJMzowGdvjgsbhl2vV5Vmc+/1/LNbjYd9PLLms92C2NOlogRtkD1KICIx 8/1TlkbOdAExFaN4v/wAjW5xlZ2m6/2kwAljusSccpHvjfCvEmdwgdJrK2jSDsHChUIE IGt4Ff3KxaeDgYzXBB8FTfNEI+jTCs5VS3Q5+Z2tsu96UEpyxLWXYsR2R6GYitgLQu4T 6Uy49sKwATNGodbmH45WFhmTky1y498nAr2PXZXlMuhBFJvv325Yc4EB+9rARzkQzoqf bvkar8UoM13eEDdV3btGcL6OiGyWDALhCYMo1St7/aRFKi9pC6NlITOZyTFTNq1xXa8R 6Wug== 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=DgMJO5JE62efFHh7lF3PFjVedb0QxYSyvTaQ5ydq5eg=; b=y/HOnIfUWA4MZ8AXyuEUBQnWkb+BRc86HCCI3qDZUcOp8gN9GVZ02slSU/y7k+m2Me LTqlFjo+N3c12JEQ27rqNvYcCZEdNgBUZW26jbjOttROiUKBt3DYF/Q9Q5B80ISI/GeX CPatiJZaN/HUyf14lAIKMvdTUv57s+IyU0Tle8vxK/bhspDD23iUQvKGOkjs5/A5Dbb4 OWnhvxp0NE/5AvH/loxCRWWdzSkla8oexJopDzQuDEt5goj2OOM8W2Lue1L2+zg01BtK HhFJ6IE95Ml8esMngKsWfjkLM1Lq4ha3ar71lYQUKC6B8ZKb9Nbg8bouyDdx55Fwii84 Ejww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=daJT9Rs7; 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 xe14-20020a170907318e00b0079b40c09982si383344ejb.340.2022.11.23.11.36.20; Wed, 23 Nov 2022 11:36:20 -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=daJT9Rs7; 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 18CDA68B5DA; Wed, 23 Nov 2022 21:36:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 087AB68B1A1 for ; Wed, 23 Nov 2022 21:36:03 +0200 (EET) Received: by mail-pj1-f46.google.com with SMTP id a1-20020a17090abe0100b00218a7df7789so3024872pjs.5 for ; Wed, 23 Nov 2022 11:36:02 -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=Zi7F5DwO02fBI7YUPNwWvizURNB9A7nJ7+uq0QZh8x4=; b=daJT9Rs7uvZGyhRGxPYlb7TxbdLkoACvm4/LAaShV/9PdR+OtjSWgsvGzCZV5embQV qBX+IE5j9SaN6NxHbV38bvoxv62VIJvKdyz4FcDPHA1i9PwmAiHjJ+Bic6dQqN+aKwMY ABt4RJVY7rX48H/Xwd64RVy9W3CafkerSR4uBsLGWiTacAPtO70sfnaf7Ox2XNO4OX86 N1fNuLDWxwP9eY2gApk7AgLJ3E8VfrHeloyODTG6IwFc6WiLbEXkejLEoYMJa2uciJmN c4H26pGSrrtoXEJjZibzjegWcf4lDWEYMCzRGn5bFANptb5zf9dcAn6YMAY50gY+cguO ST7A== 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=Zi7F5DwO02fBI7YUPNwWvizURNB9A7nJ7+uq0QZh8x4=; b=bfhRhY9nV3g/knBBKsUr9QpbwKGwzLcG/vncVj8x1DAQ6WVPB9oDlvzf/DsG3sS6v8 boYoM4HSFN4b3JyW9Ux6WmFjZds0vs2M5nYwRDKwirODMyNBKaZBItxYIL4dvhUELc4b XBj5Xp+9to35q2IZ5fYpS420qdYlpXctlmAOJEwwBF/qlkgexAQdA5X3QmaIccJmmX3V QLLVXhQQpHzPYjV7B/OhUa8WAsZTXlV53kICQggX99ILPN6vbvQg2d8bnFJfy9gUB/DS yn/LxRdPsKEAbFu2/ZWW5hFfVChnf4cNDZbBiXn3nMZ/w4DdfXTadMlCG5nT5JFPdPqT cQ+w== X-Gm-Message-State: ANoB5ploRlkHxS9zB4/p8YcOAagoVhp+Rhsz3/briwCQ+yMq+Z5aTYkz ovx2T8QTkKUPmHHxJgDLkObDLLzSK4w= X-Received: by 2002:a17:902:ab5e:b0:189:56ab:ab6c with SMTP id ij30-20020a170902ab5e00b0018956abab6cmr1222782plb.152.1669232161044; Wed, 23 Nov 2022 11:36:01 -0800 (PST) Received: from localhost.localdomain (S0106bc4dfba470f3.vc.shawcable.net. [174.7.244.175]) by smtp.gmail.com with ESMTPSA id a8-20020a63d408000000b00460fbe0d75esm11319276pgh.31.2022.11.23.11.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Nov 2022 11:36:00 -0800 (PST) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Nov 2022 11:35:37 -0800 Message-Id: <20221123193540.741-2-mindmark@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20221123193540.741-1-mindmark@gmail.com> References: <20221123193540.741-1-mindmark@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: v/OwxnJW3y2P From: Mark Reid The input functions are currently matching the planar f32 functions. They can be factorized removing multiple lrintf/av_clipf calls, this will be addressed in a future patch. --- libswscale/input.c | 122 +++++++++++++++++++++++++++++++++++++++++++++ libswscale/utils.c | 6 +++ 2 files changed, 128 insertions(+) diff --git a/libswscale/input.c b/libswscale/input.c index d5676062a2..9c9eb31cde 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -1284,6 +1284,98 @@ 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; + /*TODO: refactor these f32 conversions to only have one lrintf and av_clipf call*/ + 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; + /*TODO: refactor these f32 conversions to only have one lrintf and av_clipf call*/ + 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 +1755,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 +2077,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 +2114,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;