From patchwork Tue Sep 26 22:16:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43930 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp2208723pzh; Tue, 26 Sep 2023 15:18:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHtcwLBrlgcoiw/VBzBhCc1eKTlid19k/N3qIFmMG6pIvgeBp6Xz3Gl4eCPSi2tfWhp1ZbO X-Received: by 2002:a05:6512:3b9d:b0:4fe:347d:7c4b with SMTP id g29-20020a0565123b9d00b004fe347d7c4bmr113952lfv.7.1695766692923; Tue, 26 Sep 2023 15:18:12 -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 q6-20020aa7d446000000b00533ec92878bsi6413866edr.665.2023.09.26.15.18.12; Tue, 26 Sep 2023 15:18:12 -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=R3hVHdG9; 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 75E4A68CAA9; Wed, 27 Sep 2023 01:17:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2053.outbound.protection.outlook.com [40.92.90.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3B2168CA92 for ; Wed, 27 Sep 2023 01:17:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PElJ2hQuFQqreyKCDYbiDeqbQDmsC+ZoUTQmY/7gdH8O3++kz3KIr4bf2ZeLAUbsQl5Q+wTAUDHuVZpfD7LiZfVJXMNtt/uN1kxyHEdklUTSmsjN6Hnee9nhfN85X2wh5hs6ZxutLhIXXrzx7mJI6px3PJBL3ZsoQab6vQ7EiaWnzTJnSRHsTGjHNaGuP3sroKN1dKiZX3E3v5cyYk/d4R2tlNhd3iVC3MTEzcWOalTxW9oE2DfcQFeJ+fkmWyNtH/Xjkubr7tc5mIUbnS3Lw2jqBN2T0Ti10XFjAuA4ibj4VT8G6vxKjnj7fSpZCKk8Zq+7JxWb1QXezZ6iHrmoEg== 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=Y56CblhM6FcSBy2RPslu1Qt4Xo/UAbOSyCpW2Svg78o=; b=kuApm3qM73caJ9FBE3Rcl4z8MICu1sWOjgDuBkmdr2YU44obNcbY+OA7hz5aAUUMzm6ygk9VTiC6GdRpuM7By0wHaQuO71XdclKIIyYmPGVEM3h/i9e9wEt05DVaKzyoXBCAgZklB6eI4zxfliyWknxWz3aHJITFlFzLa2eDpuO+j0SbLog2ZofVhbq8Ueaf3ibvV+9sYUoxTsyeJReqzGW0Qb6ciiajMzGbb+Hcl49HroVSQcMovCYNx1IIRQblxnAn60fofKk8JCD6To5ghsB0Sk+JoLh0ppOhxPGSSUePN0Hq7xZbHlx6Fxr47R6TqyFxUuRQCX2P6ZzpkSq/GA== 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=Y56CblhM6FcSBy2RPslu1Qt4Xo/UAbOSyCpW2Svg78o=; b=R3hVHdG9r6kM2VGaX61M3E2fG9sLpH1yR9lbhO5qz4hww2605C/r4C9ADcM6xnFdJVsjEP7R6UUDYXRfXf+FZXbZFo9OfkKu6dZWGhr0CMW0Drh8q3GRYerwspJEdF62Vh5jGVUbzVRHO2Zs1RKNYF9qC0WsNQaA5yHYfb9RvKRtmb3VN5hOUOYZVVylKG5+XgXmvCtW9U3lRrmge53sb8gblJq+HYxeuPbxDlq4wck1yUPxaT4DNLyBRNmNASpotWDx2B+lzOOrYYPGreeGClfR1N9ipbLevJlgx7cIyadEos2zzprYfUHEW2c6cc5alsup63KdDKtgZK0hMJFbGQ== 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:17:11 +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:17:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 00:16:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [96CTgpOVgvxcMgEAQsuwKYQgywYHvxOr] 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-12-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: 4938c6b3-a871-4997-0d7c-08dbbede5441 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qkOhCUheLLmgGn4yAUizG0ee7D9f6CslRX+Njj7H96+753xtXwcecWkH1iL0nwt3aFLGSw4j0+qvdNdjg8+/AzVhK4jmx3wOTQQVJzjx2EHpO+Qvma3Pdp9V4G+puG6hBb4/xMAp2eFNC0uA+1XAzcA/61dAOFEq1d6ybfrgJyOgxvCDL+LOXOdBEq4AftXyHZYCM9ZoA+MAf1A7EEvpPCbqD4nDYwbuC6E3dGrrgBIQRJzuuSUNa3G7jmdTW3ds7urMglTVz3bchYTweLg//tlvUeNUg43Z9j/V05yLUb4r2XYF6OcDBAI+iZhnvfkm4cgnm8nZvvcVHX24zKBW95O4CeKr9d2XA1X1HAyhMy/f7aRIGpSRLuGjl3vbEeh1F1rpXMWaDxs6YRQVi6TC06ZmVl35trEZsK4pUXagNGZI3y7Bpt921lfbWSROWiTDoOLWntEXbUDyJCr2Bj3xECJn0Qi8dQrssOgHWBCbpgmrFdV7CYus31MPZtCWc9EJbXjRHaExNkeXEZHHczMZwEJGv0KyIFMSek/jINXKwqX+8GAp5yu/7dNvaZGWfyagS9E1uyEu9w9Q7Uj15zecVLO1T9cMIvuSIThWSqwhQrENutj2A7ssyuXSWeLYyOXv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JdeAxReu+iE6sKdJ8KXm6EWvrVIE9QJEremIiAtLBAxIrKAhuL2yZWZgRqXawx+Y6QST7WDZsTs4wY1vEieIjYXEzpUgtopa4Q4+//g3FRrgK0D53XvqaqZ9BVJwlgiifne16GqkQ9jfsVf7xcac9aDQitpxbmKX6c+BBJwKEjWpvdz33D/EFutgkM5oOQpRO9+xcxHMrIIUaP4WgU5dTbfQIEKlxrM4/6LCE6XJWkeck8mMM3fJKdlI82/GsPc1598uWGvt0klk9VQT6ngJwFOyHhyNMiYijmbHV8pNjKUtA8kKK5L4A/PLtWDToYViXOgpmcG1z9skW2n3yQfhi2PyKlc4jbOSWZDguG6kMuANJDZu50yP8xQfmQ86FAKUJPIm4sPokIUpl2zsILUPsppEUYt/Djtzea97gn+/2kG4NY6cnRE3CW/BREO4+U1UCjcdVIVw61TH+Rs73AMhS9YVJkyjOSrKAZGzW3QLs2HQERed34720bPQsD36Y3b4XRJ6X6MwHoKY393M9jo3SoAVTkeXm+xR7hJXuMApE4yhIOVA7ziHrTL38EkM8ZxZ7tDq+Pyfn8CG3zLTcirHvIUEJ41hSgdHNnqc2gu/ILLvq5Za1zXNIwDFltWEa5PLX+ExeHvmJuTAMFCz3pJp4edZJamMWIEPqNSqjp68RKDxo4xcP+uYCBvUip/5xYYVlpX60nZs6heN3Xu2kYQG/+yh4oxX+NURpXaMBiTIo0lefjkFBaY5o/wXoM0OfhYnnZGOGvplEoHQClY2Z5+u8bDaNMGIiguF6pqH6/PLrMShxA9pTRaflTKTJmUccK2h+G5vrkarOZtyTwmRvXtvjWXid5IW9DKEVeKo7qHrlOzlOHWGHUDRvMOnNDObZLjamltcK/Si7gy1BGUxAp1XyGv9+x4eXyELZRtdwCf6jHM+D7st+dse+gssJ0ysi7O3+lZRf4WzTdPyZMHlLwh1dDDTNOKIJW8a71WNPK3+4m3dTOzAW3J3FURx+XRKg6tcq94qjRVrOVB/+shDKMPxuFh9uNA/LJlr7sTvjrwGdjrFqKbM3T/WdyppXBiy0YcUzK4j9rFf68Wg+wogxqh0g+HDv9w4pswtVZlISGS5o92/qPJVO+0lRowHB2dp65A3TM9g7JImmn/W07BoldPklrQBsTk2AoJwMKQGmjGG5ReqHzGqTPwOfoFrldSw6vGq8smGbv+cpBFTtbk7lZwWQP7fLQPAtF75YxQvFuOu7EYDF4/T3LVLgGb7HYSSY7TU X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4938c6b3-a871-4997-0d7c-08dbbede5441 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:17:11.1346 (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 13/61] avcodec/svq1dec: Increase size of VLC 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: khQCxqhBzJjY It allows to reduce the number of maximum reloads by one. Signed-off-by: Andreas Rheinhardt --- libavcodec/svq1dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 372420bffe..af02063a45 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -190,7 +190,7 @@ static int svq1_decode_block_intra(GetBitContext *bitbuf, uint8_t *pixels, height = 1 << ((3 + level) / 2); /* get number of stages (-1 skips vector, 0 for mean only) */ - stages = get_vlc2(bitbuf, svq1_intra_multistage[level], 3, 3) - 1; + stages = get_vlc2(bitbuf, svq1_intra_multistage[level], 4, 2) - 1; if (stages == -1) { for (y = 0; y < height; y++) @@ -779,7 +779,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, AVFrame *cur, static av_cold void svq1_static_init(void) { - static VLCElem table[168]; + static VLCElem table[196]; VLCInitState state = VLC_INIT_STATE(table); VLC_INIT_STATIC_TABLE(svq1_block_type, SVQ1_BLOCK_TYPE_VLC_BITS, 4, @@ -792,7 +792,7 @@ static av_cold void svq1_static_init(void) for (int i = 0; i < 6; i++) { svq1_intra_multistage[i] = - ff_vlc_init_tables(&state, 3, 8, + ff_vlc_init_tables(&state, 4, 8, &ff_svq1_intra_multistage_vlc[i][0][1], 2, 1, &ff_svq1_intra_multistage_vlc[i][0][0], 2, 1, 0); svq1_inter_multistage[i] =