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 AD90C4D190 for ; Fri, 30 May 2025 23:20:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 2473368DB9B; Sat, 31 May 2025 02:20:35 +0300 (EEST) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 6939568DD56 for ; Sat, 31 May 2025 02:20:26 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7398d65476eso1874857b3a.1 for ; Fri, 30 May 2025 16:20:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emma-gg.20230601.gappssmtp.com; s=20230601; t=1748647224; x=1749252024; 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=SE5e2VvrhXzccnFsV6goRSB0HrVqRVGHLTDubHnbMn8=; b=r06hL81FM61xOnSp7ELhQBco4QDol8kVIgcO9H5qm1KsNpmoWTIINwBi3pxEirKiAL jONYbrYPXvdx1XcbXyMmgW8zF8Ysvvqxarfak5LV8xZoVpb0e2U927I7VkvJ2upfXas7 M/FuMndxRXK3fnCuFmXnJjEHKvEq5b+0FHfiWUlN/nOCbYTp5tLddr8H4VHQhg0q460T aaF2Zu/c6y4epo3vzeTQsKRVmA4PVfRacA/NXkvbX8X+itDqBd1GqX6FwbVHReDL5zb3 r47pFjn91zwM69h9VDCI0zAWuXOGRctA4a/hv7CLT3YDzG/n2vhdjIZhtbziSymZ2LCa fVTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748647224; x=1749252024; 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=SE5e2VvrhXzccnFsV6goRSB0HrVqRVGHLTDubHnbMn8=; b=Indn7BGgGZrGbtIAMC7KTTSMJtF9NrUg0HSXuctgJkNXAEd2o7MIZt31gsN34AYql0 j2P1zjlwCTPm2CWKk+Hs3ALWTAB2czXetnUs1GvxvPZ1DEqnZZexy2taNrePLGjyVy1C 1n3WyGweuKOG2Qq9jh+nf5vY4lspcSPGMBWzTwB73cgEfRs9WlD9YYBkker2vVQrEIYE E2Kn2FULoYYhT3ejONTbbpPIlITMxS9MfgC8FC3ZQzGjCoxj6kkysa7+XzYiBSTbxak0 qq2PXJlipYlkHqyEKXA03nGt6ZHjz4XwlTlHP3OmfS5A0AFLUsrWJizOfbNidHuwKtj3 cTGQ== X-Gm-Message-State: AOJu0YygWGC8gquAWbZVXCnVKJwve1cb0Eg/F1ox5qYVWL3zzv5BkWaS Nw2RZ9uBg65xVGWYqZDxcs8I7I6XzTEL4WUqXgEQgYiJ56/i734RB1+PRiovF82s7VE+nOVzzjU L9lvC X-Gm-Gg: ASbGncvgHNRHTtCHe+rYm7Wz0CsQ97c2q1gDSBE4xjWV/TQ/DHHcOGWX5q8+AdgUpIG x5z3b2vv8LvFTNmpbfurdQZRwJe3NDLE/zwlLsiYYDDTvZmtSrCMypp/hkdKxTn0hA9Z0jjbimQ 3p9UoCjYPM7hB9NhIaOsmWZwpfeDwOaNGVvYOaQabjF+AJcXVQjRT7Zy+wX5tNbn/8XuCeHEEGv WEtFnNTNOXxM8Cfv6ss6nQTMtzIbaREpYVjHMLU2xKGNrlXJu0R0L3gpAQ3pBHJDfxpU20yFwj4 1lB62c6IbtQ+dz5ZuXHH0VDzyx2mJbZEFG8p/bO+2+bRrUkTUv+Ve77go0VY X-Google-Smtp-Source: AGHT+IH82u6j8umEqrfyjwNRyj9fJHFXBEJ2cKpFnG1iEc5Vn03M8XA7RH4kiURWcPhadzSewWiT7g== X-Received: by 2002:aa7:8d8d:0:b0:742:a24d:aede with SMTP id d2e1a72fcca58-747ad7575f6mr10076598b3a.8.1748647224390; Fri, 30 May 2025 16:20:24 -0700 (PDT) Received: from localhost ([2600:1700:65a7:3600:9535:9a1a:bf9e:1c3b]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-747afeab33dsm3544407b3a.41.2025.05.30.16.20.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 30 May 2025 16:20:23 -0700 (PDT) From: Emma Worley To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 May 2025 16:20:08 -0700 Message-ID: <20250530232008.29554-3-emma@emma.gg> X-Mailer: git-send-email 2.48.0 In-Reply-To: <20250530232008.29554-1-emma@emma.gg> References: <20250530232008.29554-1-emma@emma.gg> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Emma 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: 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 --- 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 6eaf363f06..ee6a0a5b36 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 { FFHashtableContext *color_ht; FFHashtableContext *lut_ht; + 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".