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 7F4AF46967 for ; Mon, 31 Jul 2023 11:12:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A39A968C49D; Mon, 31 Jul 2023 14:12:52 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2082.outbound.protection.outlook.com [40.92.74.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A87EC68C5AD for ; Mon, 31 Jul 2023 14:12:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D7SvG27Ra+TFzKUgmA5l1hYhYMlNPdPDN0NBjprewpyCvU1fJcLW/+pjApowWLjoVE9rSy6vKHNwjY42UoyNyFUI3QH0DkCHDLoxrHL+i5u+kzFgPXzdEvykR0ZCREBnajnVE7P9W8GASlcyLSaq3Bm1SJx0ZRNUJmzT2Mwn3TVHmU8n+rYSvxnThp/sp6u4hdm5GSBfeimttl7XC7g9v0UurQS0/ui5b5JHZq/f6UhbsAHTAOG8VFZEhAb3MkVuwr4qFjYqgCPtvoL8kk/2bH9nqhtOdZqh1oHvhH+gGRFhW1ainPEayG3TRznsGdt01zNxNFOqBmtCAAM3OBey9Q== 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=3nuF74bVfmJIvmmHhdExWhyIuTr6ZgQP//yCt2C7WI4=; b=Zr/Rk2aQXpbgc04U/YarMsRUotWTfanxbJ2v1oDdGOmA97dknBgMc0OOlODfJ30/HBu9TC2AIN97cq4D2DxlP2qU3/mlRuPy74QWWc/wSWTsFucOARN26DVZPW9fEaAaoXPpJ76b2q5qMdAixLIx4mj+hD6mGsbVhM/Wn0fvpquN9u5N6dlXdFtj3CKDzmAkpwhIE3dRxcwQM2I3PijKTnSs00/6M5lqP7g8UsTjAsXgX8p/+vRDURHfJU0xYo6PSrh1dvylE07CDrUknhQLMh07Va463t1OVetK6hwMfg+qp5RaBp2WnL9jo70O+Xd27Xk6D1jaQBzV41jjx1IUYQ== 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=3nuF74bVfmJIvmmHhdExWhyIuTr6ZgQP//yCt2C7WI4=; b=eeZPYOzneP4sRELK2xjZ0Ow8sM6KVDJXfinqTK/w9yh0sIduODOpz2BBxIZto0UA0YlwL4AIbAxn8+JDE0D9qztdeOns2XvKE4raMNZyTVzS4bVXeIjAk3sySkKvvkM7SIbGt9I57qHkp0AFrk70FzpM4Ueut5J1bhZ08yvbn56DE8RiOMIm2/m0Ozis/05e/cvTZ554SxtsIAXxn23Jegi9SfMu0ynrUSvKAlmadFxyIhedBwAiHUCIanpTsx9HkG1WgaB8+DtN+y+/25oNuf7MEp/ekv2fPFEFq8erJURcG2622lM9/7rw7FeprFRAwl/dEt/2LZ/8tOFDd0dlPA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0027.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.43; Mon, 31 Jul 2023 11:12:45 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.042; Mon, 31 Jul 2023 11:12:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Jul 2023 13:13:35 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [6Atpxc2tmN8GlQewei7meCrxonAteCjeEw8+6kkiK7g=] X-ClientProxiedBy: ZR0P278CA0009.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::19) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230731111335.3313288-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0027:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a54cd2b-103f-4314-6747-08db91b710b1 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3mx9fBRSAKc56BNWAqVH+W/vC65Y9QNmga/SficzdYAHd0oKHwEYAmEGjmONRQScq1CkrrE0fkU4oLMz4Zd/EfwT2XfgRqTxA6c9C1qbS6LBb1sltvDYlrvOiLQuxEiOVmXWVGO+vXS2fHr7r/dMvp2XZlLnZ8Uh/y/EtdW6KyYvLqdU1BZ6mOEs5/mgl9a407t7nhY7GB+bPrMKRhFPdSquSx0A3bAiEPI3ZE5dLg20+0soFFcVusMT8wu0NQlqRjQ+wY5XSMfvdOIxGXvg29OBt4lc+e6ok3eryUPqJl+OyYGrlAH0ljVksQtfCGSVyUg53AofGgpsLk5W60gTsJS8/0WHh+oslPrXSvlqz43ePt8AtAvGzcFas/eeKJZ2GHWKWTy52+ujG/uNYIUNdmA4q8mrU7cnFMGH9B8O2Y+3ayg/xjT1yMkeayOOymqMm1J1EaxYzN1xiumC4I/l1rqiKPLoxcO7y5u1pKDcr29UfJKaZkn629nAdakC45mT4QK6IKTa+qJZtfoZ4VYfIvTI/z9V51xkkmVB23Hb4Ol1QiqOcvUHVFVIzKvopYuFtFWbrYNivyiNF/XKu5UXMHFrLl977AJEakmvii+CjIqn6QxEC32ktBnuAiq6nVpBRmPPN7mFuWR2LQufdkgUPQzD/v8ANJkKIiPuaI4lj/OvRpvra18Uz6aR6dmn/7ZqDGKbgtSVyBMSw2kIMmU11wm6vPd1gM4iE8Y/EbA+0gPhH3ZkYU6vxGdogZvXK8iv4zx6J05YiXvAyjtOGciCSi9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VLiGVQhsP/eZFy3PLh/6TwrRI4Gv8AYzLI/WPPpQDneM7/9o4LBVk306Y64u7dv9uwy3M8nYy2fxw9KbowatDjOw+XEdF1YXH6V0yT8K2oa+S6D9tF+ygyNmt+K4bAR7LusKNcJyVjQfIpC00RErIivcOWc0E/LPGbPUHm3Q0LCZmuGzeAB/E6X0Xpr3qNAWFQEHFBEfv9dDKZApasDrHYSA3zuP7MtgvgU2h55xtL3LwRxGwOmSsRpjC77/laBZFDuj7tXVXxs3tg4g69plIb+smkTCVXjhDVOjr/X0eqbRX33eFDxULcKGICOxQXhH0J44myPivgB1/PbRRnpi/5711E/qXUO//wduZHyDJ6Cq8CUhm9Qgb06Tm9YnJTjA0YN4ThJpr8A/JW8UsuzRqNyB3x8M2+0q1foXsmcCND4A6NlbwIwtN49jtb4Q6ND5C78xJtaf28D6sE54fEZskxkW2Dy5nMpiz+MF79g5X7oAD69lGCLRWixrQcPS6Bk7PgcOvOYas1K8wLMTn0qAuppYjCdSiCJiHduWVtkLoUd2OQANcGv8kNqhEn6bSMaIMwmn6U2n4mfjdVnfRYL9VPlQdANGsikgH+A2LYOxaMkUvIhfvf4xKkI+xIACCJ8h X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QRSPaED/WlaQeDX/KW8ah4Dm94gcHEyCJ+d9gR3kNnLhHbCEfTfA0Oddl+5E?= =?us-ascii?Q?ErwfFEO2PhNyGLhFhbeNaDn9bqNeVPU67bHI38iM0jftxEHaWUbmsopVyou5?= =?us-ascii?Q?345fCnPtPfbHKZhq6aO3kg1ML2yohbdIfvNt6TTpc6IMTVo8RlquSFGDx2AU?= =?us-ascii?Q?+T4IS4mT2PpBm6rfzow9X5bqLANEOpjEkmPqblgFA8/qlsVBLEJZeJPxNVow?= =?us-ascii?Q?VfvKAoNlIaulhQ4NrllVGYkO01/kqtD1ojnpSHdsTBPCYomqzVUgrR8+WZ8x?= =?us-ascii?Q?NJgW2R18GlGXhgEcw0aL7l/k4TEQ/gzpL5Oq57SLaF12ytOjbQ5PurHpf8gC?= =?us-ascii?Q?gn1UtyBxIBXyyVUA2CrQ/dg9lZtnU3LTqsoGwFPkuaB0bM+fkssD3vBX1gOb?= =?us-ascii?Q?xzNjWckrisHAuorWqQB45cKb1ONhEXLoZp8xF8yfn1z1qKlK3aUoDmYy2joG?= =?us-ascii?Q?O8poe987GK9Wajx03325v00MzoR6H67z4gnzGvZM+dU3uSU93f2fIeggMveX?= =?us-ascii?Q?3BdEQDI3mIzRRi78wsz9OAP3AK5ws+MpK3ssSxXFsHoTVIUg/oIg1Gndi+7f?= =?us-ascii?Q?lgULtsksAL20f0fHx33eYt8KYDRK+PGE2S+ijpkdFHp+LiIik2vpZa4kpPy6?= =?us-ascii?Q?PelRz2fnGQYdFy/nqM8SI+c9OOZqvrmpJmPYgEVra3YgUsri4gpQms/j0XvO?= =?us-ascii?Q?D7CHVU9fn8oc51SRjtDKIhuyLzyLa7igJp7B/Sp3bCrk2tLYv25L46h2SjpW?= =?us-ascii?Q?WP2SeiCRtuS/eN43x/emeNa7Oq4LCRaziD82VCycTzu6pAHA0aY4ZML1axtz?= =?us-ascii?Q?Ww/EtAK1HdHplgZN3CD9zUNpOCPQAQXXEZCnXzmC/3Hw8bDF7bOMfEDewoZt?= =?us-ascii?Q?QYPU2UVGF8JCinQSKAI7ACLKzlN7EkCoX2YmOC5cQNdIGcGLJpoYzuO+nd+7?= =?us-ascii?Q?ljNg64y32hzPuSZOzmCeQOWQ+FAtjTvNQtUHUpQCeGWAe3dIv+J0sZtKP3X/?= =?us-ascii?Q?+9oZF1c/E64VpNY/AFDyG+6cjiCiWh187urU3+nnmWu6srEalWqWUZB57XOB?= =?us-ascii?Q?EvIim8AIjdzBPzkzHK6/mjYmTG076oN2t3lfSF2+lc6BpnPquTkuWzfdbjDi?= =?us-ascii?Q?CTF1WJ/otPJTBsJznOLNK2oetkKM3A7LdCXF2CqBACwh+N+M0PbP17j0zYK+?= =?us-ascii?Q?DumoC7RQUipASv7VhYXCFEvnYYvU/PYmx9NM6TCBe0zbwYHyG0Lg8TVT7sRC?= =?us-ascii?Q?e6cDFMbCPRH0bC/onMsc?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a54cd2b-103f-4314-6747-08db91b710b1 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2023 11:12:45.2316 (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: DU2P250MB0027 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/sga: Don't use GetBit-API for byte-aligned reads 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: Use the bytestream2-API instead. Should also fix Coverity issue #1473536 (which is about an unchecked init_get_bits8()). Signed-off-by: Andreas Rheinhardt --- libavcodec/sga.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/sga.c b/libavcodec/sga.c index eae691adad..4ced6e9890 100644 --- a/libavcodec/sga.c +++ b/libavcodec/sga.c @@ -127,19 +127,18 @@ static int decode_index_palmap(SGAVideoContext *s, AVFrame *frame) static int decode_index_tilemap(SGAVideoContext *s, AVFrame *frame) { - GetByteContext *gb = &s->gb; - GetBitContext pm; + GetByteContext *gb = &s->gb, gb2; bytestream2_seek(gb, s->tilemapdata_offset, SEEK_SET); if (bytestream2_get_bytes_left(gb) < s->tilemapdata_size) return AVERROR_INVALIDDATA; - init_get_bits8(&pm, gb->buffer, s->tilemapdata_size); + gb2 = *gb; for (int y = 0; y < s->tiles_h; y++) { for (int x = 0; x < s->tiles_w; x++) { uint8_t tile[64]; - int tilemap = get_bits(&pm, 16); + int tilemap = bytestream2_get_be16u(&gb2); int flip_x = (tilemap >> 11) & 1; int flip_y = (tilemap >> 12) & 1; int tindex = av_clip((tilemap & 511) - 1, 0, s->nb_tiles - 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".