From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 84A414E06A for ; Sun, 11 Jan 2026 04:01:50 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'0M+2o3pldG9JCxh1KdakOC2OzwGPc+KR2eN3kvKZuLc=', expected b'2kkUE73j2ptbnjEUVg+gUUbeTQe09FKtoIzHzlt951w=')) header.d=emma-gg.20230601.gappssmtp.com header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1768104095; h=to : date : message-id : mime-version : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=/p/ydWCRADvL3k1KEaKOyHsRyOqF24AicHiYQUQZWGA=; b=VIs8y646vcWKkVzOmLLlLusNf8bTWaxA3Du6nKVVbMK/zFjZXxpiCR3VsMjBxEtaDmuDz jrSP/H54WpMtn/IkntI7/qwYg9aO/xYWsP3S2Ppl+Xhe5ow1MziqIYOCGkth6C3PuH0/mtX h0M//eiK4h277PCJikGNilWh5zm5h4AuZVw0xKFVTtax9LOGP1ZJOOZ+GOiTXuesMP4rZRO 9+D2o0NAhrs43RGuDtagMFH+4bX2lx8gt90ecyH5BC19nFw9DPz4ZKqKr17xoFvmRQbuTmL 0F5LYXhNnTBMpWVlpBMopYuiVa0afYdB4VoI8mTFAnYVDEo5gpWK3wdAXQ7w== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 37520690DB0; Sun, 11 Jan 2026 06:01:35 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1768104079; b=tjqwoGv3PfTYseN10eF4eMDagqLZex+uCwP5YDjUmfbZOO8fOPJagAUWcgYS3PUTbdjyz 02DlvJgZt3L9VLraYTq64qoU49BDltqhEJRTirjO75n9VHZLoTbTLVRo5OU/i1p57EOt3F/ 14VmPNcYxmwQ9mcrtObLkhjcwY04XCYRPRfF7xBAkzNTJZDxY8E0HDbMZoTo8rSseaMkinu AREVoNcSiv7xYAR7jfxRuHenWte7RMUsvvI3/J85KzfZfGi4WiElOScs7YaEKXYFdXp8uUV hGfUjjU+zch5mTdVVdCHQ2vfriLmDA4RmaT6q0jE4Bgt3E/D7ZlOIyJ/6VGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1768104079; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=0M+2o3pldG9JCxh1KdakOC2OzwGPc+KR2eN3kvKZuLc=; b=UlVQ18tOfvBJACc+yoYipKRNf928rWJ3SQf8hkgj6w5xMQJmmrDrgYHKmwt+f+xwdTYXx cr17nBd3P+fA/sR6KM4Ef8vZf0WV1L/kb48yl2pHJuQztdCGiyYpcK/HzofV6XzSLH2jODc iCAYvHCRVKYPV3lzmPQZkqUIofC3pcLytrhg+08e4WWtv4lKBgiU2C8OlSKPmh87ArbnehR E+OO8lLZ/TGLVkmsKinpmKTgh4TF2hV1TETaqX5hxfDHLDa4SsfgEGwpE5gF9ucSO25KjBs 33OepKz5ykguyDgz1ETXh9PlU5gGSW89g0GOK5dD4MX4eraZ2nhxIJboda1g== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=emma-gg.20230601.gappssmtp.com; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=emma-gg.20230601.gappssmtp.com; arc=none (Message is not ARC signed); dmarc=none Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id B234E68FE12 for ; Sun, 11 Jan 2026 06:01:05 +0200 (EET) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-c525de78ebaso1408353a12.3 for ; Sat, 10 Jan 2026 20:01:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emma-gg.20230601.gappssmtp.com; s=20230601; t=1768104063; x=1768708863; 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=2kkUE73j2ptbnjEUVg+gUUbeTQe09FKtoIzHzlt951w=; b=P/+RBxj5BzMb7qL2VFboK670h0p7h7LgXSD9Uaw28lNb0SKrgrfC/6WeoUq6a+Cz+e jXKK76EDKKQHt+j2vIOgteRMhB5ErsDvX4T1ONk1U+jmmdnntPzX1XCzqOyNUbo/EEsW Ioli1l9dynG8YoA678dBUqgzC2/0ovJi0QEDaCnkrHxRfyASCRhDT1yPc+zjUEPQO99u ZJf7vM/My0LPecQcbcBMdbCLG16Ca9Tld7gaeG+W0KNimAXsYFUWdiRFGW5bfT2Fb94d bEn82f6zIb+7oaVh7oD44gdrtydotOpCGDsts+MFafa87pufr7MIVRsigs2mo/6Rn8FV alpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768104063; x=1768708863; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2kkUE73j2ptbnjEUVg+gUUbeTQe09FKtoIzHzlt951w=; b=GGC0UPmS9HgKParM9Ibt0lCxbAed5U71j8Y4y7zy8SlO+A9vHHjOKQ/NFbxVI6XYvC 0hPCJwEV08xQHa0Huh+Wlu50MuRigoB2ODVYOXg5fbPQYt8SxwzXDfp2B7VMJpr0NkrL 2xV2/oUo/wZmmHP9TeXCNHFZSZpY6ae7JNXNFUj8HWoLbvabbID2qC/1/46oVoYmTMg0 igHQ3XK4x3KBrJPYFbiU+eF8ZGyUY7T3aQOcoSMIOMajMJhKI/z/UEovihWxFmtgLR/4 1dkLmrjVqdXootIynRDdrGUEGh96wizLUmhLR2FvRpIYiVtFmcnTDis3NN9mTXUAzF83 msfA== X-Gm-Message-State: AOJu0YwQoBykoXy/fpWjZTIgXXy5H1GYJkZVK9KlILMLLZ1I2FTsQmTR ST1XXqRshiI/NZA5HheNh2RRe68NRWTBSIGhlG3beymG8isBa7TaJU2OIj5og6WGk36T2mJNaWY h+0umZeazzQ== X-Gm-Gg: AY/fxX67Od6cM09qIcf0ajqYiY9LH9eQUkidtDyVbZk3YsjMRGAsDUJ28m5hF9mRkJw iYj+dQj8ys0bR3uhJ6MtihhH4XSBI6N2Qfq6AumXvK/iwFAOzeHxn49fzZlwGbpHLU/U4Cz3RlF nUbkUvXfqW7gZf5Sauv3UU9Zn/vsD37V2FxBQTvaMnxT3iMVMPe3XNZ248phS7mpLwvmRm49DoK Cj0VfLgxz8ahX0qwqmxKEYJOEjM7KdbA6EqWnC+C/UPGR1IRsTcpz0S0q5l9l8/L0Ua0qD/5ayn RbUEsfR6x4Cis4G3pMK4iK8ysp/FjlfO6I/eqGIo2oZRC5OMH+g4pVEXJPlf5cupxBw3a/Gm8Jp AxKCrRKFu7szxps7tiHbWQ5Wzwy/9TC+xinM9sD/Lp1vIZb2Tn7O8Uiae0e2QpU0e+fPyeqNJ/+ nGocWgoxyfEjQmferzfLMzAv50dSLyqYXcfd5l+n2B8Q== X-Google-Smtp-Source: AGHT+IG73woVj2rBDVGiuvO07pGBMEdQqNy0jAXjgBsHEZe+nSOYG8e6+SlXj+Gs1cnoNoAo/ToVoA== X-Received: by 2002:a05:6a21:3398:b0:35e:5bcd:8310 with SMTP id adf61e73a8af0-3898f907ce1mr12486475637.32.1768104062574; Sat, 10 Jan 2026 20:01:02 -0800 (PST) Received: from localhost ([217.217.241.191]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-34f5fa7820fsm13982537a91.2.2026.01.10.20.01.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 10 Jan 2026 20:01:02 -0800 (PST) To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Jan 2026 13:00:03 +0900 Message-ID: <20260111040002.94723-2-emma@emma.gg> X-Mailer: git-send-email 2.48.0 MIME-Version: 1.0 Message-ID-Hash: HJKTI7P46KPPY5XKUKFERLL4EPWCA555 X-Message-ID-Hash: HJKTI7P46KPPY5XKUKFERLL4EPWCA555 X-MailFrom: SRS0=yRaY=7Q=emma.gg=emma@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] lavc/dxvenc: replace erroneous uses of "words" with "dwords" List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Emma Worley via ffmpeg-devel Cc: Emma Worley Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: I made some references to words when I meant dwords. This change corrects that language where appropriate in preparation for DXT5 support. Signed-off-by: Emma Worley --- libavcodec/dxvenc.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libavcodec/dxvenc.c b/libavcodec/dxvenc.c index 0a2dd8077b..b4e639f76b 100644 --- a/libavcodec/dxvenc.c +++ b/libavcodec/dxvenc.c @@ -40,12 +40,12 @@ #define DXV_ALIGN(x) FFALIGN(x, 16) /* - * DXV uses LZ-like back-references to avoid copying words that have already + * DXV uses LZ-like back-references to avoid copying data that has already * appeared in the decompressed stream. Using a simple hash table (HT) * significantly speeds up the lookback process while encoding. */ -#define LOOKBACK_HT_ELEMS 0x20202 -#define LOOKBACK_WORDS 0x20202 +#define LOOKBACK_HT_ELEMS 0x20202 +#define LOOKBACK_DWORDS_DXT1 0x20202 typedef struct DXVEncContext { AVClass *class; @@ -70,7 +70,7 @@ typedef struct DXVEncContext { /* Converts an index offset value to a 2-bit opcode and pushes it to a stream. * Inverse of CHECKPOINT in dxv.c. */ -#define PUSH_OP(x) \ +#define PUSH_OP(block_dwords) \ do { \ if (state == 16) { \ if (bytestream2_get_bytes_left_p(pbc) < 4) { \ @@ -80,13 +80,13 @@ typedef struct DXVEncContext { bytestream2_put_le32(pbc, 0); \ state = 0; \ } \ - if (idx >= 0x102 * x) { \ + if (idx >= 0x102 * block_dwords) { \ op = 3; \ - bytestream2_put_le16(pbc, (idx / x) - 0x102); \ - } else if (idx >= 2 * x) { \ + bytestream2_put_le16(pbc, (idx / block_dwords) - 0x102); \ + } else if (idx >= 2 * block_dwords) { \ op = 2; \ - bytestream2_put_byte(pbc, (idx / x) - 2); \ - } else if (idx == x) { \ + bytestream2_put_byte(pbc, (idx / block_dwords) - 2); \ + } else if (idx == block_dwords) { \ op = 1; \ } else { \ op = 0; \ @@ -119,8 +119,8 @@ static int dxv_compress_dxt1(AVCodecContext *avctx) combo_idx = ff_hashtable_get(ctx->combo_ht, ctx->tex_data + pos * 4, &prev_pos) ? pos - prev_pos : 0; idx = combo_idx; PUSH_OP(2); - if (pos >= LOOKBACK_WORDS) { - old_pos = pos - LOOKBACK_WORDS; + if (pos >= LOOKBACK_DWORDS_DXT1) { + old_pos = pos - LOOKBACK_DWORDS_DXT1; if (ff_hashtable_get(ctx->combo_ht, ctx->tex_data + old_pos * 4, &prev_pos) && prev_pos <= old_pos) ff_hashtable_delete(ctx->combo_ht, ctx->tex_data + old_pos * 4); } @@ -132,8 +132,8 @@ static int dxv_compress_dxt1(AVCodecContext *avctx) if (!idx) bytestream2_put_le32(pbc, AV_RL32(ctx->tex_data + pos * 4)); } - if (pos >= LOOKBACK_WORDS) { - old_pos = pos - LOOKBACK_WORDS; + if (pos >= LOOKBACK_DWORDS_DXT1) { + old_pos = pos - LOOKBACK_DWORDS_DXT1; if (ff_hashtable_get(ctx->color_ht, ctx->tex_data + old_pos * 4, &prev_pos) && prev_pos <= old_pos) ff_hashtable_delete(ctx->color_ht, ctx->tex_data + old_pos * 4); } @@ -146,8 +146,8 @@ static int dxv_compress_dxt1(AVCodecContext *avctx) if (!idx) bytestream2_put_le32(pbc, AV_RL32(ctx->tex_data + pos * 4)); } - if (pos >= LOOKBACK_WORDS) { - old_pos = pos - LOOKBACK_WORDS; + if (pos >= LOOKBACK_DWORDS_DXT1) { + old_pos = pos - LOOKBACK_DWORDS_DXT1; if (ff_hashtable_get(ctx->lut_ht, ctx->tex_data + old_pos * 4, &prev_pos) && prev_pos <= old_pos) ff_hashtable_delete(ctx->lut_ht, ctx->tex_data + old_pos * 4); } @@ -166,8 +166,8 @@ static int dxv_encode(AVCodecContext *avctx, AVPacket *pkt, int ret; /* unimplemented: needs to depend on compression ratio of tex format */ - /* under DXT1, we need 3 words to encode load ops for 32 words. - * the first 2 words of the texture do not need load ops. */ + /* under DXT1, we need 3 dwords to encode load ops for 32 dwords. + * the first 2 dwords of the texture do not need load ops. */ ret = ff_alloc_packet(avctx, pkt, DXV_HEADER_LENGTH + ctx->tex_size + AV_CEIL_RSHIFT(ctx->tex_size - 8, 7) * 12); if (ret < 0) return ret; -- 2.48.0 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org