From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 14C604014F for ; Mon, 5 Dec 2022 00:05:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 66AAB68BBA3; Mon, 5 Dec 2022 02:05:32 +0200 (EET) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4D5A68A345 for ; Mon, 5 Dec 2022 02:05:25 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id A663FC0007 for ; Mon, 5 Dec 2022 00:05:24 +0000 (UTC) Date: Mon, 5 Dec 2022 01:05:23 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20221205000523.GX3806951@pb2> References: <20221123193540.741-1-mindmark@gmail.com> <20221123193540.741-5-mindmark@gmail.com> MIME-Version: 1.0 In-Reply-To: <20221123193540.741-5-mindmark@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH v5 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 Content-Type: multipart/mixed; boundary="===============7947435006166737437==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============7947435006166737437== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="HJ7DkX9BXQhna2ov" Content-Disposition: inline --HJ7DkX9BXQhna2ov Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Nov 23, 2022 at 11:35:40AM -0800, mindmark@gmail.com wrote: > From: Mark Reid >=20 > --- > 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 >=20 > diff --git a/libswscale/output.c b/libswscale/output.c > index 5c85bff971..1d86a244f9 100644 > --- a/libswscale/output.c > +++ b/libswscale/output.c > @@ -2471,6 +2471,92 @@ yuv2gbrpf32_full_X_c(SwsContext *c, const int16_t = *lumFilter, > } > } > =20 > +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 =3D av_pix_fmt_desc_get(c->dstFormat); > + int i; > + int alpha =3D desc->flags & AV_PIX_FMT_FLAG_ALPHA; > + int hasAlpha =3D alpha && alpSrcx; > + int pixelStep =3D alpha ? 4 : 3; > + uint32_t *dest32 =3D (uint32_t*)dest; > + const int32_t **lumSrc =3D (const int32_t**)lumSrcx; > + const int32_t **chrUSrc =3D (const int32_t**)chrUSrcx; > + const int32_t **chrVSrc =3D (const int32_t**)chrVSrcx; > + const int32_t **alpSrc =3D (const int32_t**)alpSrcx; > + static const float float_mult =3D 1.0f / 65535.0f; > + uint32_t a =3D av_float2int(1.0f); > + > + for (i =3D 0; i < dstW; i++) { > + int j; > + int Y =3D -0x40000000; > + int U =3D -(128 << 23); > + int V =3D -(128 << 23); > + int R, G, B, A; > + > + for (j =3D 0; j < lumFilterSize; j++) > + Y +=3D lumSrc[j][i] * (unsigned)lumFilter[j]; > + > + for (j =3D 0; j < chrFilterSize; j++) { > + U +=3D chrUSrc[j][i] * (unsigned)chrFilter[j]; > + V +=3D chrVSrc[j][i] * (unsigned)chrFilter[j]; > + } > + > + Y >>=3D 14; > + Y +=3D 0x10000; > + U >>=3D 14; > + V >>=3D 14; > + > + if (hasAlpha) { > + A =3D -0x40000000; > + > + for (j =3D 0; j < lumFilterSize; j++) > + A +=3D alpSrc[j][i] * (unsigned)lumFilter[j]; > + > + A >>=3D 1; > + A +=3D 0x20002000; > + a =3D av_float2int(float_mult * (float)(av_clip_uintp2(A, 30= ) >> 14)); > + } > + > + Y -=3D c->yuv2rgb_y_offset; > + Y *=3D c->yuv2rgb_y_coeff; > + Y +=3D (1 << 13) - (1 << 29); > + R =3D V * c->yuv2rgb_v2r_coeff; > + G =3D V * c->yuv2rgb_v2g_coeff + U * c->yuv2rgb_u2g_coeff; > + B =3D U * c->yuv2rgb_u2b_coeff; > + > + R =3D av_clip_uintp2(((Y + R) >> 14) + (1<<15), 16); > + G =3D av_clip_uintp2(((Y + G) >> 14) + (1<<15), 16); > + B =3D av_clip_uintp2(((Y + B) >> 14) + (1<<15), 16); > + > + dest32[0] =3D av_float2int(float_mult * (float)R); > + dest32[1] =3D av_float2int(float_mult * (float)G); > + dest32[2] =3D av_float2int(float_mult * (float)B); > + if (alpha) > + dest32[3] =3D a; why is this using uint32_t with av_float2int() and not floats straight ? > + > + dest32 +=3D pixelStep; > + } > + if ((!isBE(c->dstFormat)) !=3D (!HAVE_BIGENDIAN)) { > + dest32 =3D (uint32_t*)dest; > + for (i =3D 0; i < dstW; i++) { > + dest32[0] =3D av_bswap32(dest32[0]); > + dest32[1] =3D av_bswap32(dest32[1]); > + dest32[2] =3D av_bswap32(dest32[2]); > + if (alpha) > + dest32[3] =3D av_bswap32(dest32[3]); > + > + dest32 +=3D pixelStep; > + } > + } teh code in bswapdsp seems more efficient, that should be shared and used ideally thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Frequently ignored answer#1 FFmpeg bugs should be sent to our bugtracker. U= ser questions about the command line tools should be sent to the ffmpeg-user ML. And questions about how to use libav* should be sent to the libav-user ML. --HJ7DkX9BXQhna2ov Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCY401uwAKCRBhHseHBAsP q4lQAJ42+EB8YMsppq8hjKMLsK04D+t3mACeOGxWRn4TLjoI3Vd99qxvJN09CHs= =sjTU -----END PGP SIGNATURE----- --HJ7DkX9BXQhna2ov-- --===============7947435006166737437== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --===============7947435006166737437==--