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 33D294789E for ; Tue, 26 Sep 2023 22:17:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A4B8B68CA9B; Wed, 27 Sep 2023 01:16:57 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2084.outbound.protection.outlook.com [40.92.90.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07C6668CA8B for ; Wed, 27 Sep 2023 01:16:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hqN2L7xtJJXT9tuXaAzCqkbMtUZwxWo9CYkLa8cQ1I3xuK+T11peCvLgcgUGlDKu7JpHTRnHph1LEjPmJ9aGMW3nUNAdBZ7yaG2vTTjzdaf19p4D0h24QPnlcZxCE7CL9KZs96KWbHhjUfoinf5ZWogh2X4l9x7WnUF12On2jOwUwa9kzqefZR3w5kmwV6cyU+InNL+FgkbJNT9BSZqfvZd620vddGbeLMsx8xIFYgd2Itiq0JKg1HA5tw5ararSXaYesAdIDK/M2RvNOIduKsVWPRWkfeRY9VjCczxVpfhle0+FJIW6squnDQiZNz5iITbxav/YLfbn79nb5wFpDA== 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=a8YXlk6L8QPYfFMBL30yXzZrCV5WALmjkr+PYmA6M4E=; b=hYzb1/xYQvsN94Hcd9GK/q0N5mqI1ESGrSghrFMT3xawAo7hwUT9xBw0GoOCGPJcOs6L9cuTCpY3s7KdhDgiJs6LkZ57jsuymEnzxNZOVB7pE6vVFEwX2c1IbZ7goL49idbOM132D4hruJStVfYfCvJ3YAKKMH8Yt32dVYKSDmWbjXfSozPl94WDt6k79dcGbORoWYljB0yo1ootl+zeeNOZKB4N+gKbilvlJJk2PQwE6PH/ePXeeyUj1pG22Qe9VEzZ5SK9Cm6iRfNZMDooyux9klemMyfuWMxK3tEvmIZ8OaYV2XBK5a7e2weKU/49BBPbmV5ZL7/Ac+OjobkGXg== 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=a8YXlk6L8QPYfFMBL30yXzZrCV5WALmjkr+PYmA6M4E=; b=bNbSX52hkRM6ZxLV4TxlSnl+pIU/9qznxA+0z29kr4jai4BGG/UqwmNgXbk6ZLRQsDdxE8J8hoLjntza4b44tISVeziAa/fUhklHOvuvJc1N5N1nTSFOsZDqNiTIYM75pqMLxwrWlhKPsQvPkl0HqHTdwno49H+PcOhvtMsgMFhNJrn9LspDkov3p3ljtp7ORMzwe4Gs+0J0u/NBM1XNd1/Qz0nbNFw1Afhx/jOwYTvtPJk0t+a+JeJvL8ZmKLWLhwvDmFCw1hlc+6PW+UR2+nXRI9g9OJFUkCHgLPaweoVleICDUMofKZCfRPEQx5Tqoa0oi9Un0rPlqUQ47Yp7QA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0413.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c0::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 22:16:55 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a%3]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 22:16:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 00:16:41 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [P/nfPkxAGtsFaRHpSiytIewTVEac4qgm] X-ClientProxiedBy: FR3P281CA0019.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230926221732.3711507-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0413:EE_ X-MS-Office365-Filtering-Correlation-Id: 26cd52e1-e782-4eeb-398c-08dbbede4af3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OS8GvmMDrRfYmiJKCML8Acy3vtexX2aJJ7x7UdTzrnbE/XryyFG5T11Jp/d/NgPo/nOuo9VCVI+azOB/eKB1ey2UoXEi8Fi52Z7zAhNANYlBn6AG/Wr0cMeLCv7FXso3rGjeHfHK2b0o64Mk2ydUksJGi8NrSVer7jMihnE6VofKbC1IXAat38oOQSP6f3dyYLfOsvJchIlBC/KEd1dXecuWUa7DYZtfhdYP7OMStbo7w/9+WzALuzFC2BTKGZMAtfWQPVnx0Wp1EV2qvmBisTjTfsXyuFGlYePDnQtgyyst0BJeOK95uC7frFtHCUfT8dm/rVbC4/7u6jFJJ7MP4gHtL2SeMkCqEB8LE2k6xsQAFmt2O2ir6AiCNm4zEhLdkbjzE4540lMAZXr8H3lH8UsQqdv0wApw5Vq1Hregutm77/aYVJcUXxX9nKjybuE4xe4kTm1+zbdUIpgV8OlpBFOggwvs7HwHyeFHuPP/Te8Fb/HMlIKt7NccW9OkcjIZ/7Nc+rT+o3WwoG76lcB257OxtN2oHkZHa9nX12YWiS/Qi2jeG/FxfAJNYrYYgU9eLJuOS8+cX/mo2GILHCm5Uczc/P7Sd0+SSVUpQujq79q8Zi9WyzVob6/EEtCzCX0F X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/sUC32vBnGQNnewTowGg9Yox6X8tfMRftw0lC4tWKOE6owdxas/eF95X/tP6?= =?us-ascii?Q?RwrqLuCcyJq9I1/307M9ADSDljSULhQ63n+nTb/7WSqjk9kEMAVktnvdr+xb?= =?us-ascii?Q?dEmC64EkXZbnD+CbLz5+yyXGYhG8OqnjrmTL8BijI/TB/up+Fh3tJEcX0lhu?= =?us-ascii?Q?Mfz+ruY85/wyLB4V+8U7gkiz9UPRKmg4fKmw0em1/Qouf0STTmelY3O7Rrwe?= =?us-ascii?Q?FRkirIpG4st4Kqhpr6B61BoWA12CNNux5SqnlXa5vOxRymraWoZRNhyHEewT?= =?us-ascii?Q?QvB5SbzPgNxBEoanc6WFuZ/mWjI31O3ghfgm+c5vUdAf6D3r2KBD/9OSCyMT?= =?us-ascii?Q?mhv6DbGgxG3cJ7M20KMWAEUMCIui+V0ZvjiJNCDcNwYsc/FFVsdQW7LCRyez?= =?us-ascii?Q?XXMtfEtzE0vJwWMIgCj2ygyijlQHGTjoJ6J3FvB7EszZh6ioS3VVE2QbmF23?= =?us-ascii?Q?gQzGt4RNzkjduCKXgL3zdomFDEluPTkPqgrT/NzFvJnZtiVuaIciMkBEEBnj?= =?us-ascii?Q?ZmlwMD+wFdZKS4m44Pu8NXPcNcU+5pAyzA8FWJYv3BiyPQFLhr9b2neqEyin?= =?us-ascii?Q?WaWQHUTWF9JvgJRooPfNMdUy9exjO3aTS/YKITQXEGZclSy1aR/h9B9eNfdb?= =?us-ascii?Q?LE/+RPMzzCxWz8P37N7d6jnrX4SwIzwg23x6vVBHM/ZKVfnTg2FnKLV0ipBr?= =?us-ascii?Q?YpLbP9eRFPYgapUnuAORYIjpBYl1/11BHds/CVX40m7Bov5C8IgB8cwI13g2?= =?us-ascii?Q?uDVApN4G4ziQHKgLo498LuS0VeBYKb2MdiciIV93B2LGgxC4oadDP3KlUwWN?= =?us-ascii?Q?tCYn0VVrxM9cPQhe1frfQCnmujhoRiMmFuOo7KKBbNZBDqoOTwXtlFmP4snj?= =?us-ascii?Q?L+CeixsdEN6sDDPYtIIJYo1EQtY/3uKuFVAc5pEQNUo1JBhsR73Nz6DWMSB6?= =?us-ascii?Q?527pdqW/BGyr5EYIkzELfD5X9LBPLKiA54xNdyD6vQVSf/I+obX8xrG/tEUy?= =?us-ascii?Q?PCPeEyrT7MBstzqrSuvBWxsvZFebUY2oTkqvgt7Zi1H2cOx8MP6fCXTequ8k?= =?us-ascii?Q?blZPd78eQTTqMVMQKZbWQoqSS4Bl3R2Jasc0i7MizHwkyCbov2b2GDZuIj3Q?= =?us-ascii?Q?zvkn1VxRu9fym8SSg+obL3eTUp3twprAnpa+hiSA2Ut/4QJ8JOdA6RV5rR/D?= =?us-ascii?Q?TT75a7O7cwK5Rzu3cno75v24u7zyFy2MKGSd6Jq/wjJOfe1S47wJViflIWVo?= =?us-ascii?Q?xmc8NW4ZuS6LpFQRW/yH?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 26cd52e1-e782-4eeb-398c-08dbbede4af3 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 22:16:55.4957 (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: AS4P250MB0413 Subject: [FFmpeg-devel] [PATCH 10/61] avcodec/ituh263dec: Avoid superfluous VLC structures 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 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: Of all these VLCs here, only VLC.table was really used after init, so use the ff_vlc_init_tables API to get rid of them. Signed-off-by: Andreas Rheinhardt --- libavcodec/h263dec.h | 8 ++--- libavcodec/ituh263dec.c | 68 +++++++++++++++++++------------------- libavcodec/mpeg4videodec.c | 18 +++++----- libavcodec/msmpeg4dec.c | 12 +++---- 4 files changed, 53 insertions(+), 53 deletions(-) diff --git a/libavcodec/h263dec.h b/libavcodec/h263dec.h index 9f1db72903..06ff7c1c48 100644 --- a/libavcodec/h263dec.h +++ b/libavcodec/h263dec.h @@ -33,10 +33,10 @@ #define CBPY_VLC_BITS 6 #define TEX_VLC_BITS 9 -extern VLC ff_h263_intra_MCBPC_vlc; -extern VLC ff_h263_inter_MCBPC_vlc; -extern VLC ff_h263_cbpy_vlc; -extern VLC ff_h263_mv_vlc; +extern VLCElem ff_h263_intra_MCBPC_vlc[]; +extern VLCElem ff_h263_inter_MCBPC_vlc[]; +extern VLCElem ff_h263_cbpy_vlc[]; +extern VLCElem ff_h263_mv_vlc[]; extern const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[]; diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index f9c8476ecd..81b456405f 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -99,38 +99,38 @@ void ff_h263_show_pict_info(MpegEncContext *s){ /***********************************************/ /* decoding */ -VLC ff_h263_intra_MCBPC_vlc; -VLC ff_h263_inter_MCBPC_vlc; -VLC ff_h263_cbpy_vlc; -VLC ff_h263_mv_vlc; -static VLC h263_mbtype_b_vlc; -static VLC cbpc_b_vlc; +VLCElem ff_h263_intra_MCBPC_vlc[72]; +VLCElem ff_h263_inter_MCBPC_vlc[198]; +VLCElem ff_h263_cbpy_vlc[64]; +VLCElem ff_h263_mv_vlc[538]; +static VLCElem h263_mbtype_b_vlc[80]; +static VLCElem cbpc_b_vlc[8]; /* init vlcs */ static av_cold void h263_decode_init_vlc(void) { - VLC_INIT_STATIC(&ff_h263_intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 9, - ff_h263_intra_MCBPC_bits, 1, 1, - ff_h263_intra_MCBPC_code, 1, 1, 72); - VLC_INIT_STATIC(&ff_h263_inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 28, - ff_h263_inter_MCBPC_bits, 1, 1, - ff_h263_inter_MCBPC_code, 1, 1, 198); - VLC_INIT_STATIC(&ff_h263_cbpy_vlc, CBPY_VLC_BITS, 16, - &ff_h263_cbpy_tab[0][1], 2, 1, - &ff_h263_cbpy_tab[0][0], 2, 1, 64); - VLC_INIT_STATIC(&ff_h263_mv_vlc, H263_MV_VLC_BITS, 33, - &ff_mvtab[0][1], 2, 1, - &ff_mvtab[0][0], 2, 1, 538); + VLC_INIT_STATIC_TABLE(ff_h263_intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 9, + ff_h263_intra_MCBPC_bits, 1, 1, + ff_h263_intra_MCBPC_code, 1, 1, 0); + VLC_INIT_STATIC_TABLE(ff_h263_inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 28, + ff_h263_inter_MCBPC_bits, 1, 1, + ff_h263_inter_MCBPC_code, 1, 1, 0); + VLC_INIT_STATIC_TABLE(ff_h263_cbpy_vlc, CBPY_VLC_BITS, 16, + &ff_h263_cbpy_tab[0][1], 2, 1, + &ff_h263_cbpy_tab[0][0], 2, 1, 0); + VLC_INIT_STATIC_TABLE(ff_h263_mv_vlc, H263_MV_VLC_BITS, 33, + &ff_mvtab[0][1], 2, 1, + &ff_mvtab[0][0], 2, 1, 0); ff_h263_init_rl_inter(); VLC_INIT_RL(ff_h263_rl_inter, 554); INIT_FIRST_VLC_RL(ff_rl_intra_aic, 554); - VLC_INIT_STATIC(&h263_mbtype_b_vlc, H263_MBTYPE_B_VLC_BITS, 15, - &ff_h263_mbtype_b_tab[0][1], 2, 1, - &ff_h263_mbtype_b_tab[0][0], 2, 1, 80); - VLC_INIT_STATIC(&cbpc_b_vlc, CBPC_B_VLC_BITS, 4, - &ff_cbpc_b_tab[0][1], 2, 1, - &ff_cbpc_b_tab[0][0], 2, 1, 8); + VLC_INIT_STATIC_TABLE(h263_mbtype_b_vlc, H263_MBTYPE_B_VLC_BITS, 15, + &ff_h263_mbtype_b_tab[0][1], 2, 1, + &ff_h263_mbtype_b_tab[0][0], 2, 1, 0); + VLC_INIT_STATIC_TABLE(cbpc_b_vlc, CBPC_B_VLC_BITS, 4, + &ff_cbpc_b_tab[0][1], 2, 1, + &ff_cbpc_b_tab[0][0], 2, 1, 0); } av_cold void ff_h263_decode_init_vlc(void) @@ -273,7 +273,7 @@ int ff_h263_resync(MpegEncContext *s){ int ff_h263_decode_motion(MpegEncContext * s, int pred, int f_code) { int code, val, sign, shift; - code = get_vlc2(&s->gb, ff_h263_mv_vlc.table, H263_MV_VLC_BITS, 2); + code = get_vlc2(&s->gb, ff_h263_mv_vlc, H263_MV_VLC_BITS, 2); if (code == 0) return pred; @@ -366,13 +366,13 @@ static void preview_obmc(MpegEncContext *s){ s->current_picture.mb_type[xy] = MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0; goto end; } - cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); + cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 2); }while(cbpc == 20); if(cbpc & 4){ s->current_picture.mb_type[xy] = MB_TYPE_INTRA; }else{ - get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); + get_vlc2(&s->gb, ff_h263_cbpy_vlc, CBPY_VLC_BITS, 1); if (cbpc & 8) { if(s->modified_quant){ if(get_bits1(&s->gb)) skip_bits(&s->gb, 1); @@ -809,7 +809,7 @@ int ff_h263_decode_mb(MpegEncContext *s, s->mb_skipped = !(s->obmc | s->loop_filter); goto end; } - cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); + cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 2); if (cbpc < 0){ av_log(s->avctx, AV_LOG_ERROR, "cbpc damaged at %d %d\n", s->mb_x, s->mb_y); return SLICE_ERROR; @@ -824,7 +824,7 @@ int ff_h263_decode_mb(MpegEncContext *s, if(s->pb_frame && get_bits1(&s->gb)) pb_mv_count = h263_get_modb(&s->gb, s->pb_frame, &cbpb); - cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); + cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc, CBPY_VLC_BITS, 1); if (cbpy < 0) { av_log(s->avctx, AV_LOG_ERROR, "cbpy damaged at %d %d\n", s->mb_x, s->mb_y); @@ -905,7 +905,7 @@ int ff_h263_decode_mb(MpegEncContext *s, mot_val1[1 ]= mot_val1[3 ]= mot_val1[1+2*stride]= mot_val1[3+2*stride]= 0; do{ - mb_type= get_vlc2(&s->gb, h263_mbtype_b_vlc.table, H263_MBTYPE_B_VLC_BITS, 2); + mb_type= get_vlc2(&s->gb, h263_mbtype_b_vlc, H263_MBTYPE_B_VLC_BITS, 2); if (mb_type < 0){ av_log(s->avctx, AV_LOG_ERROR, "b mb_type damaged at %d %d\n", s->mb_x, s->mb_y); return SLICE_ERROR; @@ -917,13 +917,13 @@ int ff_h263_decode_mb(MpegEncContext *s, s->mb_intra = IS_INTRA(mb_type); if(HAS_CBP(mb_type)){ s->bdsp.clear_blocks(s->block[0]); - cbpc = get_vlc2(&s->gb, cbpc_b_vlc.table, CBPC_B_VLC_BITS, 1); + cbpc = get_vlc2(&s->gb, cbpc_b_vlc, CBPC_B_VLC_BITS, 1); if(s->mb_intra){ dquant = IS_QUANT(mb_type); goto intra; } - cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); + cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc, CBPY_VLC_BITS, 1); if (cbpy < 0){ av_log(s->avctx, AV_LOG_ERROR, "b cbpy damaged at %d %d\n", s->mb_x, s->mb_y); @@ -1009,7 +1009,7 @@ int ff_h263_decode_mb(MpegEncContext *s, s->current_picture.mb_type[xy] = mb_type; } else { /* I-Frame */ do{ - cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); + cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 2); if (cbpc < 0){ av_log(s->avctx, AV_LOG_ERROR, "I cbpc damaged at %d %d\n", s->mb_x, s->mb_y); return SLICE_ERROR; @@ -1034,7 +1034,7 @@ intra: if(s->pb_frame && get_bits1(&s->gb)) pb_mv_count = h263_get_modb(&s->gb, s->pb_frame, &cbpb); - cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); + cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc, CBPY_VLC_BITS, 1); if(cbpy<0){ av_log(s->avctx, AV_LOG_ERROR, "I cbpy damaged at %d %d\n", s->mb_x, s->mb_y); return SLICE_ERROR; diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index a8dd57bf6b..51a2c7fe35 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -960,7 +960,7 @@ static int mpeg4_decode_partition_a(Mpeg4DecContext *ctx) if (show_bits(&s->gb, 19) == DC_MARKER) return mb_num - 1; - cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); + cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 2); if (cbpc < 0) { av_log(s->avctx, AV_LOG_ERROR, "mcbpc corrupted at %d %d\n", s->mb_x, s->mb_y); @@ -1032,7 +1032,7 @@ try_again: continue; } - cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); + cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 2); if (cbpc < 0) { av_log(s->avctx, AV_LOG_ERROR, "mcbpc corrupted at %d %d\n", s->mb_x, s->mb_y); @@ -1147,7 +1147,7 @@ static int mpeg4_decode_partition_b(MpegEncContext *s, int mb_count) if (s->pict_type == AV_PICTURE_TYPE_I) { int ac_pred = get_bits1(&s->gb); - int cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); + int cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc, CBPY_VLC_BITS, 1); if (cbpy < 0) { av_log(s->avctx, AV_LOG_ERROR, "cbpy corrupted at %d %d\n", s->mb_x, s->mb_y); @@ -1161,7 +1161,7 @@ static int mpeg4_decode_partition_b(MpegEncContext *s, int mb_count) int i; int dir = 0; int ac_pred = get_bits1(&s->gb); - int cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); + int cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc, CBPY_VLC_BITS, 1); if (cbpy < 0) { av_log(s->avctx, AV_LOG_ERROR, @@ -1193,7 +1193,7 @@ static int mpeg4_decode_partition_b(MpegEncContext *s, int mb_count) s->current_picture.qscale_table[xy] = s->qscale; s->cbp_table[xy] = 0; } else { - int cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); + int cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc, CBPY_VLC_BITS, 1); if (cbpy < 0) { av_log(s->avctx, AV_LOG_ERROR, @@ -1689,7 +1689,7 @@ static int mpeg4_decode_mb(MpegEncContext *s, int16_t block[6][64]) } goto end; } - cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); + cbpc = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 2); if (cbpc < 0) { av_log(s->avctx, AV_LOG_ERROR, "mcbpc damaged at %d %d\n", s->mb_x, s->mb_y); @@ -1708,7 +1708,7 @@ static int mpeg4_decode_mb(MpegEncContext *s, int16_t block[6][64]) s->mcsel = get_bits1(&s->gb); else s->mcsel = 0; - cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1) ^ 0x0F; + cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc, CBPY_VLC_BITS, 1) ^ 0x0F; if (cbpy < 0) { av_log(s->avctx, AV_LOG_ERROR, "P cbpy damaged at %d %d\n", s->mb_x, s->mb_y); @@ -1951,7 +1951,7 @@ static int mpeg4_decode_mb(MpegEncContext *s, int16_t block[6][64]) int use_intra_dc_vlc; do { - cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); + cbpc = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 2); if (cbpc < 0) { av_log(s->avctx, AV_LOG_ERROR, "I cbpc damaged at %d %d\n", s->mb_x, s->mb_y); @@ -1969,7 +1969,7 @@ intra: else s->current_picture.mb_type[xy] = MB_TYPE_INTRA; - cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); + cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc, CBPY_VLC_BITS, 1); if (cbpy < 0) { av_log(s->avctx, AV_LOG_ERROR, "I cbpy damaged at %d %d\n", s->mb_x, s->mb_y); diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index a81241b1bb..e61045c2f9 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -75,7 +75,7 @@ static int msmpeg4v2_decode_motion(MpegEncContext * s, int pred, int f_code) { int code, val, sign, shift; - code = get_vlc2(&s->gb, ff_h263_mv_vlc.table, H263_MV_VLC_BITS, 2); + code = get_vlc2(&s->gb, ff_h263_mv_vlc, H263_MV_VLC_BITS, 2); ff_dlog(s, "MV code %d at %d %d pred: %d\n", code, s->mb_x,s->mb_y, pred); if (code < 0) return 0xffff; @@ -127,7 +127,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, int16_t block[6][64]) if(s->msmpeg4_version==2) code = get_vlc2(&s->gb, v2_mb_type_vlc.table, V2_MB_TYPE_VLC_BITS, 1); else - code = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc.table, INTER_MCBPC_VLC_BITS, 2); + code = get_vlc2(&s->gb, ff_h263_inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 2); if(code<0 || code>7){ av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", code, s->mb_x, s->mb_y); return -1; @@ -141,7 +141,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, int16_t block[6][64]) if(s->msmpeg4_version==2) cbp= get_vlc2(&s->gb, v2_intra_cbpc_vlc.table, V2_INTRA_CBPC_VLC_BITS, 1); else - cbp= get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc.table, INTRA_MCBPC_VLC_BITS, 2); + cbp = get_vlc2(&s->gb, ff_h263_intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 2); if(cbp<0 || cbp>3){ av_log(s->avctx, AV_LOG_ERROR, "cbpc %d invalid at %d %d\n", cbp, s->mb_x, s->mb_y); return -1; @@ -151,7 +151,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, int16_t block[6][64]) if (!s->mb_intra) { int mx, my, cbpy; - cbpy= get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); + cbpy = get_vlc2(&s->gb, ff_h263_cbpy_vlc, CBPY_VLC_BITS, 1); if(cbpy<0){ av_log(s->avctx, AV_LOG_ERROR, "cbpy %d invalid at %d %d\n", cbp, s->mb_x, s->mb_y); return -1; @@ -173,7 +173,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, int16_t block[6][64]) int v; if(s->msmpeg4_version==2){ s->ac_pred = get_bits1(&s->gb); - v = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); + v = get_vlc2(&s->gb, ff_h263_cbpy_vlc, CBPY_VLC_BITS, 1); if (v < 0) { av_log(s->avctx, AV_LOG_ERROR, "cbpy vlc invalid\n"); return -1; @@ -181,7 +181,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, int16_t block[6][64]) cbp|= v<<2; } else{ s->ac_pred = 0; - v = get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1); + v = get_vlc2(&s->gb, ff_h263_cbpy_vlc, CBPY_VLC_BITS, 1); if (v < 0) { av_log(s->avctx, AV_LOG_ERROR, "cbpy vlc invalid\n"); return -1; -- 2.34.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".