From patchwork Sun Feb 11 11:41:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Worley X-Patchwork-Id: 46178 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp138252pzc; Sun, 11 Feb 2024 03:42:19 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXrwGqxyqcfFsUSX0pNowbFmqSTV2G1vjfTfSYVX9aIp9sm4nvrmTTJl5kOm3o8PsXvollgNRcetcRJSBFZBkN/q1OlXZ+UPDV63g== X-Google-Smtp-Source: AGHT+IGdQrwun5XttJ72eG0J5okJfYXYFyrbcsjjt4J+Zu4dtqpumB0EIpqyrGnSqTZqR6XQf3cG X-Received: by 2002:a50:fa8e:0:b0:561:1b5d:66a6 with SMTP id w14-20020a50fa8e000000b005611b5d66a6mr3943986edr.3.1707651739068; Sun, 11 Feb 2024 03:42:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707651739; cv=none; d=google.com; s=arc-20160816; b=OfzZqvbKxQ0Tf0jxM+080gjaoJL6w1b3EDPDrBbDJsEgcv2oe823K+EvTdtJMJ0Kxo 2SW1HoVIZ/JqCEuDLC4WaqB49mLUVx9M0hgCZ9Z3t1m4jNgOa0Ww2e89bkS3DSOKavYB Uw2bH60MESAk+Ia60rwsfbPwnMu1lxrhCiYRxhrqDCjUtXyayf4auOxOrSMkbHoq8lgH bMtyo/LwnxOhLDVynlRAiQ7mKl+Jon5QhuPGDId4erxp/WZ//uTzRRjHEWLKjnC85k8M 66KyRfzwtrlfy2YxNhGXuCa3FYtN150znmwRZRdoqt80HaFaLh2W6CnifVWbZDHqRmjn 5Ocw== 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=ctZ8tGWHs/2kkPauZBzj4Fs3nrH16H5Kx/nJh7X7wLw=; fh=m5pYWxFR+lfcI6w06KEWR8I5AO32WycMUhVxRkJPMdM=; b=hpyWL3k3vEr/umUkabQXMzOl6cszYO9yKX178stU+qD2XIqCQBtQN3Kfg592bm67ES E/5Q5JS4/9uhg91wwosnzoOTy943yiDeVekRKwxwC3Q/unfwMjGK6nwcW92q5PEcP1eh Fq5XE2g1q/BBpsqloDhi+KT0h6LxXdNmzb04wE/Plq30zvu4Gg/NsqJugN7klbKb/LJk u7ceuaeX+hkSwzuRH0aohJjSWLy8ggVOpopBzlvsx+QcO5GiOEyzcQbab1V+3CH2Wa76 VjHJPLZCGb+CRwhBeUrftY5EY2rNO8SWuuXbUUwxZUJZCy8QyYljfJmr0KzJtUFtzfpt eiaw==; 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="RLP/8xrY"; 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=1; AJvYcCU5iko5+z9Wk+47DDSwjQrNZrbc4C48zTgGtApmGeMY9cfVKGR2rEjFMC9ytlOc5KhsOR0yoevdChzlBlqoJSdLD3ZfzavFm4ix0bhjoOaApdnZYuAlwjeI6eYSsubNgYc0S+hifTgx+V6kFDSv5ifdeQYzn8ae5qAaSfXjD75oyCTTERdSABknTcSP9ZgkXyLu+944tT4/P1e4dx3QPU8vVdt6Ct2ICtIx/gJbRa4jVCnQuj2n5O9JBowLKzjbQEtaNzWlBbTRz05kg8KgOvzX7Fh+AV9f0sZW6ofw/3x3+kTrK3y/Pd4pTDzsSf6SjCQjkDN26cEbLXDcTIzKRFS9J944coOxyuSbNqiouQFGeWPMt4HlfeydsqfCoglqTljEzXm7CUBdGasV3kBRQwB59nz1x22cyPGDq9aoxc5wCFCdEFzSdyRq94sqTXeLYrvYbbTXJ1vUYEO/ZbKBMxS14NTkTtwrrbv3e2a1WYoXFCP1MGBlfh9dXCWMpalPK6IJ/j9gsRXh74JVViCcahuuhm3R83QPO5zpIT0F/hDwSD5L3EAmLYnSvPJ3//OucCUeeL4aPicuSHiwXVKWHVUf9fFRKetguo+vjTrsREoCJxAQWnjExVclDa3PkNfnfSnWXmDSmR1bZjRoRAO/By8lMPO7ZyAGoL5iYQLreBL2dvPaqJK499gSekgB1/fvjykzSzoavW85/v64mSUBq+lxYKZeowl3AkB+2yU3pZt/WVkVK5eNbYYQbMjTsggSpRGszQ5kVTiSHykhMo40k249BajHxki4rQ8hXcjqCPAg/rpnhEaF9n6eKoexLj+b6Zd9YO53HGgyyrskL5Ef7WpZVVtJhZv/3L984L5AyrVfDiBe1jky72t8c4YiV44KOGSQmapc2F5cYdxIGDGrtEPQkFfgOjj9iATb4KXruRbwLMWalEoWoRfybuBlud+BfIPa+x P7qtZheWpFm4Vt1FN5PDS+dAyC8vRSDJ16CwXdUXizGY0gJNhl+ReSRO5d3ca12VS+DGv85CHXaVqq5Goew1FTPL5hr71itR9+KW481p7syODbZrzK2rUGa95vhBWnW6Rv254hg1xD30ZGMkgr2cCZmW6G3MJk5ADdXSQRTmtQ3749vU0zpDBuNIYaB2bJWUFeb05o9gynbFUKhAY5Ag+r0XpWMKwKsXDP97JYl5sboIZ8HkH+kSD/84TMLKkWQkRuNMTamazGQwg59S2t2+2sa2H0FxmEvH/BH0tmdqJ5mdM/71qTba+AyoWxYXn/bdmTxpxVGunvJBqdSlgzWrDuAshdi7/BdZfS+sRsauGhJmQL4gkkBEZFRj1+i/8mTk6t+MiE/Zw5CqNH+PgtQchShuiM0b7/98n0DNac0GTNGjKto01wSpIswPewIzwK3iskPvZELbrITgXQ/K7zj/3P6qZ8UHLLTvNRhqXB2gywvKxGvwPXqdeLik58o6rGheNPuW/mq8wdKNH6DJi8eL1TwpKl6E3xiPqMeNqYGEcXglL380JIEZuS/DyVwwu19sJSo7NCrz8sB9KtR3r9W1qxDEIeaxRmjatyTQ== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p23-20020aa7c897000000b00561495048d4si1728627eds.683.2024.02.11.03.42.18; Sun, 11 Feb 2024 03:42:19 -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="RLP/8xrY"; 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 CBC4268D127; Sun, 11 Feb 2024 13:42:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B7D1688051 for ; Sun, 11 Feb 2024 13:42:08 +0200 (EET) Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-21433afcc53so1443592fac.3 for ; Sun, 11 Feb 2024 03:42:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707651726; x=1708256526; 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=nPLpbqbs1xCJVD8NFUe0ii64gm2s4dLlonvQoqzhQlw=; b=RLP/8xrY3XYz1tZI6JVjZunxh6LdXvon4D46l4ugvf0mNAU6sG7XdYVHZjLOhZ4D3h DXidORMJiwkPIqq6wja2nDRpafTK7cZQqdQbssQHIrsFxK8VHuM+SfY8TUam6rJIP0F3 FvDItH1phXQE7t3GkBEXLRRNmAjz3+Gxj+1wiKUFCCcFdCUF77qNyQ7x7tBHjRbfw1eH 4+PH+4bcqyJ2NNtTHahr6T15Mj63o50ef322s/S3pe57uATCgNQT9Y8SZennXiejtMzM 2PIjcU7tuw5QI9JdO/2Xe6dgBQLbQBbvwYW3+S81UPBcAq4cXJCGlJhR5uWk8kTO9UcG cR4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707651726; x=1708256526; 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=nPLpbqbs1xCJVD8NFUe0ii64gm2s4dLlonvQoqzhQlw=; b=uROj9gfJml3enbZVFx/wtOaaxvSFBkEGTEFOjeX0SYx4o1JnN78Aecj9rnYMZYz9ZG /EeZKVWK7+PZ8ZPqbOjvCzreZmEnPz4YcoHd7u+h44psA5yn6wMs3F6MDUP4bYLP6KZy m4w3/q4o97uUJK7Yrp9gbx2y5/g+Zu6VN/2+NuOikxBuV0gx05mFKaplfpno2t6IgRwh oNtNi+uOapwYvwvy8uC1Nr0eluZEoGaN45A5fqgJQeTNDdn+koF0Da3mbGQ2lusokAii FJDzCLQaazF4scQCtjXR7Nr6imuYS4HzxG/BgbTdxWKkwnqcsZ94j5FN2GD+RULi9TSH qEqA== X-Gm-Message-State: AOJu0Yx08JfxVPw2cjJju/leL1vWSbz1m2r/75qyb4ncHesIrl21vlUY MyNAhNDgkMPR8NAczMlUkabInD/XrnZWcS1L+uw8MSnIrwndcuMzz/Ynm87OzH0= X-Received: by 2002:a05:6358:5292:b0:176:a512:e63e with SMTP id g18-20020a056358529200b00176a512e63emr3920695rwa.29.1707651725751; Sun, 11 Feb 2024 03:42:05 -0800 (PST) Received: from localhost ([2601:647:4600:84e0:8bf:933e:340c:2dec]) by smtp.gmail.com with UTF8SMTPSA id pd18-20020a17090b1dd200b0029020be4298sm5034809pjb.0.2024.02.11.03.42.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 11 Feb 2024 03:42:05 -0800 (PST) From: Connor Worley To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Feb 2024 03:41:57 -0800 Message-ID: <20240211114157.64551-1-connorbworley@gmail.com> X-Mailer: git-send-email 2.43.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/dxv: assume DXV2 files use premultiplied alpha 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: pUFuRqoXC6ir I generated a DXV2 file with an interesting alpha channel using Adobe Media Encoder 2015 and compared decoding it using Resolume Alley and ffmpeg. Similarly to DXV3 files, Alley expects premultiplied alpha and ffmpeg matches its decoding more closely when it does the same. Reference file: https://connorworley.com/dxv2-dxt5.mov Existing FATE tests for DXV2 files do not cover this change. Signed-off-by: Connor Worley --- libavcodec/dxv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index 82c493f1de..2eca14c129 100644 --- a/libavcodec/dxv.c +++ b/libavcodec/dxv.c @@ -923,7 +923,7 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, tag = DXV_FMT_DXT5; msgtext = "DXT5"; - texdsp_ctx.tex_funct = ctx->texdsp.dxt5_block; + texdsp_ctx.tex_funct = ctx->texdsp.dxt4_block; texdsp_ctx.tex_ratio = 16; texdsp_ctx.raw_ratio = 16; } else if (old_type & 0x20 || version_major == 1) {