From patchwork Sun Jan 28 21:13:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Worley X-Patchwork-Id: 45873 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp1196243pzb; Sun, 28 Jan 2024 13:14:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IHUAd/VO7mwino+iq+FHikFR8N+adegX3hCRkZ4ErtK8qMoKGZ5XuMIAdMYuzMA4TMJKgv2 X-Received: by 2002:a17:906:a013:b0:a34:d7db:1ae3 with SMTP id p19-20020a170906a01300b00a34d7db1ae3mr3554426ejy.1.1706476464840; Sun, 28 Jan 2024 13:14:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706476464; cv=none; d=google.com; s=arc-20160816; b=F0cV+CKNK+zdaPBtOXzJNs/Jdy9wICPxRS5SzusTiOLFYLs8HzQOfn+iehVwDwnSkx 4/EGLfe0+8hU7ZMRfakFrCS2lMpGb0jaAlPnpA/qY46c03O5zB2Y6xQx5C6hZG/foLFT 6vv7bVlu3wlIzHPJzxZ9uWcKFQjwnrHD0ZkO1mr8fUWp3ZXo5qdOigiAwG4b/EqNNrOz gpVEgKhFaEcex3ODLAdw/uFQvCn/W5Wzm/fO8aVXxghKF0y9mQ06hIvU2hoWFy3p4x6j Ibr8UOylmKHj8vbIVfurZVLBvfWWpuY0C2met+ADQB9pyyKZDzjGM7Y8wAK7UkesPjL1 MQ1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=LwzvG+LF8ppMDAUfVam32/h0hwq2RvNDZLg4yH5VebY=; fh=4o9WedBEbOrq7GvNs0s+TOKeyzmDZRM3O7oe6ZP6vYM=; b=b+3DGwkFIPyZ5E0quwNmrTScrMpEPq/Fv+mGu3yRsaVoY9E/LvRPcYFB6eqLMJYjLk fG29sOXiEvl1OuyoUPpBYtYCRNrV5WErM3pJgBY9wLYAsDW53+ZQeKj26zRc1W6QAoES 4Ntz15og9ak+SJ9j9LybPUvcR4CQYvYFGmjeIQBOiLRgmUXRb6T8oIgU3qe57huRt5e1 WikEXfQTBcU7ZLFmqLjxBseZ0HQCt1CutqDrF5BShRnZz8azVoLwMtgFHq4Hh9vNY9OJ TxN8JFPFZk0TLocPu297badnVNLIwNREK1cjxpdPhEsHb1GL2W5Z+tZ5iez77m2sGTOP pUeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=CUt6VmAr; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b22-20020a1709062b5600b00a318b87e8b9si3004784ejg.577.2024.01.28.13.14.24; Sun, 28 Jan 2024 13:14:24 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=CUt6VmAr; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8095868D19A; Sun, 28 Jan 2024 23:14:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6000468D192 for ; Sun, 28 Jan 2024 23:14:10 +0200 (EET) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-29065efa06fso1850407a91.1 for ; Sun, 28 Jan 2024 13:14:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706476448; x=1707081248; 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=z0jjvGHejTKv0TDfziM8o+3xGM8byfrM+/B21SqQXK8=; b=CUt6VmArZoXa7PIkIscCnuH0SGoE8YaRvrayYEKtwzHO6qqU7Cw1yiewEcl+lNzEBE N6sCixaTyzyBKMrO0cyrewQ3GfeJccTab38UTpBvqrLCxx7zThRMD936jfzaom6SWzkx 02EtOUeSut7teoe6ayoU4PiaZkeQIg9BWP/ZZ/QmS5QULR8/hl4f4LnaxemtE/kkeehJ LVqFMvEHpW3PG5KbtgiUjgubyO6aZL5ehz8pzAfeob/8fcp7GjI8835bNgGSfMxMWMzl LOdA9AXH1mOFL5xBxiEIPaQXsLRh0jhB7W4phZbs8JVf4NIzRjOFdewI9zQ52ipvcifj WMDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706476448; x=1707081248; 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=z0jjvGHejTKv0TDfziM8o+3xGM8byfrM+/B21SqQXK8=; b=v0GySdlJu2W33leXF/GfXcsUAfgi06+G0zy9WVjgPi1aqhVYUqRu+2Ah9S2bkoIvRy QAKrgz16BgnKwXKJ86zRYn8WRrfKY+CWecZkJSu611aVGHkKVKlg2+TTWh6YVkJbjb6V 0nCcpbZdFQi0QdU8qYs9l+O89zvnfHVOmqkTpEfm80gT4mXGznQQf4QXF6tbWn9L7gxj k8HzW/7TDFMK8N38IyxGCiLoqu9C0J9P7raENvdNIWTRV43dfph69BYLR0+3FqhbrQJk ZYBTstD5xis0LqCmW4fLcFCt/sDbbaZ7Rh4ATDz0j9Vo5QlY1XayH8O2tvRb5kfEQ32C uBTQ== X-Gm-Message-State: AOJu0YxQsPQ5w07uBs7EaJTIuFbLUrxjkQf/Jdeg16EVTom50d+D5SBq N9iTNDPtr88ajUcsbevCmtJX+Kb078rm9LOt3g7k4USN6ZrHCeZtaxJNOkLqTkY= X-Received: by 2002:a17:90b:1253:b0:290:c2cd:6aac with SMTP id gx19-20020a17090b125300b00290c2cd6aacmr2289516pjb.6.1706476448157; Sun, 28 Jan 2024 13:14:08 -0800 (PST) Received: from localhost ([2601:647:4600:84e0:cd8b:a23d:3457:1538]) by smtp.gmail.com with UTF8SMTPSA id pl14-20020a17090b268e00b002906a444b2esm4773398pjb.7.2024.01.28.13.14.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 28 Jan 2024 13:14:07 -0800 (PST) From: Connor Worley To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jan 2024 13:13:35 -0800 Message-Id: <20240128211335.58631-3-connorbworley@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240128211335.58631-1-connorbworley@gmail.com> References: <20240128211335.58631-1-connorbworley@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavc/dxv: remove ctx fields that can be derived from texdsp ctxs 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TVngmRO4pZoo Signed-off-by: Connor Worley --- libavcodec/dxv.c | 53 ++++++++---------------------------------------- 1 file changed, 9 insertions(+), 44 deletions(-) diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index cae5d8a92f..b29adf8ad9 100644 --- a/libavcodec/dxv.c +++ b/libavcodec/dxv.c @@ -39,20 +39,12 @@ typedef struct DXVContext { uint8_t *tex_data; // Compressed texture uint8_t *ctex_data; // Compressed chroma texture - int tex_rat; // Compression ratio - int tex_step; // Distance between blocks - int ctex_step; // Distance between blocks + int64_t tex_size; // Texture size int64_t ctex_size; // Chroma texture size uint8_t *op_data[4]; // Opcodes int64_t op_size[4]; // Opcodes size - - int texture_block_w; - int texture_block_h; - - int ctexture_block_w; - int ctexture_block_h; } DXVContext; /* This scheme addresses already decoded elements depending on 2-bit status: @@ -865,9 +857,6 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, cavctx.coded_height = avctx->coded_height / 2; cavctx.coded_width = avctx->coded_width / 2; - ctx->texture_block_h = 4; - ctx->texture_block_w = 4; - avctx->pix_fmt = AV_PIX_FMT_RGBA; avctx->colorspace = AVCOL_SPC_RGB; @@ -878,8 +867,6 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, texdsp_ctx.tex_funct = ctx->texdsp.dxt1_block; texdsp_ctx.tex_ratio = 8; texdsp_ctx.raw_ratio = 16; - ctx->tex_rat = 8; - ctx->tex_step = 8; msgcomp = "DXTR1"; msgtext = "DXT1"; break; @@ -888,8 +875,6 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, texdsp_ctx.tex_funct = ctx->texdsp.dxt5_block; texdsp_ctx.tex_ratio = 16; texdsp_ctx.raw_ratio = 16; - ctx->tex_rat = 4; - ctx->tex_step = 16; msgcomp = "DXTR5"; msgtext = "DXT5"; break; @@ -901,16 +886,8 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, ctexdsp_ctx.tex_funct = ctx->texdsp.rgtc1u_gray_block; ctexdsp_ctx.tex_ratio = 16; ctexdsp_ctx.raw_ratio = 4; - ctx->tex_rat = 8; - ctx->tex_step = 32; - ctx->ctex_step = 16; msgcomp = "YOCOCG6"; msgtext = "YCG6"; - ctx->ctex_size = avctx->coded_width * avctx->coded_height / 4; - ctx->texture_block_h = 4; - ctx->texture_block_w = 16; - ctx->ctexture_block_h = 4; - ctx->ctexture_block_w = 4; avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->colorspace = AVCOL_SPC_YCOCG; break; @@ -922,16 +899,8 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, ctexdsp_ctx.tex_funct = ctx->texdsp.rgtc1u_gray_block; ctexdsp_ctx.tex_ratio = 16; ctexdsp_ctx.raw_ratio = 4; - ctx->tex_rat = 4; - ctx->tex_step = 64; - ctx->ctex_step = 16; msgcomp = "YAOCOCG10"; msgtext = "YG10"; - ctx->ctex_size = avctx->coded_width * avctx->coded_height / 4; - ctx->texture_block_h = 4; - ctx->texture_block_w = 16; - ctx->ctexture_block_h = 4; - ctx->ctexture_block_w = 4; avctx->pix_fmt = AV_PIX_FMT_YUVA420P; avctx->colorspace = AVCOL_SPC_YCOCG; break; @@ -956,7 +925,6 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, texdsp_ctx.tex_funct = ctx->texdsp.dxt5_block; texdsp_ctx.tex_ratio = 16; texdsp_ctx.raw_ratio = 16; - ctx->tex_step = 16; } else if (old_type & 0x20 || version_major == 1) { tag = DXV_FMT_DXT1; msgtext = "DXT1"; @@ -964,12 +932,10 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, texdsp_ctx.tex_funct = ctx->texdsp.dxt1_block; texdsp_ctx.tex_ratio = 8; texdsp_ctx.raw_ratio = 16; - ctx->tex_step = 8; } else { av_log(avctx, AV_LOG_ERROR, "Unsupported header (0x%08"PRIX32")\n.", tag); return AVERROR_INVALIDDATA; } - ctx->tex_rat = 1; break; } @@ -985,7 +951,6 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, /* Encoder copies texture data when compression is not advantageous. */ if (bytestream2_get_byte(gbc)) { msgcomp = "RAW"; - ctx->tex_rat = 1; decompress_tex = dxv_decompress_raw; } @@ -1003,14 +968,20 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, return AVERROR_INVALIDDATA; } - ctx->tex_size = avctx->coded_width * avctx->coded_height * 4 / ctx->tex_rat; + ctx->tex_size = avctx->coded_width / (texdsp_ctx.raw_ratio / (avctx->pix_fmt == AV_PIX_FMT_RGBA ? 4 : 1)) * + avctx->coded_height / TEXTURE_BLOCK_H * + texdsp_ctx.tex_ratio; ret = av_reallocp(&ctx->tex_data, ctx->tex_size + AV_INPUT_BUFFER_PADDING_SIZE); if (ret < 0) return ret; - if (ctx->ctex_size) { + if (avctx->pix_fmt != AV_PIX_FMT_RGBA) { int i; + ctx->ctex_size = cavctx.coded_width / ctexdsp_ctx.raw_ratio * + cavctx.coded_height / TEXTURE_BLOCK_H * + ctexdsp_ctx.tex_ratio; + ctx->op_size[0] = avctx->coded_width * avctx->coded_height / 16; ctx->op_size[1] = avctx->coded_width * avctx->coded_height / 32; ctx->op_size[2] = avctx->coded_width * avctx->coded_height / 32; @@ -1030,12 +1001,6 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, ret = decompress_tex(avctx); if (ret < 0) return ret; - { - int w_block = avctx->coded_width / ctx->texture_block_w; - int h_block = avctx->coded_height / ctx->texture_block_h; - if (w_block * h_block * ctx->tex_step > ctx->tex_size * 8LL) - return AVERROR_INVALIDDATA; - } ret = ff_thread_get_buffer(avctx, frame, 0); if (ret < 0)