From patchwork Mon Mar 4 12:46:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46746 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2775565pzb; Mon, 4 Mar 2024 04:44:31 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUEr1mpsrNzrqH1CC1+bzvF8b0k7e7eOfIUwRwzIHj5o4OjeaYuo4YjDO0Aa6bO2+x28bI28us+IlHRXgk4rYkhxnGKyOEUtsJInw== X-Google-Smtp-Source: AGHT+IF+QWN28vybB/2shpdb6wEKwBlWpgHa2/VhAA5kR0G9FCsmWLzAPEyPyZ+HbzWGmdwfc9sj X-Received: by 2002:a17:906:f8d6:b0:a45:2e21:c78c with SMTP id lh22-20020a170906f8d600b00a452e21c78cmr2331239ejb.13.1709556270885; Mon, 04 Mar 2024 04:44:30 -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 bh6-20020a170906a0c600b00a45464679bbsi805192ejb.76.2024.03.04.04.44.30; Mon, 04 Mar 2024 04:44:30 -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=kxgdVwoa; 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 A26DB68CFFE; Mon, 4 Mar 2024 14:44:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2054.outbound.protection.outlook.com [40.92.58.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BF6C68CFFE for ; Mon, 4 Mar 2024 14:44:21 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NZ/dPlKoQNrxpCXKkkzr0N+eye1NeJsIgMVbRV4KHswNBayv6VdFfaUZZS9E83kdfpzv3VOzGVTsVmm52l0CHGjdTkbY7SmIyynm9pcok3VvpacNqSBrgbEAFuB7v2PWdbMHe7fQouffCJUvfd0UN0UDLaP46v/cNL2wlwnvEo0X54ZRKq8geHEOnKz0yAkQsOA33trC/B5AvgQl4dyeL/jTVt1DSBV4AG8WIt33krsET765t+Nmh3091+FDCuXq42p7Y/BTaTYA9SB3gBO7kVunOPsXP+rHDVi2JFsDhsqe6PjmFDvZFTH2zEWFHZHgPHtM7FGAiw1tQ15RC7WlEg== 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=OkTHPezX38agQwpY3NJN2dtVFQtpsVKWzYyWYq7fDDs=; b=eFr+ANPVFr0KbsMLccVi4s0X1hXTjzUvM+7AI4ed3IWqLMqOxQSDKdiT0zyQ4mVy1YSF4b8w8FzmC1fR26ngJ2TUKVZnn0yuWBjbQjqocwbiLWbA0AhuH/8q34CGo1AJhjpzK/54OCpZ3wDDRGxkdk3mQh+ZKI6n0meQfFewW81nFPw4seFD+bGm7ABprzU0hrVKE/DsCSBP0P+P76kpQHnnMDbxorBZvQGzTUk0J9vuknJtwhPIIHx9/lLOVJc8kjK0tRPCMatD8KUqXiM3pEOXsT8y5/z4MnXcsx4rbsHAv3izZgGRIlIxeY+DnfMVKUEA4nHuWZNUe9nxzAwaLA== 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=OkTHPezX38agQwpY3NJN2dtVFQtpsVKWzYyWYq7fDDs=; b=kxgdVwoar+OLXdfn8PPCffKf39Kptjom2oi4nTWsnEb6KajFcXEnHVJ5jWcBFwrAIvNVf+JMc/G46pwh3/uuoVQTX8ZR/IQMfERsHFszr5nhdCBBh0Vwtet7tk9KI7trY4tmW1gygfI5J1/UX8sc0aDaD0b+xrL2ARKC2knTzR+2l6b2W5B9/t/qOnom4TZ4Tp2iWk7Qrq5l52+sqwaLFrLS0UVXdTnS5W8uHl77sz2gWgNPaTWCB7gwR7WhqaDuZwYSewKTTjHvqWqphycOX5ZZSbeBWiCbKi/xQ/aaz2UvR0WH7DP+4uk7RMr0CxvW7LaOdvkOedw9DgKBn2GXfA== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PRAP250MB0490.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:290::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.37; Mon, 4 Mar 2024 12:44:19 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc%3]) with mapi id 15.20.7292.036; Mon, 4 Mar 2024 12:44:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 13:46:01 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [KgMLj7D4X2tCVYt/mUgozJwiTn+GiMrcavp2I7txtuE=] X-ClientProxiedBy: ZR0P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::7) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <20240304124601.1276245-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PRAP250MB0490:EE_ X-MS-Office365-Filtering-Correlation-Id: 449faac5-1b1a-453b-338b-08dc3c48cf2d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dkm2Up4K95wi5qBvh6R/ceGc8LEzHgrApiRcmdmo7+RQxz1NOpxXLDGdDxEUHf46LzMXs4qo9oWoZY76O9noGApvT7hLAKg9W2DgIchYBhnLfF6iva8IsL4HN74rJyn12kAXGwfdySMPWmjJsZQyW55lXbTr+wEuYxe4bPuYUbaM6pJucg63v9IGupAhOJgdLhuScSVq2dTECYtymeCse8iQ9xDwUr/1HtleKApqhg8o8VBEH2fs+4wiQB1KWmgHQvFfJ1K1fMCUF/JeA5jvigKopoNqhfrzHRLmJC6ajsQTVn3Rl5oIRxiVkYXG+SLwX+O0cESW6vCtXTNIuVWiCppH4+N5gla07QgfBY86JL5Pe5wIlOxa6AG7RVgPYV9QWpF8cwjyX6GARGo8iSfvhCCVUeMtLhA309g+ErqDbgQ5OZfz4QCUhpjJkgHN1Mm5ZW/sfjwnw9M2kRYbuOlVLfu7Q3BQQdLfrxRtGOxJIDCIQMCXrpi4kHWXwTJxLtGzANBwMnpywkmJ90o/Kej6FSwLugMUNFItHttVE/2Ryp+dxxPqpD/m1l9bUQxW4v2AddBKe9ORbpFPKJcHoqRO7iOl8weYvFX3XPnhIFEdz/VbY/6lmx08ZMYjxZHpPrLO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GueIPRmUIciUyWwbWUNnBabG9H/qnmsaLF/2icTOqnuwm0v4RlfVX9yPG5xBlMO0YRWmyOwLvFGhgn2WQEcb5e8bqKUJuI6b6miJHpgqch5VngsSNuU83A5/GBYi906/WoAfqtSXHds2VRn5KBmffpMh4u9RHI+M8G7RwMNRaIi9Z2n3nA4+e5CyzaPvuo71pvK7FpcDMesTGtk74F4yM/07DAozJtPb6h7s/rK4rB7TTawev/GzjLeTwrwgODmGa20OowUteFOUvan/1MNW66J/C4jL64bi7UKVzzYmlBUBnD5g1lUIcGTehhJkkJTUwE6lyt3xr8KWbdUMdMa5m4fKjaixFHYd9npnMS92KE5hCIuLt5GFW4ZR7UPf3X+qxefNGsrOhNOTilqZiynCCJYPEim4XM4PRBkhA//wKH3k1z3TAkiZ+AlWmziKuFeDDPlcMUmrdwWExApGLWYcp5tE6lHkDO3EeVBpNKNpLQqZgtnLs4vPcs4J4BfY+jOA5d0mjW/w0gBCSxxYquMkbd4moSyMkSQ3O/dhz7Y0kHUyF/jYRPcY1h45+vn0jdbcXugvnt8LU3HUn8UM45V2/vsKJiAuuFFD3ko4guGwcjuUecDPiN5z3K5R+El0zoXAlULU+onfywIqtvkrXWS/4dNQDcLl2d98cDTtyGnLilDWYi2QsjOQHDoBd/iDCpSvOfNEG29yn6v1C1gsDUWZXZcO8RVtH6a0gkVaEqQotkko/QRTzjDmevazbmPmHW5sfxhnuyV760J0mmCkjkj87NyNeP2yISmLJw7GTCRMihi9NF3tVk1/jzmnAYyucbtQZ4+keNbaYh8AouJJYW6x+A1FMRiIhV1vzIgDHEGjqCATzGSRrgWfm9Faev9K5zsKXbpPdYEFwBQes1TXSj5IC4Kx9mOnN7HDnEgKkyCTXadYj3NxeqICcVW+qHR7uxbdmXmZoO9Bsj7TDlK7JpLogahnDQ4PDuTD6EdlphKfJ6+iw8M4WgmdqYlBOc6N3wf4FmJyQNmlY0jHeMZQq4P7r8YDZJkgUmy2xW+/DUvqHGFW/zKDIkYdkPlq0CD+tfnisgMc1rI+8XViSk5n96lQD4Rj7RZ+lrq4KN1KgHl3Hz8AM/GrE/QMQr9Ufq2Iq5V+DAXkkBZ1gTkAFbQaKR/bKLvCOFrHCnXMToQfscHNwRLkfmXFekt/qlXXiuXn1pj9v/Yg/KFtLzOhvSKJGRv+DWeotDtRvOCnLqmVfn1Xf6Y/A/W949MEiY2RV2pF4OlWrL8/KNdNHFkDOzwptdIKtQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 449faac5-1b1a-453b-338b-08dc3c48cf2d X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2024 12:44:19.3094 (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: PRAP250MB0490 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/hq_hqa: Make VLC tables static 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: a30WwzORVjRA Signed-off-by: Andreas Rheinhardt --- libavcodec/hq_hqa.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c index 510a66fd91..096fb65dc7 100644 --- a/libavcodec/hq_hqa.c +++ b/libavcodec/hq_hqa.c @@ -22,6 +22,7 @@ #include "libavutil/attributes.h" #include "libavutil/mem_internal.h" +#include "libavutil/thread.h" #include "avcodec.h" #include "bytestream.h" @@ -53,11 +54,12 @@ typedef struct HQContext { AVCodecContext *avctx; HQDSPContext hqhqadsp; - VLC hq_ac_vlc; - VLC hqa_cbp_vlc; DECLARE_ALIGNED(16, int16_t, block)[12][64]; } HQContext; +static VLCElem hq_ac_vlc[1184]; +static VLCElem hqa_cbp_vlc[32]; + static inline void put_blocks(HQContext *c, AVFrame *pic, int plane, int x, int y, int ilace, int16_t *block0, int16_t *block1) @@ -87,7 +89,7 @@ static int hq_decode_block(HQContext *c, GetBitContext *gb, int16_t block[64], } for (;;) { - val = get_vlc2(gb, c->hq_ac_vlc.table, 9, 2); + val = get_vlc2(gb, hq_ac_vlc, 9, 2); if (val < 0) return AVERROR_INVALIDDATA; @@ -195,7 +197,7 @@ static int hqa_decode_mb(HQContext *c, AVFrame *pic, int qgroup, if (get_bits_left(gb) < 1) return AVERROR_INVALIDDATA; - cbp = get_vlc2(gb, c->hqa_cbp_vlc.table, 5, 1); + cbp = get_vlc2(gb, hqa_cbp_vlc, 5, 1); for (i = 0; i < 12; i++) memset(c->block[i], 0, sizeof(*c->block)); @@ -372,33 +374,24 @@ static int hq_hqa_decode_frame(AVCodecContext *avctx, AVFrame *pic, return avpkt->size; } -static av_cold int hq_init_vlcs(HQContext *c) +static av_cold void hq_init_vlcs(void) { - int ret = vlc_init(&c->hqa_cbp_vlc, 5, FF_ARRAY_ELEMS(cbp_vlc_lens), - cbp_vlc_lens, 1, 1, cbp_vlc_bits, 1, 1, 0); - if (ret < 0) - return ret; + VLC_INIT_STATIC_TABLE(hqa_cbp_vlc, 5, FF_ARRAY_ELEMS(cbp_vlc_lens), + cbp_vlc_lens, 1, 1, cbp_vlc_bits, 1, 1, 0); - return vlc_init(&c->hq_ac_vlc, 9, NUM_HQ_AC_ENTRIES, - hq_ac_bits, 1, 1, hq_ac_codes, 2, 2, 0); + VLC_INIT_STATIC_TABLE(hq_ac_vlc, 9, NUM_HQ_AC_ENTRIES, + hq_ac_bits, 1, 1, hq_ac_codes, 2, 2, 0); } static av_cold int hq_hqa_decode_init(AVCodecContext *avctx) { + static AVOnce init_static_once = AV_ONCE_INIT; HQContext *ctx = avctx->priv_data; ctx->avctx = avctx; ff_hqdsp_init(&ctx->hqhqadsp); - return hq_init_vlcs(ctx); -} - -static av_cold int hq_hqa_decode_close(AVCodecContext *avctx) -{ - HQContext *ctx = avctx->priv_data; - - ff_vlc_free(&ctx->hq_ac_vlc); - ff_vlc_free(&ctx->hqa_cbp_vlc); + ff_thread_once(&init_static_once, hq_init_vlcs); return 0; } @@ -411,7 +404,5 @@ const FFCodec ff_hq_hqa_decoder = { .priv_data_size = sizeof(HQContext), .init = hq_hqa_decode_init, FF_CODEC_DECODE_CB(hq_hqa_decode_frame), - .close = hq_hqa_decode_close, .p.capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };