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 3BB984D857
for <ffmpegdev@gitmailbox.com>; Sun, 20 Apr 2025 21:04:38 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61D82687FCC;
Mon, 21 Apr 2025 00:04:28 +0300 (EEST)
Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com
[209.85.215.173])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62432687D4B
for <ffmpeg-devel@ffmpeg.org>; Mon, 21 Apr 2025 00:04:06 +0300 (EEST)
Received: by mail-pg1-f173.google.com with SMTP id
41be03b00d2f7-b0da25f5216so2073324a12.1
for <ffmpeg-devel@ffmpeg.org>; Sun, 20 Apr 2025 14:04:06 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=emma-gg.20230601.gappssmtp.com; s=20230601; t=1745183044; x=1745787844;
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=OWtn2VoOREzk+FbjqL3puftQaJW27osd6r4EXJskSbE=;
b=HrPplMOweHcG3cT6FzO2qUl5Dt7i148KH2bwUUpyBhUcTnb/3vorfNtxz1MpDPx/L9
7ayASFW1jckN82cysYvn8/TQTRpcUvSfTxjf4X1RlSNU1q+FE94mZXaShmvLeD/EQpla
TQU2MRD8zW1+KPLdMN38c278eisLUzAGBoEsE9iT6WQ0t2JLNpUEae+EDY69bYkkNtaP
d4QPLoKVC8YqH2XNQTdnyO6aKUD3sZ4hj97g9os50QhVXcDWOLUowXuioQwlSSQiqDbt
ZVHQyi99woMhefkW7VbLdfZN+Tfysa+QBhJxHD9I2xC2kPvFpOwO+FkS5pBfuz1HQZ3q
MKVw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1745183044; x=1745787844;
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=OWtn2VoOREzk+FbjqL3puftQaJW27osd6r4EXJskSbE=;
b=nY6aRJyHG/Z5LlRGK71V07iVP1mQxAKXFqa061eS+yoapnWN/en3S6YTTzlNZkbc1N
BF+2Dz/4Kw7KsHOCb+WJABIqpTTznwejGAIHtag3vIrEi30FWFPHlvkxYn46sWvfs0DY
4lkdW23BdrTwLZ0YFcBF1JiK5moGIhzx4mH6AE8yqwJW969ntl+Jua5TK6d3yCWKxZns
JR5Y8osltbGHRqYAoGqqTEsC/NIuPGhZyINs7GfdN9w7YAiydNDNA7jIeVIgysMZmmsZ
TOs/ZG/QvqpEmnkqzUbw5ZnfgNtnrAwT2WjBqPu9pHMX1Nj/ZzGE3x3jkt5dK4n2Uvig
Bm9Q==
X-Gm-Message-State: AOJu0Yx7dUSz4Lmk0sm/+9iBR4/m8i+nQh5E0XKt9cX4YmvKJOjxnWCk
YM8r/ZT0JMqP7/pAB7rE0PzZc3VQGOt9p1CyoR3npNPLGFHaK9lNkH/mucAqox+tRoE9dOEiE0z
i
X-Gm-Gg: ASbGncukfhiuMCREOQ2NWU2/tGlYrHFEn565YHZl03aYMtuNpbfRApKAVz9CTgQLFpq
i6rqzfkCyeb0o5lp4Fo6TV5D+M0WQxvrsfJJoytqzDb3utJ3MRWhaIxnyRS7hdSWa0XzjAaxYFA
+8/YT2XXhgeBcpZwvx8hWEkkztwhG+ak/4phzPTLiu8GGD3GpM4p4/8BvIatA3yoLGlaBMNnBwj
tjlUBOtSV7TvbvfLhah4zQ/bQBAmVQbkreB0vk6XWiiV++DdwyCYG9VLDSUDQPvZhkLsmUkBYyl
c8uhXwb3Of7KIZFtK2YspOIqrrll2igujRiJUGq3FIzWjBbsEA==
X-Google-Smtp-Source: AGHT+IEyO/9wA0jAJKFcrSzkfrY9e6CBA/v49SqP0R7GD/F+Jkfuy3w6zMOZuMV1vbplEF6OwdLRJw==
X-Received: by 2002:a17:903:2a90:b0:223:64bb:f657 with SMTP id
d9443c01a7336-22c5362cc3emr137946445ad.46.1745183044233;
Sun, 20 Apr 2025 14:04:04 -0700 (PDT)
Received: from localhost ([2600:1700:65a7:3600:b90a:a0ba:c740:60a5])
by smtp.gmail.com with UTF8SMTPSA id
d9443c01a7336-22c50bda9cdsm52217905ad.22.2025.04.20.14.04.03
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Sun, 20 Apr 2025 14:04:03 -0700 (PDT)
From: Emma Worley <emma@emma.gg>
To: ffmpeg-devel@ffmpeg.org
Date: Sun, 20 Apr 2025 14:03:51 -0700
Message-ID: <20250420210351.53164-3-emma@emma.gg>
X-Mailer: git-send-email 2.48.0
In-Reply-To: <20250420210351.53164-1-emma@emma.gg>
References: <20250420210351.53164-1-emma@emma.gg>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v2 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/20250420210351.53164-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 to the next largest
16x16 multiple. Produces identical packets to Resolume Alley in manual tests.
Signed-off-by: Emma Worley <emma@emma.gg>
---
libavcodec/dxvenc.c | 89 +++++++++++++++++++------------------
tests/ref/fate/dxv3enc-dxt1 | 2 +-
2 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/libavcodec/dxvenc.c b/libavcodec/dxvenc.c
index c64b4d5f15..b2972435a2 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_PAD(x) (x + 15 & ~15)
+
/*
* 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 AVHashtableContext *color_ht;
struct AVHashtableContext *lut_ht;
+ struct AVHashtableContext *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;
av_hashtable_clear(ctx->color_ht);
av_hashtable_clear(ctx->lut_ht);
+ av_hashtable_clear(ctx->combo_ht);
+
+ av_hashtable_set(ctx->combo_ht, ctx->tex_data, &pos);
bytestream2_put_le32(pbc, AV_RL32(ctx->tex_data));
av_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 = av_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 (av_hashtable_get(ctx->combo_ht, ctx->tex_data + old_pos * 4, &prev_pos) && prev_pos <= old_pos)
+ av_hashtable_delete(ctx->combo_ht, ctx->tex_data + old_pos * 4);
+ }
+ av_hashtable_set(ctx->combo_ht, &combo, &pos);
color = AV_RL32(ctx->tex_data + pos * 4);
- if (av_hashtable_get(ctx->color_ht, &color, &prev_pos))
- color_idx = pos - prev_pos;
- av_hashtable_set(ctx->color_ht, &color, &pos);
-
+ if (!combo_idx) {
+ idx = av_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 (av_hashtable_get(ctx->color_ht, ctx->tex_data + old_pos * 4, &prev_pos) && prev_pos <= old_pos)
av_hashtable_delete(ctx->color_ht, ctx->tex_data + old_pos * 4);
}
+ av_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 (av_hashtable_get(ctx->lut_ht, &lut, &prev_pos))
- lut_idx = pos - prev_pos;
- av_hashtable_set(ctx->lut_ht, &lut, &pos);
+ if (!combo_idx) {
+ idx = av_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 (av_hashtable_get(ctx->lut_ht, ctx->tex_data + old_pos * 4, &prev_pos) && prev_pos <= old_pos)
av_hashtable_delete(ctx->lut_ht, ctx->tex_data + old_pos * 4);
}
+ av_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;
@@ -175,8 +180,8 @@ static int dxv_encode(AVCodecContext *avctx, AVPacket *pkt,
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.width = DXV_PAD(avctx->width);
+ ctx->enc.height = DXV_PAD(avctx->height);
ff_texturedsp_exec_compress_threads(avctx, &ctx->enc);
} else {
/* unimplemented: YCoCg formats */
@@ -216,14 +221,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 +234,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_PAD(avctx->width) / TEXTURE_BLOCK_W *
+ DXV_PAD(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_PAD(avctx->height) / TEXTURE_BLOCK_H);
ctx->tex_data = av_malloc(ctx->tex_size);
if (!ctx->tex_data) {
@@ -251,6 +248,9 @@ static av_cold int dxv_init(AVCodecContext *avctx)
if (ret < 0)
return ret;
ret = av_hashtable_alloc(&ctx->lut_ht, sizeof(uint32_t), sizeof(uint32_t), LOOKBACK_HT_ELEMS);
+ if (ret < 0)
+ return ret;
+ ret = av_hashtable_alloc(&ctx->combo_ht, sizeof(uint64_t), sizeof(uint32_t), LOOKBACK_HT_ELEMS);
if (ret < 0)
return ret;
@@ -265,6 +265,7 @@ static av_cold int dxv_close(AVCodecContext *avctx)
av_hashtable_freep(&ctx->color_ht);
av_hashtable_freep(&ctx->lut_ht);
+ av_hashtable_freep(&ctx->combo_ht);
return 0;
}
diff --git a/tests/ref/fate/dxv3enc-dxt1 b/tests/ref/fate/dxv3enc-dxt1
index 74849a8031..1e1b86aa6c 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, 76563, 0x6b028fff
--
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".