From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id ACC374DA6D
for <ffmpegdev@gitmailbox.com>; Tue, 22 Apr 2025 07:43:46 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E70F68A970;
Tue, 22 Apr 2025 10:43:29 +0300 (EEST)
Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com
[209.85.216.42])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4496F68A48C
for <ffmpeg-devel@ffmpeg.org>; Tue, 22 Apr 2025 10:43:23 +0300 (EEST)
Received: by mail-pj1-f42.google.com with SMTP id
98e67ed59e1d1-301e05b90caso4609743a91.2
for <ffmpeg-devel@ffmpeg.org>; Tue, 22 Apr 2025 00:43:23 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=emma-gg.20230601.gappssmtp.com; s=20230601; t=1745307801; x=1745912601;
darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=1sSXRE1jNu3i4f/jUNSyagIS/QC6tYt9mzoxxs3Ndww=;
b=Qc36dqNDXha6UCikwjEgTIT4++vSiVEr6tqBD4gqkfSEQ8OGxYC9d/z/Wg4wrvmSSL
jLGWBMRa5hrXf5Tp7+FA23ZBwxamTun1ykJIAk440Nf1dF+cajZD7rtvulTZXVRk/zD4
iUgbbbbLWemS8bIkZOe3XnZLL0KnRek4GnLugMiuzduSEDR6WItot3NQ7wWba/Ghsje1
+LvcrXzsg977HG8vY8NF/ah9O4N8EhA9QBHsFjCt1TzAliHPUB++Z6c05c5Ein7SMztt
qZli1P23GSN+uLFKv3qlNeCfk76nkccEk0lpeMKqFIbpRk5lb4jk+lsc3+UiownIGlky
cpJA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1745307801; x=1745912601;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=1sSXRE1jNu3i4f/jUNSyagIS/QC6tYt9mzoxxs3Ndww=;
b=XGGojRfRNTReOSiw6yN6jRp6q8f1wq+Ix8RuQ9gI1aDFfc3m+Yi/xc/A18pxUN+bA/
7ps+Mj9VrbpSpetL+1WAaaI4HABjevYVQPUpLgrp+970XXvgDuM+ECWuO7e3u4bKk7JC
mF73u0CE+tjHtD0EZgw+C0N6lb4PdT/uNABAywVP1KgvpY6ZrQMqWpH0Jl82rdvqVV9r
kHGBsQtZD39JrAgvyyWQ3lMPCGUbGbjY8OYEwbuhzCaqsFjeo5yTdTBER5BsMJ7OBIKm
A42txkR09f/1OHrT2EqYWPNkLrjR4zFcYbfPO+x+gWdjbTGn6Jyz6rk3QdM+AXLDV9jd
xbqw==
X-Gm-Message-State: AOJu0YxZdi1Pa7aGLlr96qxEt5iUixx79FSnA+4vusQC3s8QZE1kcxTI
0GJz0UUO26weagm3UPOaYN8Fou/4p9qic7mdtPoJLs/lexdxc/5Qr5FIXMVmbHVLKjMvFDeiI9X
i
X-Gm-Gg: ASbGncvKd82LT/+ceVKbzRfGj7NL/N6Lsr7lPzrUJJgFAGpsdRSuTPHZnkZC9cJvUaK
qT2bTLXiMX3970OP4RC0ZkB7+ayYjwnNTP/QIMkaZabn3jQVZiGhLLZPrKfItZwhlVGzlkggXNE
4RhEpCWlGW+YpgMUjhAmyQ9QNTf/zkPlCa6sYHuheKBTbWPaTFbb7NxICfYFLjpd9p7u9yAxW77
CIHTkY1Eeef3yDRXd/0EWiyfHc9F6HZmFBsEJkU3iTB4CJibL29i5N4FAIQmYpxMgYWMhQOlk5l
RH+Lhz2ebXARBel8DWlm+u26a7RjWLcPpRhFpOlWRUSUDa7e2g==
X-Google-Smtp-Source: AGHT+IEfHy2evvcpD9iqBiQRr+my6J4DJacmH+bR9ZAgpu3dHUOoUIfrhFyMT0elpLsKO6pTrjkLtw==
X-Received: by 2002:a17:90a:c2d0:b0:2ee:b8ac:73b0 with SMTP id
98e67ed59e1d1-3087bb3f2cemr21739197a91.2.1745307801181;
Tue, 22 Apr 2025 00:43:21 -0700 (PDT)
Received: from localhost ([2600:1700:65a7:3600:e43f:b3c9:c97a:8ef3])
by smtp.gmail.com with UTF8SMTPSA id
d9443c01a7336-22c50eb4622sm78119665ad.108.2025.04.22.00.43.20
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Tue, 22 Apr 2025 00:43:20 -0700 (PDT)
From: Emma Worley <emma@emma.gg>
To: ffmpeg-devel@ffmpeg.org
Date: Tue, 22 Apr 2025 00:42:54 -0700
Message-ID: <20250422074254.77328-3-emma@emma.gg>
X-Mailer: git-send-email 2.48.0
In-Reply-To: <20250422074254.77328-1-emma@emma.gg>
References: <20250422074254.77328-1-emma@emma.gg>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v4 3/3] lavc/dxvenc: improve compatibility
with Resolume products
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Emma Worley <emma@emma.gg>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250422074254.77328-3-emma@emma.gg/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Improves compatibility with Resolume products by adding an additional
hashtable for DXT color+LUT combinations, and padding the DXT texture
dimensions to the next largest multiple of 16. Produces identical
packets to Resolume Alley in manual tests.
Signed-off-by: Emma Worley <emma@emma.gg>
---
libavcodec/dxvenc.c | 131 +++++++++++++++++++++++-------------
tests/ref/fate/dxv3enc-dxt1 | 2 +-
2 files changed, 86 insertions(+), 47 deletions(-)
diff --git a/libavcodec/dxvenc.c b/libavcodec/dxvenc.c
index 207ac1f24f..48548ae811 100644
--- a/libavcodec/dxvenc.c
+++ b/libavcodec/dxvenc.c
@@ -34,6 +34,11 @@
#define DXV_HEADER_LENGTH 12
+/*
+ * Resolume will refuse to display frames that are not padded to 16x16 pixels.
+ */
+#define DXV_ALIGN(x) FFALIGN(x, 16)
+
/*
* DXV uses LZ-like back-references to avoid copying words that have already
* appeared in the decompressed stream. Using a simple hash table (HT)
@@ -60,6 +65,7 @@ typedef struct DXVEncContext {
struct FFHashtableContext *color_ht;
struct FFHashtableContext *lut_ht;
+ struct FFHashtableContext *combo_ht;
} DXVEncContext;
/* Converts an index offset value to a 2-bit opcode and pushes it to a stream.
@@ -94,10 +100,14 @@ static int dxv_compress_dxt1(AVCodecContext *avctx)
DXVEncContext *ctx = avctx->priv_data;
PutByteContext *pbc = &ctx->pbc;
void *value;
- uint32_t color, lut, idx, color_idx, lut_idx, prev_pos, state = 16, pos = 0, op = 0;
+ uint64_t combo;
+ uint32_t color, lut, idx, combo_idx, prev_pos, old_pos, state = 16, pos = 0, op = 0;
ff_hashtable_clear(ctx->color_ht);
ff_hashtable_clear(ctx->lut_ht);
+ ff_hashtable_clear(ctx->combo_ht);
+
+ ff_hashtable_set(ctx->combo_ht, ctx->tex_data, &pos);
bytestream2_put_le32(pbc, AV_RL32(ctx->tex_data));
ff_hashtable_set(ctx->color_ht, ctx->tex_data, &pos);
@@ -107,51 +117,46 @@ static int dxv_compress_dxt1(AVCodecContext *avctx)
pos++;
while (pos + 2 <= ctx->tex_size / 4) {
- idx = 0;
- color_idx = 0;
- lut_idx = 0;
+ combo = AV_RL64(ctx->tex_data + pos * 4);
+ combo_idx = ff_hashtable_get(ctx->combo_ht, &combo, &prev_pos) ? pos - prev_pos : 0;
+ idx = combo_idx;
+ PUSH_OP(2);
+ if (pos >= LOOKBACK_WORDS) {
+ old_pos = pos - LOOKBACK_WORDS;
+ 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);
+ }
+ ff_hashtable_set(ctx->combo_ht, &combo, &pos);
color = AV_RL32(ctx->tex_data + pos * 4);
- if (ff_hashtable_get(ctx->color_ht, &color, &prev_pos))
- color_idx = pos - prev_pos;
- ff_hashtable_set(ctx->color_ht, &color, &pos);
-
+ if (!combo_idx) {
+ idx = ff_hashtable_get(ctx->color_ht, &color, &prev_pos) ? pos - prev_pos : 0;
+ PUSH_OP(2);
+ if (!idx)
+ bytestream2_put_le32(pbc, color);
+ }
if (pos >= LOOKBACK_WORDS) {
- uint32_t old_pos = pos - LOOKBACK_WORDS;
+ old_pos = pos - LOOKBACK_WORDS;
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);
}
+ ff_hashtable_set(ctx->color_ht, &color, &pos);
pos++;
lut = AV_RL32(ctx->tex_data + pos * 4);
- if (color_idx && lut == AV_RL32(ctx->tex_data + (pos - color_idx) * 4)) {
- idx = color_idx;
- } else {
- idx = 0;
- if (ff_hashtable_get(ctx->lut_ht, &lut, &prev_pos))
- lut_idx = pos - prev_pos;
- ff_hashtable_set(ctx->lut_ht, &lut, &pos);
+ if (!combo_idx) {
+ idx = ff_hashtable_get(ctx->lut_ht, &lut, &prev_pos) ? pos - prev_pos : 0;
+ PUSH_OP(2);
+ if (!idx)
+ bytestream2_put_le32(pbc, lut);
}
if (pos >= LOOKBACK_WORDS) {
- uint32_t old_pos = pos - LOOKBACK_WORDS;
+ old_pos = pos - LOOKBACK_WORDS;
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);
}
+ ff_hashtable_set(ctx->lut_ht, &lut, &pos);
pos++;
-
- PUSH_OP(2);
-
- if (!idx) {
- idx = color_idx;
- PUSH_OP(2);
- if (!idx)
- bytestream2_put_le32(pbc, color);
-
- idx = lut_idx;
- PUSH_OP(2);
- if (!idx)
- bytestream2_put_le32(pbc, lut);
- }
}
return 0;
@@ -172,12 +177,50 @@ static int dxv_encode(AVCodecContext *avctx, AVPacket *pkt,
return ret;
if (ctx->enc.tex_funct) {
+ uint8_t *safe_data[4] = {frame->data[0], 0, 0, 0};
+ int safe_linesize[4] = {frame->linesize[0], 0, 0, 0};
+
+ if (avctx->width != DXV_ALIGN(avctx->width) || avctx->height != DXV_ALIGN(avctx->height)) {
+ ret = av_image_alloc(
+ safe_data,
+ safe_linesize,
+ DXV_ALIGN(avctx->width),
+ DXV_ALIGN(avctx->height),
+ avctx->pix_fmt,
+ 1);
+ if (ret < 0)
+ return ret;
+
+ av_image_copy2(
+ safe_data,
+ safe_linesize,
+ frame->data,
+ frame->linesize,
+ avctx->pix_fmt,
+ avctx->width,
+ avctx->height);
+
+ if (avctx->width != DXV_ALIGN(avctx->width)) {
+ for (int y = 0; y < avctx->height; y++) {
+ memset(safe_data[0] + y * safe_linesize[0] + frame->linesize[0], 0, safe_linesize[0] - frame->linesize[0]);
+ }
+ }
+ if (avctx->height != DXV_ALIGN(avctx->height)) {
+ for (int y = avctx->height; y < DXV_ALIGN(avctx->height); y++) {
+ memset(safe_data[0] + y * safe_linesize[0], 0, safe_linesize[0]);
+ }
+ }
+ }
+
ctx->enc.tex_data.out = ctx->tex_data;
- ctx->enc.frame_data.in = frame->data[0];
- ctx->enc.stride = frame->linesize[0];
- ctx->enc.width = avctx->width;
- ctx->enc.height = avctx->height;
+ ctx->enc.frame_data.in = safe_data[0];
+ ctx->enc.stride = safe_linesize[0];
+ ctx->enc.width = DXV_ALIGN(avctx->width);
+ ctx->enc.height = DXV_ALIGN(avctx->height);
ff_texturedsp_exec_compress_threads(avctx, &ctx->enc);
+
+ if (safe_data[0] != frame->data[0])
+ av_freep(&safe_data[0]);
} else {
/* unimplemented: YCoCg formats */
return AVERROR_INVALIDDATA;
@@ -216,14 +259,6 @@ static av_cold int dxv_init(AVCodecContext *avctx)
return ret;
}
- if (avctx->width % TEXTURE_BLOCK_W || avctx->height % TEXTURE_BLOCK_H) {
- av_log(avctx,
- AV_LOG_ERROR,
- "Video size %dx%d is not multiple of "AV_STRINGIFY(TEXTURE_BLOCK_W)"x"AV_STRINGIFY(TEXTURE_BLOCK_H)".\n",
- avctx->width, avctx->height);
- return AVERROR_INVALIDDATA;
- }
-
ff_texturedspenc_init(&texdsp);
switch (ctx->tex_fmt) {
@@ -237,10 +272,10 @@ static av_cold int dxv_init(AVCodecContext *avctx)
return AVERROR_INVALIDDATA;
}
ctx->enc.raw_ratio = 16;
- ctx->tex_size = avctx->width / TEXTURE_BLOCK_W *
- avctx->height / TEXTURE_BLOCK_H *
+ ctx->tex_size = DXV_ALIGN(avctx->width) / TEXTURE_BLOCK_W *
+ DXV_ALIGN(avctx->height) / TEXTURE_BLOCK_H *
ctx->enc.tex_ratio;
- ctx->enc.slice_count = av_clip(avctx->thread_count, 1, avctx->height / TEXTURE_BLOCK_H);
+ ctx->enc.slice_count = av_clip(avctx->thread_count, 1, DXV_ALIGN(avctx->height) / TEXTURE_BLOCK_H);
ctx->tex_data = av_malloc(ctx->tex_size);
if (!ctx->tex_data) {
@@ -251,6 +286,9 @@ static av_cold int dxv_init(AVCodecContext *avctx)
if (ret < 0)
return ret;
ret = ff_hashtable_alloc(&ctx->lut_ht, sizeof(uint32_t), sizeof(uint32_t), LOOKBACK_HT_ELEMS);
+ if (ret < 0)
+ return ret;
+ ret = ff_hashtable_alloc(&ctx->combo_ht, sizeof(uint64_t), sizeof(uint32_t), LOOKBACK_HT_ELEMS);
if (ret < 0)
return ret;
@@ -265,6 +303,7 @@ static av_cold int dxv_close(AVCodecContext *avctx)
ff_hashtable_freep(&ctx->color_ht);
ff_hashtable_freep(&ctx->lut_ht);
+ ff_hashtable_freep(&ctx->combo_ht);
return 0;
}
diff --git a/tests/ref/fate/dxv3enc-dxt1 b/tests/ref/fate/dxv3enc-dxt1
index 74849a8031..e09000e181 100644
--- a/tests/ref/fate/dxv3enc-dxt1
+++ b/tests/ref/fate/dxv3enc-dxt1
@@ -3,4 +3,4 @@
#codec_id 0: dxv
#dimensions 0: 1920x1080
#sar 0: 1/1
-0, 0, 0, 1, 76521, 0xed387a5e
+0, 0, 0, 1, 76190, 0x0e6f0326
--
2.48.0
_______________________________________________
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".