From patchwork Mon Oct 7 12:29:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52137 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc50:0:b0:48e:c0f8:d0de with SMTP id m16csp123191vqy; Mon, 7 Oct 2024 20:16:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXcHAvKOM04DUu1RrlbrLzSgyETjn61iL01TaYRORnnveDXtsjzjDLa9cNfowBriebegEkea8PEhFOLgW6dhugz@gmail.com X-Google-Smtp-Source: AGHT+IFmnxUW6cKIWI0oJmpnhoqQjUiVchWOmt+P3FYqdxaF6eB29d5e0siUdxgMgmvEUiRyIKUD X-Received: by 2002:a05:651c:990:b0:2f9:e1ce:1276 with SMTP id 38308e7fff4ca-2fb0de9572dmr4928361fa.11.1728357367109; Mon, 07 Oct 2024 20:16:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728357367; cv=none; d=google.com; s=arc-20240605; b=LIDUM8W41K5u87CY8WnstuPI7/wXGD2X0vFq+3h8/Q+/N0yYJgX0kjJssS9nOzZemy qjdnNKwzhvjKvUQ/qEi4KzeGNvBBIQySl5QHlXZHFnCNGxZ/3gkd1WBkFOHoajo+Dc5h 989Ozl00BGZcuxfDLibDO8/kgKnRwt3v3eUAS+O8xdHgA+lrksQotZw24+b1Dr534gVw +LxXNLBzRfslmeSd9Cn4InKsD2l4oyX/PIdCNTTzi8PuIdWv3VcKJdoAb4hAZrVJHwpw LI/uQWo+np5ZJDUogRNtOhWKj2FlcY3O+ZBrbq6Ukeb/zGR1ZQ6aedidhP4oiXDmunX1 r88A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding: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=HGfL6copnFDkKxoccJ78DLjmqTFOHmE2t7JNpOLrnBw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=AmmWo78L2KvFY3KOGnxUahr169waFQvamXnx5eKS7b1lC7YT5xidNeO3j6XtOBxT/K ry7fT6EkRVoHUbXpCm//XDaICddAr434tTwXfhC+M6sGhjkpyda/m074SD6ijAp0CH0G ntXmMwjIBd33HPmzZStBiZuwNxFVpxc+qsJxTEnTdtd8GV4iVqrETmz0f00G5Z45TMjR Aip97uIDw+UB8eMZlb3f2taRLBzoaTAPlrx8Z6BVo2qodHIaoB/mWA4SwRprevlYu8k7 JsHEVQ/6/sdn5Gt5Otaoatl0lTRgbHag33wNUV+EhO+hwmbBo/3BwEU21DoD27xRF2aX 6wjA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=TcSksvoz; 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; dara=fail header.i=@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 38308e7fff4ca-2faf9b5edfbsi18715021fa.652.2024.10.07.20.16.06; Mon, 07 Oct 2024 20:16:07 -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=20230601 header.b=TcSksvoz; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A9C5268DC09; Mon, 7 Oct 2024 15:30:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E30968DBAB for ; Mon, 7 Oct 2024 15:30:27 +0300 (EEST) Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3e0402a98caso2291752b6e.3 for ; Mon, 07 Oct 2024 05:30:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304225; x=1728909025; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=mKC+Fo7MQGZXZ9hrGjUbxhCbcbWdoz7E6lejJJ+CefA=; b=TcSksvozMzOrK8uGCqR2qJf7xn/5rSxNU8n4NONca+M+7Ho8qEaRnM7lf757617qjz LP3xoxEtAVXANSUGY+7JpRURgy7Acsxz8wX5WNyi41WHIzOJAU+Jz9eLjHym4C9O+n/2 xq+yj1I+//1/8KoKHCQT8cRzyM2FPJxISHmnPg0SdGtP2NG2y/fPUUIbTyajJOfepGGr 8W8dpxBIIi/Kz6EOy64okp4c1sbUEi9LN/K7JQqKhcWLK62DXOeylLETed59uLCVjStX Z58WZlmtUAff4mfMiQy58o+YRPOsMISRzeEioVhoWwJAT/fx/NOF8S0ANF6O11ybEHlH DOfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304225; x=1728909025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mKC+Fo7MQGZXZ9hrGjUbxhCbcbWdoz7E6lejJJ+CefA=; b=Bt9PMy3EZXimS7t+936By3XLdK86ope0iKaAtPLnLZ4a0iiiu5JRDnkMJeOX0HPMvj rIt92ZBGSeqqM4CIm6xkJfG//Ji0ZEna7xsATI8kN8XrL8jKGq0HYOMBh8hRa5SQAbct LzMt1vqS4mEhVW2SN0nZ0Z5j3b+W4R3rgVvePU5uiMMwSLBqxJ6gtbDzZ8wLpBcf1CHA +OvNlocxgTJmCen5A30dR0/HEkSiEJhps1vlavLbk/3dpPebaPs9rOPmkMwLyzwjwA1B 5aZFCIpuCHXJ2cBqjcZORtTA/+Jv0XvVWQV53QIKHd1M96+CqgGf6T9LRjeppNpHAHub vzNg== X-Gm-Message-State: AOJu0YxONbXa6NIGhMdEzkOh3hMqMwT9lOE3wgAz+uzJDLetewNProeq YEsx9wcAIv2vePQuzo11mXOPYotk9hgLE9oSeZdR7/+Lydrq46gYO7lYRw== X-Received: by 2002:a05:6808:19a2:b0:3e3:a472:ff1f with SMTP id 5614622812f47-3e3c131df50mr8958650b6e.3.1728304224879; Mon, 07 Oct 2024 05:30:24 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:24 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:43 -0300 Message-ID: <20241007122955.309-8-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/20] swscale/output: add AYUV 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Ig30LytDRASr Signed-off-by: James Almer --- libswscale/output.c | 56 ++++++++++++++++++++++++ libswscale/utils.c | 2 +- tests/ref/fate/filter-pixdesc-ayuv | 1 + tests/ref/fate/filter-pixfmts-copy | 1 + tests/ref/fate/filter-pixfmts-crop | 1 + tests/ref/fate/filter-pixfmts-field | 1 + tests/ref/fate/filter-pixfmts-fieldorder | 1 + tests/ref/fate/filter-pixfmts-hflip | 1 + tests/ref/fate/filter-pixfmts-il | 1 + tests/ref/fate/filter-pixfmts-null | 1 + tests/ref/fate/filter-pixfmts-pad | 1 + tests/ref/fate/filter-pixfmts-scale | 1 + tests/ref/fate/filter-pixfmts-transpose | 1 + tests/ref/fate/filter-pixfmts-vflip | 1 + 14 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 tests/ref/fate/filter-pixdesc-ayuv diff --git a/libswscale/output.c b/libswscale/output.c index e5d555f76f..4d6b9d553b 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -2825,6 +2825,59 @@ yuv2vuyX_X_c(SwsContext *c, const int16_t *lumFilter, } } +static void +yuv2ayuv_X_c(SwsContext *c, const int16_t *lumFilter, + const int16_t **lumSrc, int lumFilterSize, + const int16_t *chrFilter, const int16_t **chrUSrc, + const int16_t **chrVSrc, int chrFilterSize, + const int16_t **alpSrc, uint8_t *dest, int dstW, int y) +{ + int i; + + for (i = 0; i < dstW; i++) { + int j; + int Y = 1 << 18, U = 1 << 18; + int V = 1 << 18, A = 255; + + for (j = 0; j < lumFilterSize; j++) + Y += lumSrc[j][i] * lumFilter[j]; + + for (j = 0; j < chrFilterSize; j++) + U += chrUSrc[j][i] * chrFilter[j]; + + for (j = 0; j < chrFilterSize; j++) + V += chrVSrc[j][i] * chrFilter[j]; + + Y >>= 19; + U >>= 19; + V >>= 19; + + if (Y & 0x100) + Y = av_clip_uint8(Y); + if (U & 0x100) + U = av_clip_uint8(U); + if (V & 0x100) + V = av_clip_uint8(V); + + if (alpSrc) { + A = 1 << 18; + + for (j = 0; j < lumFilterSize; j++) + A += alpSrc[j][i] * lumFilter[j]; + + A >>= 19; + + if (A & 0x100) + A = av_clip_uint8(A); + } + + dest[4 * i ] = A; + dest[4 * i + 1] = Y; + dest[4 * i + 2] = U; + dest[4 * i + 3] = V; + } +} + #define output_pixel(pos, val, bits) \ AV_WL16(pos, av_clip_uintp2(val >> shift, bits) << output_shift); @@ -3377,6 +3430,9 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, case AV_PIX_FMT_AYUV64LE: *yuv2packedX = yuv2ayuv64le_X_c; break; + case AV_PIX_FMT_AYUV: + *yuv2packedX = yuv2ayuv_X_c; + break; case AV_PIX_FMT_VUYA: case AV_PIX_FMT_VUYX: *yuv2packed1 = yuv2vuyX_1_c; diff --git a/libswscale/utils.c b/libswscale/utils.c index 28861bde97..a5be311393 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -268,7 +268,7 @@ static const FormatEntry format_entries[] = { [AV_PIX_FMT_RGBAF16LE] = { 1, 0 }, [AV_PIX_FMT_XV30LE] = { 1, 1 }, [AV_PIX_FMT_XV36LE] = { 1, 1 }, - [AV_PIX_FMT_AYUV] = { 1, 0 }, + [AV_PIX_FMT_AYUV] = { 1, 1 }, [AV_PIX_FMT_UYVA] = { 1, 0 }, [AV_PIX_FMT_VYU444] = { 1, 0 }, }; diff --git a/tests/ref/fate/filter-pixdesc-ayuv b/tests/ref/fate/filter-pixdesc-ayuv new file mode 100644 index 0000000000..178e847222 --- /dev/null +++ b/tests/ref/fate/filter-pixdesc-ayuv @@ -0,0 +1 @@ +pixdesc-ayuv a21ac760efdec0065bcf605f4ed75f7f diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 120129dc1e..dc165b5ec5 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -2,6 +2,7 @@ 0rgb 527ef3d164c8fd0700493733959689c2 abgr 023ecf6396d324edb113e4a483b79ba2 argb f003b555ef429222005d33844cca9325 +ayuv eb7e43cfbb961d1e369311d0f58b9f52 ayuv64le 07b9c969dfbe4add4c0626773b151d4f bgr0 6fcd67c8e6cec723dab21c70cf53dc16 bgr24 4cff3814819f02ecf5824edfd768d2b1 diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop index 4731e96fc0..07ded708bc 100644 --- a/tests/ref/fate/filter-pixfmts-crop +++ b/tests/ref/fate/filter-pixfmts-crop @@ -2,6 +2,7 @@ 0rgb 974833c777e6abe6d84dc59af2ca5625 abgr 1d21f5b8a20186ac9dd54459c986a2a7 argb 8b822972049a1e207000763f2564d6e0 +ayuv f2846cdd8fc01820e561fe4d3855938c ayuv64le ab2f7bc8f150af47c42c778e3ea28bce bgr0 38a84849a9198667c348c686802e3b52 bgr24 1dacd8e04bf0eff163e82250d01a9cc7 diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 0727d733f2..9e1e06bd80 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -2,6 +2,7 @@ 0rgb e2c35753a2271d1f9455b1809bc0e907 abgr c0eb95959edf5d40ff8af315e62d0f8a argb 6dca4f2987b49b7d63f702d17bace630 +ayuv 6aeadbc3ec2a6ff2bfab9495e7285fed ayuv64le d9836decca6323ba88b3b3d02257c0b6 bgr0 1da3fdbac616b3b410d081e39ed7a1f6 bgr24 573c76d77b1cbe6534ea7c0267dc1b13 diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder index 1d7a98ce11..8f1febf4ad 100644 --- a/tests/ref/fate/filter-pixfmts-fieldorder +++ b/tests/ref/fate/filter-pixfmts-fieldorder @@ -2,6 +2,7 @@ 0rgb 2b0f066cfa0bef378a492875d541de8f abgr 832924b5351361db68dbdbb96c60ae55 argb 80d08e68cb91bc8f2f817516e65f0bd0 +ayuv 61b23fc754d8ca0d6740fa08a0a6ebf2 ayuv64le 84ef6260fe02427da946d4a2207fb54c bgr0 d2c676224ea80ac3ce01afde325ea1a0 bgr24 b7fdbcd10f20e6ea2d40aae0f329f80d diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index 43404db154..a49abba15b 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -2,6 +2,7 @@ 0rgb ada57572ee2b35f86edac9b911ce8523 abgr d2da6c3ee72e4a89a7cd011dd08566b2 argb 36cf791c52c5463bfc52a070de54337e +ayuv 122f591eac5669b658c22b09355e4263 ayuv64le 4cedbc38b3d4dcb26cdab170ce6d667b bgr0 66e9fda4e658d73bfe4fc9d792542271 bgr24 db074979bd684ca4547e28681ad3f6ab diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index 4a6f15f074..1ac9cf3bd2 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -2,6 +2,7 @@ 0rgb 53efe0182723cd1dedfdbf56357c76f5 abgr 97603869e6248a8e5d8501563a11b114 argb 9e50e6ef02c83f28e97865a1f46ddfcd +ayuv 3dfdbbbf605d83629f3ef4c96210b074 ayuv64le 6f45f683e99ddf4180c7c7f47719efcc bgr0 590dcd1297d1dd4541eea217381db604 bgr24 73afe7b447b083a7c2d682abe8dd451a diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 120129dc1e..dc165b5ec5 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -2,6 +2,7 @@ 0rgb 527ef3d164c8fd0700493733959689c2 abgr 023ecf6396d324edb113e4a483b79ba2 argb f003b555ef429222005d33844cca9325 +ayuv eb7e43cfbb961d1e369311d0f58b9f52 ayuv64le 07b9c969dfbe4add4c0626773b151d4f bgr0 6fcd67c8e6cec723dab21c70cf53dc16 bgr24 4cff3814819f02ecf5824edfd768d2b1 diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad index abf4fceb46..5d8111b623 100644 --- a/tests/ref/fate/filter-pixfmts-pad +++ b/tests/ref/fate/filter-pixfmts-pad @@ -2,6 +2,7 @@ 0rgb 8e076dd0f8a9f4652595dffe3544f0f0 abgr 52738042432893de555e6a3833172806 argb 2a10108ac524b422b8a2393c064b3eab +ayuv ddb44f03af05b0cb01dced60641a4160 bgr0 025d4d5e5691801ba39bc9de70e39df0 bgr24 f8b65ad845905c7d0c93ca28dfbb826f bgr48le 4564b56dd1f2a9761b8a7a5244ac4c49 diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 2052d3f2f0..41a6fe76e7 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -2,6 +2,7 @@ 0rgb 80a58af8c639743307207ab4b69ca863 abgr 63f2eaa8712ea6108985f4a0b83587c9 argb f0e17c71a40643c33a5bcfb481f6d8f8 +ayuv 9992b829065e2ea4a44de3a25766ca9b ayuv64le 59fb016f9874062d0be77cb3920ffed2 bgr0 243d58ca64f97b2f415b4c63cb79f0e1 bgr24 18744aaab4b8bce065a7144dc0ccf921 diff --git a/tests/ref/fate/filter-pixfmts-transpose b/tests/ref/fate/filter-pixfmts-transpose index 0a395f7e71..bcda0e6460 100644 --- a/tests/ref/fate/filter-pixfmts-transpose +++ b/tests/ref/fate/filter-pixfmts-transpose @@ -2,6 +2,7 @@ 0rgb cf1bedd0784a3efd3ab00c4e44005c37 abgr 6d6f896f853a6c6f93ee70dba9af3d17 argb 87bbd23debb94d486ac3a6b6c0b005f9 +ayuv fe3d4a2d4d37deb94e6f447edc77f199 ayuv64le e4c07e0d5b333b3bc9eb4f3ce6af3a2c bgr0 df3a6eedd4939ce09a357b655ac2962a bgr24 f9a08135e5d58c0b2a5509c369a88414 diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 5ba28917a7..bb8ad46704 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -2,6 +2,7 @@ 0rgb 76b792f8ce8a72925e04294dc2f25b36 abgr 8b94f489e68802d76f1e2844688a4911 argb 3fd6af7ef2364d8aa845d45db289a04a +ayuv 928ac9b09b90dec1d8bc3ecd13b75a60 ayuv64le 558671dd31d0754cfa6344eaf441df78 bgr0 7117438cf000254610f23625265769b5 bgr24 52b2c21cbc166978a38a646c354b6858