From patchwork Fri Feb 2 01:10:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Worley X-Patchwork-Id: 45966 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a28:b0:199:de12:6fa6 with SMTP id cj40csp653218pzb; Thu, 1 Feb 2024 17:11:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IHcm5EF9kmkl6Lm5ijzpz52ktsCp+lQZz/zgTDV1qMrk67o4JAkFYCB8utQlmRsgCqrpe01 X-Received: by 2002:a17:906:1119:b0:a35:7fd7:71e7 with SMTP id h25-20020a170906111900b00a357fd771e7mr383118eja.58.1706836268080; Thu, 01 Feb 2024 17:11:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706836268; cv=none; d=google.com; s=arc-20160816; b=NRD4zKCF+r2As+9Ix8HIO8VRaduFtc2CmBmZvzvATxxwUg27RYozC9Pd1oR7QSo1ij XnTD1G6UcX+zqHisApMf+EMWUrbk3/HhuYMKT9MQMoX59epfr72crdobtOVWOi9Eq/DO xTnAPlcvpKIBiT3ThAGg1vw9zGy9gHoVXLv8Q5x9r5Eb1xb/Rz/3kUSAoy/SfzxhL5NY EsRXutWFpgpH4NI8hWDdhQgpaYbTa+MP66yjGDG/cDbR9kMYMtGDqJX70AHk+Cbx6BWI xaluDB4w1MwjBgOuczIUxUNuPfNzC/q1O2+rnwMqWgAcSWG6o7X/B3Dt1mcegBlby1KU 3eUg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=jcheZ72RW7Mu1BzgmmmAcr2hmXZ0TB9+vGfIToxFRoY=; fh=OFjsc/7JYrqicAgr7aUpD1kf3EOX0HctstwVRxtzoL8=; b=vzhvqXsMFO0Mk1iOVml8vq5YpY9jc7N+76IZ1w5ylbqmk9rtvpGYdCEkv4s8wQVTlf JMyT69OPHn+zOfKNyUz10axpgVTO6y9a+kVC3PrdosE+S0opLa0zHNC2eFqnFNhcly5b J1pIICij8Gn+XLb991ONRd6ywG9FItNLaAfixgbY1M/Ec6PMbs29VE9FDq3vrxN0SAgR HyyAbal3Xxk5yjmyhOXMcyN8UJ8YgVQJ9KPWxyYfHOoElzsptpXtRzmUAN1womjsTnpr jB6/f5rqPE8D6RDfM1wVB92jZsg1nSxh5Wk6XZnc+V3+Z1cDxOxX7y0b3DyAbkCNlTCI 16dQ==; 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="hAJSV/KC"; 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 X-Forwarded-Encrypted: i=0; AJvYcCWAfxJhvFp5sz9osani34bH2Ilynf/rHQKD4NFJvYYJ4rsJLBIIhSggn4NcVy0CwefcZhoiBqT4bl/RWvadJcYPDoLQ22c/0JCRq+ginUGKEwvuYFHXYGgBIbT13hqSnWgIyqwPM7X99z7yMuhttw5ZSB0N56I98e7oTXE/PJy+md7QXffYznHNABrofYGpwGPw47PFnC4x3VWK6nN0vMuRSIxNE50bf1WftYGLliXZhHCVYjdWyFnLNMHWuv8eJvw9j5gf18x+7Mi9PYvvWzKZikbCDdTmFONS8+VKoN83/mtkBwypPxCWgy2XOEaMqtIBtRoEwrIzDnP8N1IztTS+PrMWzAfBhasrfsDYfj32OAhZjNiLm17oRViMM7iZF8gpjQqYrFpxTeq69m9OUbHH0bKEUiKIuoH1TXJeNh8BtYuiTwH7E3rZvOGGjVdlXNiUBgkvckoA54YEGnJ6cjaBQtlpGLB8+EWEsntNSsJiDgQymDpex1oqPnQFwngimDIkbfWM+L0mL/GqsGZrHBHaOHoddvEkUVUkIXhgxgz+vQUcF13SfOUWpCneTbsdsrzDFV/j8ol+hw8ynXUHWHhfOfnwdwFIKyh5vwjt2EHg1/ZVj9eQTlSV/ue+II3UZBc8BCnSZAT2jhfqCJWT1Ks6w1DpyeEBQJpPDWT/I3UWBhoNgdSZPTnA7y7mEMI0gi/lkNpunsbV+BCV5lZ3duT+MuaWGomvD+FsaCXau3/KJHZ4iBea4SUUlSl+sv6IVRfRY8FwJYRY/0YkjdPeQBsIqlkm3dNEcyRrQEvYaiHL911GwgmO31rV/fOJi7l7pQU4UEAdrmF7kxK7nGYGd8OXMVbM4TnqjIcJACGypKb5TlL20B2I14dTif5112FB8KE70jbx3x88fRL8Bluc9qac5NoGIlVqeiXDlJ5rIlkAGKR957x/+YDp6yjKGv9oJVcGtn nEQ0X/gZt7kPibrnynAJT4pnCdSOu3P22mkBHuQVK3t1I+jw9VfsjwZJXfi4wjYi4TsfQd4mfiwyGkeO2jUWPUYeEQRRRX/+25IRzG4t9FrtGRqvzusVS0Mcjo9wewRswqIva1TV5OWluowgT0xGa8YaCfa14oyJeJzGeHw6Ec6Z4nR+Vue0B32qp6MjMeY64GouNKGpUUQeV+C4yyF4s0FwEYSj60on4472BZ3+q4P1jU54bSz8ptI4+qugM4vZ6l5z6YrjXCnu9ZbSwg3ui+TeOXfFEcyUOLcQDhC6oiK63+GNlxW90SsikFmtIRywhuBE6f4pSe9pkA+NyPIovyPMql7tg15yoDUCQb/1P5WuEO7oS8OAfsMU8cjuFHadYXzFGaiLZCvny/RdxtLKNnrD3XVHR1sBBDDwZbEFuZgjvbeVHDpTkkdg/aP5UXYWBZAOa/P9g0rsbsQElb+uY05qv67uvmov6owM870QFlf/GtP0B2w+bbczl8+SF1FnUiahLW3c8c/TEQpFFph36pxKdedAScESykFYUexghRFny0weocVjJKCI4ESDCsHQ6g5bnoazvmU+BCZW8SoTndQSmIgCkH1a99alFoiiHo0HFXAFR6gLhbJqc3Ydk9Qn16zcXCRuFtys1idzndAg== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kj19-20020a170907765300b00a35990c2b5csi303938ejc.407.2024.02.01.17.11.07; Thu, 01 Feb 2024 17:11:08 -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=20230601 header.b="hAJSV/KC"; 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 7E96168D09E; Fri, 2 Feb 2024 03:11:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2AB068CBD3 for ; Fri, 2 Feb 2024 03:10:57 +0200 (EET) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1d91397bd22so13092485ad.0 for ; Thu, 01 Feb 2024 17:10:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706836255; x=1707441055; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zHxe/mBEImWJqri+p9jKcsQv/sTpihCwgd2vLPldlfM=; b=hAJSV/KCVyU55e4MdPGwBx0WOe+JwxhJtqNO6GzRPJyN6Ex4m5qfPA+elj4Ni01197 nkT/d81nXOWOxzjhunhQXH6Om8+R+WnKueSPC2Htkd4hTLoDQjPmbNBkAtv3b24CrTxh gb4gtu6YIMxkPNDZEpdkLJIe8KUDvgrszHv6stRoInjqTVnMLufRi4fImnlJZnOcBXM+ hnDO0AD5D6+AL6q9YtHaeCZ+RNlOk68JZgR0ZCFR4naJRElkUetadJpXLWgVcSvLxD+A wVGZ28t5e+B6YFe1IJ/jx628LHv5zWRYBrCysgTISWp3LbMIsiU3CMnr7Q+K/KKeMHWb jtsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706836255; x=1707441055; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zHxe/mBEImWJqri+p9jKcsQv/sTpihCwgd2vLPldlfM=; b=RlbCPrFAKYmImHHdonVViri72r95CpbJnEbxG+qh2oRNNkWY8eQLQQl9NyOG0PwAns 5Q0YisxlNyjRJxlQ9ENkrKcSGwDDX3MoY3wAx1e0Y2Y8WxMIkEexWzHDlUyYPNQTx/Kr fd/1LjRZq26LONBw4RQxK4TlGttTXHoS9nqrzsqAaBTC9zWPFYFJr4G4k6/nW4ptGCY6 kPz4f5ZVf1cAUn848rITMqXsBg9PEljD8Vt6+nGHDEdJ6pBkTkVVSwMcYrZyGVbdhHJE 06jDnCMeIfYfUdcDgMKO5VcVkA6haZQ/M77snJroxlSmsoXv68VTlwg7EOGE1UnP5v6Z QRsA== X-Gm-Message-State: AOJu0YyMl0aHu4feujqHxFzRBQLitBC8KS7UdIL64PThpHwHd2TmBby7 eAGgtxPEZww1FXDwVUblyjPgZoJcL+wjqLoIiCIDlU5zSMKOHLoD+QgSt24r X-Received: by 2002:a17:902:ebc5:b0:1d8:e372:4306 with SMTP id p5-20020a170902ebc500b001d8e3724306mr8540338plg.50.1706836255510; Thu, 01 Feb 2024 17:10:55 -0800 (PST) Received: from localhost ([2607:fb10:7301::3]) by smtp.gmail.com with UTF8SMTPSA id w18-20020a170902d11200b001d6f091ca04sm451706plw.13.2024.02.01.17.10.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 01 Feb 2024 17:10:55 -0800 (PST) From: Connor Worley To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Feb 2024 17:10:50 -0800 Message-Id: <20240202011051.46786-1-connorbworley@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] lavc/texturedsp: fix premult2straight inversion 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: Connor Worley Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JVRw5JSJ2yYB This function should convert premultiplied alpha to straight, but does the opposite. Signed-off-by: Connor Worley --- libavcodec/texturedsp.c | 9 ++++++--- tests/ref/fate/dds-dxt2 | 2 +- tests/ref/fate/dds-dxt4 | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libavcodec/texturedsp.c b/libavcodec/texturedsp.c index 5fb79937da..721bfc17f5 100644 --- a/libavcodec/texturedsp.c +++ b/libavcodec/texturedsp.c @@ -175,9 +175,12 @@ static av_always_inline void premult2straight(uint8_t *src) int b = src[2]; int a = src[3]; /* unchanged */ - src[0] = (uint8_t) r * a / 255; - src[1] = (uint8_t) g * a / 255; - src[2] = (uint8_t) b * a / 255; + if (a == 0) + return; + + src[0] = (uint8_t) FFMIN(r * 255 / a, 255); + src[1] = (uint8_t) FFMIN(g * 255 / a, 255); + src[2] = (uint8_t) FFMIN(b * 255 / a, 255); } /** diff --git a/tests/ref/fate/dds-dxt2 b/tests/ref/fate/dds-dxt2 index b5bdfbadc3..1744ef41f6 100644 --- a/tests/ref/fate/dds-dxt2 +++ b/tests/ref/fate/dds-dxt2 @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 64x64 #sar 0: 0/1 -0, 0, 0, 1, 16384, 0x11cebeb0 +0, 0, 0, 1, 16384, 0xd7f7241b diff --git a/tests/ref/fate/dds-dxt4 b/tests/ref/fate/dds-dxt4 index 136dfd8006..f22878da56 100644 --- a/tests/ref/fate/dds-dxt4 +++ b/tests/ref/fate/dds-dxt4 @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 64x64 #sar 0: 0/1 -0, 0, 0, 1, 16384, 0x31aaacd6 +0, 0, 0, 1, 16384, 0xf18d4216