From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 652B648BF6 for ; Fri, 9 Feb 2024 09:59:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15F9568CE0E; Fri, 9 Feb 2024 11:59:47 +0200 (EET) 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 24B8068B22E for ; Fri, 9 Feb 2024 11:59:41 +0200 (EET) Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2907a17fa34so584005a91.1 for ; Fri, 09 Feb 2024 01:59:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707472778; x=1708077578; 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=trbOOeq/Psrbd00OcEdzjn58V0XdhRc3nxEt4OxafPc=; b=LvfLQJUmbNimvvc7NJNlYGVTd0OKqJY41cR3xD4WuPjVfACjMX/iFVicBM9XelsCKD I+cCQhPpMryru2Vkp8iK43ZiAuylg3QXisYjFs7Wtu2ZZYnvOyK4ewLGxa5Mn6rQ0VxQ YR/UbuJ8ed/GLN5DQrK811u8HtT/sN7Rda56cqZ30yqt2K95xfswmn4+fb+XS2j13VAQ xZvfPQT//3FHAWASe52C1PgW262rDUVR1gO+eiBb7NwwXFOxoMQR66NoMKYVYGdwE5jp QEYf5QNln3XB3jIHBLoonliNXDWLqV1r4miyBzN7vvbmgqtOUyvxTD9mK4o5xmSnvGbG X6iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707472778; x=1708077578; 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=trbOOeq/Psrbd00OcEdzjn58V0XdhRc3nxEt4OxafPc=; b=XWeJnCLNp01C4c6/ZQtPej3AhtJht6qXCVXKK3PxcH3ctYwYp3kTfteC156W1p9owp dSwZ8vBOT66nMDiMA7EBgCB3tdI1KUi25A8schNOr0A2hkvNFaf+uXwmsejq0P25xHzu Pdxk2QRizIOq95JyrizdeSRPwJf0ommPjvSJ7nWlijU/REzKgZero7vO2FvKaCK+MCUe GBnGn/P9IT5ljgRBNRITuwSzJtlq+mNCoJe/hc2ZB3quN40Ca3ZQFiSzmU+M9MIDhXQI CbeccJGHSstskfKff2KKXfwuGLizd6vnT5WZ7rS6WNXCFVj6dkdahSZ+OZKLQZKpSaPb 6RvA== X-Gm-Message-State: AOJu0YyGz4xun6Z9YhEgo52Oo+5QpN/T/Wv4bquQ/xDNfyvi6oD3mNPe jIL7SYTf8dMSaK8ZEOeIak033LTkGlB62v/J5rVwGcYVhzvXK9yyDN1R5JWffGw= X-Google-Smtp-Source: AGHT+IHX3uLVseQbNv2Gb4yTWMm97LPpCbQQWNos/kUX34OU+GlF5+gKVXoRNawjU/Ggv0hEu460Jg== X-Received: by 2002:a17:90b:2e83:b0:296:84e1:de64 with SMTP id sn3-20020a17090b2e8300b0029684e1de64mr976698pjb.20.1707472778278; Fri, 09 Feb 2024 01:59:38 -0800 (PST) Received: from localhost ([2601:647:4600:84e0:d085:ac8a:daf1:f5a1]) by smtp.gmail.com with UTF8SMTPSA id nc16-20020a17090b37d000b00296f2c1d2c9sm1339110pjb.18.2024.02.09.01.59.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 09 Feb 2024 01:59:37 -0800 (PST) From: Connor Worley To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Feb 2024 01:59:33 -0800 Message-Id: <20240209095933.88301-1-connorbworley@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/dxv: align to 4x4 blocks instead of 16x16 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 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: The previous assumption that DXV needs to be aligned to 16x16 was erroneous. 4x4 works just as well, and FATE decoder tests pass for all texture formats. On the encoder side, we should reject input that isn't 4x4 aligned, like the HAP encoder does, and stop aligning to 16x16. This both solves the uninitialized reads causing current FATE tests to fail and produces smaller encoded outputs. Signed-off-by: Connor Worley --- libavcodec/dxv.c | 6 +++--- libavcodec/dxvenc.c | 13 ++++++++++--- tests/ref/fate/dxv3enc-dxt1 | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index e1c7cee3e8..9261a5cac1 100644 --- a/libavcodec/dxv.c +++ b/libavcodec/dxv.c @@ -1238,9 +1238,9 @@ static int dxv_init(AVCodecContext *avctx) return ret; } - /* Codec requires 16x16 alignment. */ - avctx->coded_width = FFALIGN(avctx->width, 16); - avctx->coded_height = FFALIGN(avctx->height, 16); + /* Since codec is based on 4x4 blocks, size is aligned to 4 */ + avctx->coded_width = FFALIGN(avctx->width, TEXTURE_BLOCK_W); + avctx->coded_height = FFALIGN(avctx->height, TEXTURE_BLOCK_H); ff_texturedsp_init(&ctx->texdsp); diff --git a/libavcodec/dxvenc.c b/libavcodec/dxvenc.c index ebc48aace3..3023a6da6c 100644 --- a/libavcodec/dxvenc.c +++ b/libavcodec/dxvenc.c @@ -216,6 +216,13 @@ 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 %dx%d.\n", + avctx->width, avctx->height, + TEXTURE_BLOCK_W, TEXTURE_BLOCK_H); + return AVERROR_INVALIDDATA; + } + ff_texturedspenc_init(&texdsp); switch (ctx->tex_fmt) { @@ -229,10 +236,10 @@ static av_cold int dxv_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } ctx->enc.raw_ratio = 16; - ctx->tex_size = FFALIGN(avctx->width, 16) / TEXTURE_BLOCK_W * - FFALIGN(avctx->height, 16) / TEXTURE_BLOCK_H * + ctx->tex_size = avctx->width / TEXTURE_BLOCK_W * + avctx->height / TEXTURE_BLOCK_H * ctx->enc.tex_ratio; - ctx->enc.slice_count = av_clip(avctx->thread_count, 1, FFALIGN(avctx->height, 16) / TEXTURE_BLOCK_H); + ctx->enc.slice_count = av_clip(avctx->thread_count, 1, avctx->height / TEXTURE_BLOCK_H); ctx->tex_data = av_malloc(ctx->tex_size); if (!ctx->tex_data) { diff --git a/tests/ref/fate/dxv3enc-dxt1 b/tests/ref/fate/dxv3enc-dxt1 index 3cfd73397e..74849a8031 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, 76767, 0x932ecbfa +0, 0, 0, 1, 76521, 0xed387a5e -- 2.40.1 _______________________________________________ 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".