From patchwork Sat Jun 15 17:16:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49933 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1058952vqg; Sat, 15 Jun 2024 10:17:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVYwEJnou0iLXNYWcWlaC4yMMSV8qRxfYQsNeFe83CHBVvTjMt9THjvKaS0HOIthLe9QKhXQ4wiyF9QGLUnADN0rdnAhyuk0btO8w== X-Google-Smtp-Source: AGHT+IFsh2WM6CN1CXknwnbahkAp++N+VybKkmcj+XXWSSUasXVP45hxmvTPGmy7FcKPQuqAurRo X-Received: by 2002:a50:8d45:0:b0:57c:6ba4:3d8a with SMTP id 4fb4d7f45d1cf-57cbd66341fmr3510234a12.10.1718471868591; Sat, 15 Jun 2024 10:17:48 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57cb7478286si2995767a12.639.2024.06.15.10.17.48; Sat, 15 Jun 2024 10:17:48 -0700 (PDT) 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=ttR1q8lP; 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 CA87B68D67F; Sat, 15 Jun 2024 20:17:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2076.outbound.protection.outlook.com [40.92.50.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C830968D674 for ; Sat, 15 Jun 2024 20:17:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NKGAQbpDlxxZKjO1Gc1QVV17oDXe3qCnxs7QQL7GPhIi21PTGpyKG0cA4OPhasGuH0okwGYj6wCU7kLf7gRon+Ng+PaOekYieW5oH1JlLs+AJ8f18LBwlSCURp8FM1KEbrOjsubYmRtT0B1KKzHatStKSpm35sRO2IzObEXXGgQ49PYCR6nySPRVQ0uyL5NLFyARvgkQP0hrELKSObjg281UuwZgYHdVTMccCZ7pk8T++DR1IX/5wGT7rf3+5lBpASmZ7bijsOttUZY5JeX8SYAvDMVEij5wafCRVrDKY2wJg0erriBBsPYWt8JBW/bUeviG/vPDUq9aguI2NkN4Aw== 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=4Wv1EccQxpbnqsTgihbfzN0JWosZY1MHQBk8sswP/qY=; b=ga00r94h4TF2lOm5wvW2IQgTVcQsNq7Av40F0dPnOmhonr1tolu/fh2bLfbciJ0MRG7pcqIOOfKMNEGtYvP+9AbXWNPNcJu3EHzfEOxCFargaLToILV4W/OoDeZ0Em2jFD4Y3dxK2AIgeNiPOHK4Cv9H2YzDRL+hsyOcDkXcuGQS1J+O1EpUNK28fokgitGfF1lbMrAl+dSGYuXNj3G6KE/2DdP+e+YSDZFtgK44ay9S0ZUp/MObugdTwaheI2wGG/n8bSOMgX+72opGx5G2iNRZOnS3SK9eoPtWc7xbZ+eMK232/uhQPdXXl5BcIPsdA64RhZM1VyoMjmrZD4X+QA== 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=4Wv1EccQxpbnqsTgihbfzN0JWosZY1MHQBk8sswP/qY=; b=ttR1q8lP+FhPl5IZkQ5DcxPcGynlhr1faXV/VmRTkX02MMzGxz4o8o8nglE7jSa6upxZSBKbQeNAXyr8CWoa+s5bk7gl7gAgy3cWKbVTaD1xyRZZm2K7rR59VzwSdRpS9gurPiouhXqp59RWctjZ9iGX2JqAInmhLJX+9c8VnIPzz7TRsqwe2DRewex2KuikYZ6oSxYKbUGmK2lbxDo8USQP3cA1ehe13rxzo1+IIJykx1w7y9wzebcFDe5jNkXpa+rprshbMU8yjEY3h0/5aDrmWbTRPV7E+1AvSHA16iKq7e8DZkE9oW5xvh7+Uf6dFMC+hPcAcwhfFEGvJcLaqQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0131.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:176::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.28; Sat, 15 Jun 2024 17:17:31 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%5]) with mapi id 15.20.7677.026; Sat, 15 Jun 2024 17:17:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jun 2024 19:16:48 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [FlI0Q4UPzlFhTkK9tC3XKYvWZk84lW1lToCayVRtFk0=] X-ClientProxiedBy: ZR0P278CA0099.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240615171650.3721642-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0131:EE_ X-MS-Office365-Filtering-Correlation-Id: 93d4cde2-983f-4d88-85b0-08dc8d5f0a20 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|440099025|3412199022|1710799023; X-Microsoft-Antispam-Message-Info: PXNRb3bc2/1U2jJWa3hvlTcA2Qy0uZNpcVQLy0ha6YhcXx+3LoE9/6xXrHf8Kped3ukTyC+HxUbHdniVnWzmS1T1ugBRHwlLGAuKmBmB1582zSoAL47gJEbn44hw96sxU+uRjlfFIBZoJXeXFtWjkTaoqD/Ytsc2aXsSvz6NLqUZCUgU/LvNaVbhL9zEWiP+eGU/0baiWxAotinEcxkE03OND32vGCEdbHwPPIm3tfsj6DMh7nTmdeRbwo3nL30eG+DoFYnh/+hsS/BAEPZoaQNBRN6hkU8rNuwelrWeYqIxw+9ggREQwxsZSQ7g6s+7VATAT1jiNroTrRSHAx+TrF3qkPL2DOH2HnoLs4eq66uftqIhDNSImE+3r3lYZ0GU7UcA1Uz3GubSyFPLOZf1+hVUnjuIMWhIqexgMPvZq7xB8KhHXnqap/3Gozo6HitO2hEyDX172e978tQ7oJKXg53/Gt3SicqhPvnNSmPPoC22s7meVsFkPCurlHQaOErG2vxUlgBQjbkE4oqCx+XV2yqvLCMXqeA86AXawqg93cpGeYk0URUWOtsQwTYBYZhpUplNCP6nhmFxzIPqbu+NLKUNGnQJ5836UBqjdxRNMNlJVPhkBwBc+wvU5R65ah6o X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n3l+eMX7tp/EPGHVzDxm2ptd9gzlznBBHHpH7YEqWDhMiaKpmELrl2Zx/KiD9cgqFIpWOSLsCCc/nm8W3yeLGFS+6OMF89TE+WjEVflkLxfVPgKfP9lRb0z2BoE7lCKTKjfZsCXZYLMCm9VWtPpkP1a9Zktu1k7sC1oT+iHcu9RObDUlS7dPsXrlC2DTSrwSA6RYYw7xd0sqA36VmSKr3c5vFjJpkQV4CMfsBQ1OP4JTwc57/Akvg6T9lRPreL6SjayOTU9I52SFDPU9i6+wlpWtLVfsD1IvA/BweKAv9ywkAK3Pf7fFSCwMu7FEajODfxls8dBZKUqMqZOekscoBTrqxGc5vq0RqUiF46DY1VPgmOZOIftIss/eLMvXwaQdmldB/Cfk9XnTjFQjSBPaukOi56hBHRt+7r4O+shAR4RakFmNbCrrEJ6BkMDHR0ZkxScIOvmJmKv3cAlb119XGadsrqbw9jgcIy3mcgAM4qobJPium0hc523aNb+fnoq9YaCDxy+5dudtTNvOh9A+97aDbySAI02BoF+9QHQhnNqdAdJi1gBs3K8vPXJbnOpoiCKxtnwiw+MZJwfhtNx6nZxyMLwGww713y2xNLCL5xt33Ef2D42ZG/BjRPsnTl+zk0nAjm2GSchKhh3gEJLsjZd/TQSDsg2KSlvMCmFShb4rWSJ/Ebv2QWMSZ4myx9ScuvLGbU7X+vA5P6JOv8v6v2beUakQozGvPFssCw7DH1cR0bO1t4x01wGws5bTtA1CtUp8RGbHxiMQP4maOrePOx8t/NSOXNIWfkhdxLiRzJ4vsLdqvW3UQkIfc1aT8ErB/xCVRhoaLHX2jBhYV07uT1krBGz+w0tZXIiU2AG9hsUUd2aU1/S3JEf3N8PYLQPTbNasTYo7j8PRAN2KNeJVWL+2O+e3Dn+0oevjNdWdA34xOA0sreXO9jFA8kY1Govs5vQyNdF9Q3lVEfD/8k7oh419XgDt0jTAXnb+JoCj0o6ETLOT5LAX4k1DJCSw1Rk8WImEuW9MXQB9H6dOPqnc6n6riEvf8sWQ+txv3jLCWK29o+Xqc49C/apk4VydrKPsINVl3GOO2ntVDIDzSDzrIxaq2O83imZXu51ue7GdtuFZlIjx8WKOZox98lc+29LSn6Q/PX61OSIxfjqvY6Np4bsHLIoHNvOqfp4MTmGIFnVm6ZAdDvIoH5E0sUu57v9MJrfSVsIcRP4Y7Km2eWH2BYLayFk5bFRdHurzIrFI5cOlKo3zx4yA2de6Kt4ar14aaCMDk6fj6SydclAmqvs8Fw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93d4cde2-983f-4d88-85b0-08dc8d5f0a20 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2024 17:17:31.3081 (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: PR3P250MB0131 Subject: [FFmpeg-devel] [PATCH 71/73] avcodec/h261data: Make some tables non-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: I7fz12LLqWQ9 This will allow to avoid the indirection via ff_h261_rl_tcoeff in future commits. Signed-off-by: Andreas Rheinhardt --- libavcodec/h261.h | 4 ++++ libavcodec/h261data.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libavcodec/h261.h b/libavcodec/h261.h index 11a8a8685a..4279a12677 100644 --- a/libavcodec/h261.h +++ b/libavcodec/h261.h @@ -50,6 +50,10 @@ extern const uint8_t ff_h261_mv_tab[17][2]; extern const uint8_t ff_h261_cbp_tab[63][2]; extern RLTable ff_h261_rl_tcoeff; +extern const uint16_t ff_h261_tcoeff_vlc[65][2]; +extern const int8_t ff_h261_tcoeff_level[64]; +extern const int8_t ff_h261_tcoeff_run[64]; + void ff_h261_loop_filter(MpegEncContext *s); #endif /* AVCODEC_H261_H */ diff --git a/libavcodec/h261data.c b/libavcodec/h261data.c index bccd9e5f56..3ee750f98c 100644 --- a/libavcodec/h261data.c +++ b/libavcodec/h261data.c @@ -104,7 +104,7 @@ const uint8_t ff_h261_cbp_tab[63][2] = { }; // H.261 VLC table for transform coefficients -static const uint16_t h261_tcoeff_vlc[65][2] = { +const uint16_t ff_h261_tcoeff_vlc[65][2] = { { 0x2, 2 }, { 0x3, 2 }, { 0x4, 4 }, { 0x5, 5 }, { 0x6, 7 }, { 0x26, 8 }, { 0x21, 8 }, { 0xa, 10 }, { 0x1d, 12 }, { 0x18, 12 }, { 0x13, 12 }, { 0x10, 12 }, @@ -124,7 +124,7 @@ static const uint16_t h261_tcoeff_vlc[65][2] = { { 0x1, 6 } // escape }; -static const int8_t h261_tcoeff_level[64] = { +const int8_t ff_h261_tcoeff_level[64] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 1, 2, 3, 4, 5, 6, 7, 1, @@ -135,7 +135,7 @@ static const int8_t h261_tcoeff_level[64] = { 1, 1, 1, 1, 1, 1, 1, 1 }; -static const int8_t h261_tcoeff_run[64] = { +const int8_t ff_h261_tcoeff_run[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, @@ -150,7 +150,7 @@ static const int8_t h261_tcoeff_run[64] = { RLTable ff_h261_rl_tcoeff = { 64, 64, - h261_tcoeff_vlc, - h261_tcoeff_run, - h261_tcoeff_level, + ff_h261_tcoeff_vlc, + ff_h261_tcoeff_run, + ff_h261_tcoeff_level, };