From patchwork Wed Jan 24 19:52:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45804 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp1511687pzf; Wed, 24 Jan 2024 12:06:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IEQf9m3wrFTf1N/wrc1dDcA5drkChFl1gfcnAHj7tbNNJ4VsZdsb2i8JQH56OTpG4UoR0EB X-Received: by 2002:a17:906:eb18:b0:a28:d32e:586a with SMTP id mb24-20020a170906eb1800b00a28d32e586amr1125191ejb.118.1706126773563; Wed, 24 Jan 2024 12:06:13 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id zh14-20020a170906880e00b00a2d3b4c6711si192673ejb.12.2024.01.24.12.06.13; Wed, 24 Jan 2024 12:06:13 -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=@outlook.com header.s=selector1 header.b=FfdDSzwQ; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DFE1D68D145; Wed, 24 Jan 2024 22:06:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2077.outbound.protection.outlook.com [40.92.64.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B60B768D131 for ; Wed, 24 Jan 2024 22:05:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=feiJV1rEin8jeLNgKn/DlCdX2PWc8gfev4doyn4PSLI9B9CwTdtEn9aVDvVP/LRPmPOv+kyeTgsGr+xXiA0cj4+w0VLUyU7xmmOIR9WXlKRE6ZNo02W3ofSfTZjolDiht0OI0ab1tHFsyALrVx4HKFTrGgqwwuuHP/3Tm+vpDcdsfcXAJQn5+Hbmgdjbh/XevNcXiaiaPd14+G/WJug9cz2vn+JzgKBC1qVQI5bzmlppNpxiqMrFvwfH8AS/evsc3/bi940U7zmNQr/qUeB97ZsWUL4XL1R+lpEs6V61QY3pMUJhPNqpTwezDF5FZm4XUvP89YLyTlD5TjtM7YUShA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=315qFzAPzhmJUx0KGcfP4ADG+FedE6OdMzVrIRMDZVw=; b=GgPr9otftUKWI0KGOg3GsJnkv2EUuvwn5otwlrGCzMqUeWTtSAxsneim06MPCQeSV4jY/VYYczvxJYykjOQWovJMcS6j8vlTpEGMgT8IhxR8sxdtJl71S0qrHP4jvJWu+ITJ/KJURsXElcawLix9Hju4V/u4jRMi88C5L8RYrbbQ86+FVndXeokIWbzqSbCTF4sblMcyxSJ8oXqwU3uPaUyyOezArP5psyJpcW7P9RqLlhf2rMEuEG6QRxkCYFsh2u3ZLgivggzdUvEQ+37ZM0EM480iLNmnfKd7b67veL8tV66EDcPs5ksZt5MYvFaSo4pjqWd/iBetMeuUKbhX0Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=315qFzAPzhmJUx0KGcfP4ADG+FedE6OdMzVrIRMDZVw=; b=FfdDSzwQj+H0rt3tXIOsYIxYFUug7EsMcj54t1u7zoKm52Iz3d58H/O7duJviLQE8zY+Pvvo5HPw9LXdj82+uTj3xaxSEZemqYrDssz4b6lGDMdb3yK0cA+VYYrwYMkrbTdW5aS5l0Sk8eu35PUN+OBGEC2vsuakn4ZXBO5vOBr5ysrUCZ5ZWIu3LVZFBjinHIMxywA0IjGI5TfY2iJd6s/OB2F05sbW/5Xq0rafhrPrDOSpQzOJUpKpoYg5GN0rugBA+Ag1kf3x8KHLvwxuLdA83Yxz4HUTR3fb10I7K4rosCszm+a9i/mpuVNNei6WeHJhL80i/uzilmjBVqorzw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0350.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.37; Wed, 24 Jan 2024 19:51:28 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Wed, 24 Jan 2024 19:51:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 20:52:36 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [RrBXU7RNc7jUrg9+fd+jAJ5BhNF7SCyISmyI6HGjkjg=] X-ClientProxiedBy: ZR0P278CA0019.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240124195239.558681-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0350:EE_ X-MS-Office365-Filtering-Correlation-Id: 7b90afde-b5f7-4828-24db-08dc1d15da5c X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Sul85qEKRUccbt/ojfSgF99FybTMRI6r4ktCJ6cpvNjPV1CqILIqsEVeqnAxFQbr8a5Fni8B3nsdcxbdBELKod2anVqks29UnT0mMglJKyI/ZHlC05CCYEVTdteXFIr/kHNAATqi2hsf7mpisxdmCjgDUpT2EtniuGe/WHztkJanxEKnAzx5f4mY6HvXhWQ5R5V4+M8WRk5EVJc07KVKLKjJAEDezTOxJ8DpAFvFmT9jH8RnLAqa2kCU3tGuEc8N7sFotSlYwam8+akBSvzNK20Ir2FetoXc7op3/cN8/E8gByJOl1OpmU4fEvSAHZRz0o5G0RNyPsyh29GmNwigBq0pIo5I0xm7yvUYM9kAx4Bqc0SDhtLSkyMjK1GbbJeRE0sZ5mrJ69xn5GjsC8uG5Ru32RXQZXq93HW1WixkOAzpM289ZAxr+Im/BQru7Raq9z82k63uEBT8GVNb5c2mwtGDVxMIkiQuQi/nasyhQwYFko9UJFa5v5Al8XKbvmqy0bBD574HAPOwQHqz6/Goz/3/bY2adRKIdXIVqOr1HCaWh0nSA6cnejn3nBWHJPGXY9idTAj76Htup750vF2R25uYXnEM1dyBs0bp27hI1hZMVEgey46mHUhmh5sIwia3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kqragtSSGBguhkIBpHJT+t+sC/n17tdjjKmfBL9/LR3uAZYlcRQn85i5ExbAucyoeZUCMLHnA+XNIoY0FNP3S8y6aKFCS41PyJ2HWQwp5YEd3BLUvFPFzICH48obDNJoEF8PZaqbmO5wB9hpHIoWa6++9/r7R/pr5UrF9zyb8h3wQquyv8gIZ1hChkfQ1mOa6lIyyCNP8r7el8XuBEUa1ITbF/Gan3BX0YNyyZtl51hWYcYAsScgo0L4X/+6BbVbxLnIIvnYkSm91w8leuUMizZfDJTwEWquziM6k91LEKxW/NnWGPM8psWCVPtE6CwbcmDwaBYhNSZ00r6QH90mTgCgfmEM4pKrst+My3vrY/mdcm7m/v8cLtafGJ8IyY3lVnT8vWkOVEAWbYuzOIjh+WJTkYT5Sy4twtF0wIKT/gFctRtztZeR014CQHxKTl1jomMmyhLhakpiW28bYW6rD/UBJHsoB1BbrcRu+RW+QbyD9BYa8lYKdW5ZV/5K2Bo3u/Igb3mQFeqi0ToLWaG7hAIheUNozQP273MkNL8l96fBp9qrEd6CZgGZHg5YuWaJTttL3TXLogAQabAoMnh9cu7MyUWNTiCU+UpyN9klBsLILwgDYek4KXyntXX0vpdxE/cQthKXjpptY/wSDKap9nGy4an5Drf0mPH6rBvK5k3QsnDrisW8opaXSa4KQSO7W4wbM9zTHXX4LSlSLKtxraYptMaeZbUmb5TIyjWE55/eDb27w2DaLveFylXZvKo1UCjg7MYiMJdC9pfw8pmoGLbQwuQHUJswtdQPpfbWmLxclJht3Jo+f6jiD45D6MeJGXL1JUqgPQvGRWT4SHIhP14YmPYFr4+w1gluy0GbqP8ZneGILJ29aHmAEymNUalmBTmh3XC+qR4mHPFnDbY9cSmTIM7nEtquyK9IvVH8Z7zpOEHljhqeGHUNnZhzK32He87o5OuXkxxA05F3rqVMIBmSjgKfAZnWXuALtG0Zaaf3nGGKz1ksJtBF16D+c0OU99iRWEkb0Jy0Mw/Zq/0jp4+PI8pEfqcKiY7e4AGoSjga4KNa16fbA9GnDecIKFyTWpdvJMgQHXnlM3gVrQj5b46BqD6be3dhNjZYo7mBxntT60qoCfDRYB0bx5fopqSeqoDYvPmCfcrdH0gPfvJGV6+X9l3Fl4Z2NayqdvZkrbjVTQQzIqOH/qk0Cv5V7oJlAr1Tlg63+2cP9gv7qJPAd7Ko0M6aSB5H1i3LR0VPe82MQP02p05FGs9RHmfUSTj+ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b90afde-b5f7-4828-24db-08dc1d15da5c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2024 19:51:27.6890 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2P250MB0350 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/dxvenc, hap(dec|enc): Move TextureDSPContext to stack 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: U4WLEljPkMyf Only used during init. Signed-off-by: Andreas Rheinhardt --- libavcodec/dxvenc.c | 6 +++--- libavcodec/hap.h | 1 - libavcodec/hapdec.c | 15 ++++++++------- libavcodec/hapenc.c | 9 +++++---- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/libavcodec/dxvenc.c b/libavcodec/dxvenc.c index 94e522d72b..796f70da02 100644 --- a/libavcodec/dxvenc.c +++ b/libavcodec/dxvenc.c @@ -110,7 +110,6 @@ static void ht_delete(HTEntry *ht, const AVCRC *hash_ctx, typedef struct DXVEncContext { AVClass *class; - TextureDSPContext texdsp; PutByteContext pbc; uint8_t *tex_data; // Compressed texture @@ -267,6 +266,7 @@ static int dxv_encode(AVCodecContext *avctx, AVPacket *pkt, static av_cold int dxv_init(AVCodecContext *avctx) { DXVEncContext *ctx = avctx->priv_data; + TextureDSPContext texdsp; int ret = av_image_check_size(avctx->width, avctx->height, 0, avctx); if (ret < 0) { @@ -275,12 +275,12 @@ static av_cold int dxv_init(AVCodecContext *avctx) return ret; } - ff_texturedspenc_init(&ctx->texdsp); + ff_texturedspenc_init(&texdsp); switch (ctx->tex_fmt) { case DXV_FMT_DXT1: ctx->compress_tex = dxv_compress_dxt1; - ctx->enc.tex_funct = ctx->texdsp.dxt1_block; + ctx->enc.tex_funct = texdsp.dxt1_block; ctx->enc.tex_ratio = 8; break; default: diff --git a/libavcodec/hap.h b/libavcodec/hap.h index fb5a4c4123..a888b58fd7 100644 --- a/libavcodec/hap.h +++ b/libavcodec/hap.h @@ -61,7 +61,6 @@ typedef struct HapChunk { typedef struct HapContext { AVClass *class; - TextureDSPContext dxtc; GetByteContext gbc; enum HapTextureFormat opt_tex_fmt; /* Texture type (encoder only) */ diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c index fee3c04d84..64e0494370 100644 --- a/libavcodec/hapdec.c +++ b/libavcodec/hapdec.c @@ -337,6 +337,7 @@ static int hap_decode(AVCodecContext *avctx, AVFrame *frame, static av_cold int hap_init(AVCodecContext *avctx) { HapContext *ctx = avctx->priv_data; + TextureDSPContext dxtc; const char *texture_name; int ret = av_image_check_size(avctx->width, avctx->height, 0, avctx); @@ -350,7 +351,7 @@ static av_cold int hap_init(AVCodecContext *avctx) avctx->coded_width = FFALIGN(avctx->width, TEXTURE_BLOCK_W); avctx->coded_height = FFALIGN(avctx->height, TEXTURE_BLOCK_H); - ff_texturedsp_init(&ctx->dxtc); + ff_texturedsp_init(&dxtc); ctx->texture_count = 1; ctx->dec[0].raw_ratio = 16; @@ -361,25 +362,25 @@ static av_cold int hap_init(AVCodecContext *avctx) case MKTAG('H','a','p','1'): texture_name = "DXT1"; ctx->dec[0].tex_ratio = 8; - ctx->dec[0].tex_funct = ctx->dxtc.dxt1_block; + ctx->dec[0].tex_funct = dxtc.dxt1_block; avctx->pix_fmt = AV_PIX_FMT_RGB0; break; case MKTAG('H','a','p','5'): texture_name = "DXT5"; ctx->dec[0].tex_ratio = 16; - ctx->dec[0].tex_funct = ctx->dxtc.dxt5_block; + ctx->dec[0].tex_funct = dxtc.dxt5_block; avctx->pix_fmt = AV_PIX_FMT_RGBA; break; case MKTAG('H','a','p','Y'): texture_name = "DXT5-YCoCg-scaled"; ctx->dec[0].tex_ratio = 16; - ctx->dec[0].tex_funct = ctx->dxtc.dxt5ys_block; + ctx->dec[0].tex_funct = dxtc.dxt5ys_block; avctx->pix_fmt = AV_PIX_FMT_RGB0; break; case MKTAG('H','a','p','A'): texture_name = "RGTC1"; ctx->dec[0].tex_ratio = 8; - ctx->dec[0].tex_funct = ctx->dxtc.rgtc1u_gray_block; + ctx->dec[0].tex_funct = dxtc.rgtc1u_gray_block; ctx->dec[0].raw_ratio = 4; avctx->pix_fmt = AV_PIX_FMT_GRAY8; break; @@ -387,8 +388,8 @@ static av_cold int hap_init(AVCodecContext *avctx) texture_name = "DXT5-YCoCg-scaled / RGTC1"; ctx->dec[0].tex_ratio = 16; ctx->dec[1].tex_ratio = 8; - ctx->dec[0].tex_funct = ctx->dxtc.dxt5ys_block; - ctx->dec[1].tex_funct = ctx->dxtc.rgtc1u_alpha_block; + ctx->dec[0].tex_funct = dxtc.dxt5ys_block; + ctx->dec[1].tex_funct = dxtc.rgtc1u_alpha_block; ctx->dec[1].raw_ratio = 16; ctx->dec[1].slice_count = ctx->dec[0].slice_count; avctx->pix_fmt = AV_PIX_FMT_RGBA; diff --git a/libavcodec/hapenc.c b/libavcodec/hapenc.c index 7de7358e3d..2c8bc8e16a 100644 --- a/libavcodec/hapenc.c +++ b/libavcodec/hapenc.c @@ -232,6 +232,7 @@ static int hap_encode(AVCodecContext *avctx, AVPacket *pkt, static av_cold int hap_init(AVCodecContext *avctx) { HapContext *ctx = avctx->priv_data; + TextureDSPContext dxtc; int corrected_chunk_count; int ret = av_image_check_size(avctx->width, avctx->height, 0, avctx); @@ -247,26 +248,26 @@ static av_cold int hap_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } - ff_texturedspenc_init(&ctx->dxtc); + ff_texturedspenc_init(&dxtc); switch (ctx->opt_tex_fmt) { case HAP_FMT_RGBDXT1: ctx->enc.tex_ratio = 8; avctx->codec_tag = MKTAG('H', 'a', 'p', '1'); avctx->bits_per_coded_sample = 24; - ctx->enc.tex_funct = ctx->dxtc.dxt1_block; + ctx->enc.tex_funct = dxtc.dxt1_block; break; case HAP_FMT_RGBADXT5: ctx->enc.tex_ratio = 16; avctx->codec_tag = MKTAG('H', 'a', 'p', '5'); avctx->bits_per_coded_sample = 32; - ctx->enc.tex_funct = ctx->dxtc.dxt5_block; + ctx->enc.tex_funct = dxtc.dxt5_block; break; case HAP_FMT_YCOCGDXT5: ctx->enc.tex_ratio = 16; avctx->codec_tag = MKTAG('H', 'a', 'p', 'Y'); avctx->bits_per_coded_sample = 24; - ctx->enc.tex_funct = ctx->dxtc.dxt5ys_block; + ctx->enc.tex_funct = dxtc.dxt5ys_block; break; default: av_log(avctx, AV_LOG_ERROR, "Invalid format %02X\n", ctx->opt_tex_fmt);