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 382AB490B5 for ; Fri, 2 Feb 2024 01:11:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 44E8B68D06A; Fri, 2 Feb 2024 03:11:04 +0200 (EET) 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-Google-Smtp-Source: AGHT+IGxK2ZAsSLfEwcZKqHcDW9aV7uYSFj1M2jwJ2dYVDfQON2b4zVdqP+64lcuuX8+EH5JIrcsNQ== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 -- 2.40.1 _______________________________________________ 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".