From patchwork Wed Jan 5 21:56:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33101 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1111437iog; Wed, 5 Jan 2022 13:56:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5hTRngleTyA+KaDzW6azjgJhTXUM4+PTynCU175orl2pEGgibHR9C5lkKtE4ycS2O5FL3 X-Received: by 2002:a17:907:d93:: with SMTP id go19mr46545179ejc.537.1641419797229; Wed, 05 Jan 2022 13:56:37 -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 b18si77508eds.12.2022.01.05.13.56.36; Wed, 05 Jan 2022 13:56:37 -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=OelLC9fv; 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 B1FA168ADE7; Wed, 5 Jan 2022 23:56:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075100.outbound.protection.outlook.com [40.92.75.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 908CE68A2B2 for ; Wed, 5 Jan 2022 23:56:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fu8349Miiz6FOTHGTjRGLRA/DLYcxPWQN2suW3s3ffRxDOcDMsHV+wuYEHwiLExuMv5oxOdfu6aO0/2Q5olpEQabRA6c04T9rDgrJlkwmiO4Iggk/Cg68mOwDH0nuCbMAU5bAG3o/eK6eQ5/bnGoK707EzOlNQUlyS0cw0bxTOJjFI7VeKYsj9taQKTz1TILW3Gzw/GoWuT4UgVdEkZRGa2vWj4jbH37wyDl/QHt445Q/rmDTxJi6NLBPVpQmbora0wwzAVQF8tz2AvWEiLd7qlFZJ4svgSmPALKlXEvRMWxwQUVCOd+87/av060GNHxnv+LAPmYGFSlQqj4LTV2nA== 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=Lgwebj7ORfQS1Ye0BnDGhDbmjYGoOneM4/UgWWBPjUI=; b=HoXhpumrFP/DE6w8heokk5pDu1IGWqq7+5GcRmGbzNcraeR8PE8tmCpyMbxbVdY05OaVzMbmZpEbD8k/o8HsahbKs6Xxg6gvUYWOh1/p85fzcxdfRSx6S0ZXZGvpXhcBaiGVbVEpzgvbKG3s9fwnA4Butu5OlwcVrsGZmnD8Ak7+/yKjKguLIL6WMjIMzXaeeYJgopZ18DGDlqokbMHf1C8vH7Vq8Yk/80xDR7EPfcOdqABUonwhf5UtZYM8gVpjVaa39voAYz9JIEqFYrREUklI7rzH2rv9lw1KjLrHQ59P+Ae1IQO1cI0iWE/Me8rzx97kdNc8KCHEtu3qkXQteQ== 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=Lgwebj7ORfQS1Ye0BnDGhDbmjYGoOneM4/UgWWBPjUI=; b=OelLC9fvfMbOih1DJ4oXqY3vfHhMVZr80rENajaxf+b3fn1bVr81L6rNORumuHJXK3y33l+SxZnQBHfXKTatLwboe/1NBHEqRi583Di2Hr/+sAby7sj8IzBGIrKVHbGZXbykHwZv0ZUUjgICs4RXx3hU2eNbDFxiLGjqAAvJ2sV3SWopMT8nfkJK74z+ZqUDSLlkS392PXWFrk0oVekpkId4hRMorMn51yogmrK7gMjd0VoyTKccKnRnER600vZ8gPEpPCzIYeGfxyFycLVw6djeSuEFU/KubmNErScmAMibaI2aqVONv3jRGA1kS3Lu2Mb3Ic7Ua3Op0EJeTEEyag== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6450.eurprd03.prod.outlook.com (2603:10a6:20b:1b2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Wed, 5 Jan 2022 21:56:23 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Wed, 5 Jan 2022 21:56:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 22:56:03 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [6s2AkddWeIUa66D+pgy0rfTo8+R+4vsP] X-ClientProxiedBy: AM0PR02CA0183.eurprd02.prod.outlook.com (2603:10a6:20b:28e::20) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105215610.813119-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60b9224a-08f8-4122-8b4a-08d9d0963672 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JWcnJQnOnRCyJLEhpml9UN8+dCN8dIh8sqAn43IrVneGdsEVbmJfnQ+cRFDJY+Z6ehs/96pA3X073IveT2enCaoquBX9pf2sC1nh7UMZY6e+WMY6SPnVgq+wIHxbx2w8j+cwmPQ1dV68hfi4+MBiAfQfQEX34g9s9xAOK9mwFR5yFvE478wzQZUW19aAfZLP+yQ0WvouY9p7vot2XaPeyIE59UFrQmXFBfotIvhw1rFbEdC6eHI9RuFw/2w9QVpcqRbBGdTfZHLNCq1/aG6ug35Ji/k/Q1OSfUl1Gpu0uP6ASlg0TPnfu9sdir9gOFx6XJNzk4JVs0cF6tzvaAcelLHNxjuBhPrE+YoWGHXnVNQzTw88CDW7kbIZQkN5XSG96Vd3shuMMC3eH39q9mokunUl11usqkTIOQk1nsig8XIPtnyGPtXwXGselN+PBOafxoUa5YqkD+jaY0XcDZQqgXEfM9+RMh6WRf3Zx2PhUDhLidP4Wc9LzMhCmGpIY5zrvxR4dRnSXOGQwdS6KQjonLSlSK1O+m0d4RlhA5pTnypblyS9kpHXABuzoBvoU4f+2C9N0ZgJAHSlyVRJnObKtXcm4Ev8iuuew5TZNVMMtLdeFRu33ML+o864T4hqAe4Gd9OO/sosAPIQPyKbdf6HQveYG/DArw+hSaEbEtkcFIJjwicRC9T+AE97lSol0s4v6taOE9yizvzqOH69GWyZGC5KCR34mDTM1QR34GyATfU4= X-MS-TrafficTypeDiagnostic: AM7PR03MB6450:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bfm+51+8gYt5Q4vMs+YJQ8IdZP/EcfkMJ9UyfS9NutFtoYN4XaFpgZHnn+Iz/PnsyATCZXC+5nEO9SeQXqNve/CWMTTgh06eIdaRtNy8sOk/cRfjzxmKLYZF+9osEOTrSX6jYQOtQbo4YO5X2gOnNyqsdkU+7QtjRmuo7QSYSSClYJ3VnJi37sBUzpoER/EjYlCUQ5PuHWB6EHwHrazGPkMTWwuRN1qHyMTDuzOd5fWBNMQqaKBBVJ4329KiorfS7hIFgOMp0Z6vbejavmt/6Pn4RDx1Ab8ITC3f75Ssbp4+A3Jgw2SFbfps6EDhKiqC5gMZLG99JwWg15HIVFVjoi4+I8B2k841Jr30rN+tiZz+bP8iJiBIRHM/ttE6n2KixL/FALhi+O8y1x7cg3tgMdLrjyNbMM2pQILYbNNUidri5Vqd4R+ZTBVXgYxToFY4ZWiM307VwluctW/fmzBm3Pstaxgjj3B5rDvH1686RJQ35lXP8JPWoRBdjy63cIbr42H4eUQ5Bzdy6NmtL+Y93Z7KzagLXvluRvaOc4e+lXgaKH5OA3S6tlKxsXd6+QG4j7DhT2Sqx8fPKUYfxQt86A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: O5Kxon6fja8pj387HxcZkUAClw+9QErNoikzLkBJ9mejKKCYBsk9/y+e87Z43OuVSdYAUSg1CuSFpCblGMp/9RvddMS6W3xJfEqeH0j0Gv6uTgWq4MphkdvKqESWo+4bO2dRcNoLoI3rWENANHxbW2uAD1XFBAa8cxJPPhj8KaE80+9lYGYTbXu0N48lZQ6aXbEk8n95pQie+pLD2vDrDT5ILnI94AKG+cmW4gDuOdHZlmZLZOPGasRNL7z9TR1QoUC9c1q+g2LnqvfO1eJKmaz/lHX2udrNdCJwVGKSNIw8fFYuOj51c/haspiz2rMynq/bt8dTradvcZvXxyN0aqLgj50sOoh9VyeYwdHzONTYazH2+lWsmLhnN3hTxVwEOXBEJYc8EFERa4aTEO5KclQJ+CyvdVYC58oXZ2tEjossIMmFYTV6mB7vPdAibF8xOgtY1ynbFU6U+EJaIQzH9/BKjR+CexA8DMGCHBc3mxEB7ermdgDQGzamRzIAk3MDCGJEzBF5E9IL55t6fkxaiaxTsBV+pO8ybxrTh1Ta27vDWEp9qP+h1V13u+Hqys5u5LseWWH763pGHYvqeXoZBeqQ1r/0/yhdYmHbNjY29yvod3i2Lzd2vuW77JZkvyFw5LraWYLYrWcOXIiFWlg4CXJDbBEKnZtbQ6IlAPo042ChTh9VWqqaaWkzDb01Jx/E6r8XtXZNyRyIWzouKoANmu2BlXVZkcVx5BxcUWJ1jJbd7oRT1DxmZwLtYARujEE8tBGRxENdbd0ZddcbHI8LaxKQKk3EgdPkDuIBX4Q+D/AZyMYYIkOsQFBylW5lLylTHMmG/gCdIW9I9AUzcJAJDJ1tmhknciLE+jrzwS8THHLTpO0MxnIgbXFfTCcLGpM3sTmlpBBcHSyH8mo4GzWhFxWw0WAJaNnDDaNRDWM2hjdXzDsY9bHItbJBZaSFgdIUT8896+vNZjjDriDe6Bz6EQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 60b9224a-08f8-4122-8b4a-08d9d0963672 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 21:56:22.8815 (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: AM7PR03MB6450 Subject: [FFmpeg-devel] [PATCH 03/10] avcodec/mpegvideo: Avoid macro/av_calloc for ordinary allocations 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: givZuoOWD+YB Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index af433153f2..e9f2fb212a 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -632,9 +632,9 @@ int ff_mpv_init_context_frame(MpegEncContext *s) if (s->out_format == FMT_H263) { /* cbp values, cbp, ac_pred, pred_dir */ - if (!FF_ALLOCZ_TYPED_ARRAY(s->coded_block_base, y_size + (s->mb_height&1)*2*s->b8_stride) || - !FF_ALLOCZ_TYPED_ARRAY(s->cbp_table, mb_array_size) || - !FF_ALLOCZ_TYPED_ARRAY(s->pred_dir_table, mb_array_size)) + if (!(s->coded_block_base = av_mallocz(y_size + (s->mb_height&1)*2*s->b8_stride)) || + !(s->cbp_table = av_mallocz(mb_array_size)) || + !(s->pred_dir_table = av_mallocz(mb_array_size))) return AVERROR(ENOMEM); s->coded_block = s->coded_block_base + s->b8_stride + 1; } @@ -652,9 +652,9 @@ int ff_mpv_init_context_frame(MpegEncContext *s) } /* which mb is an intra block, init macroblock skip table */ - if (!FF_ALLOC_TYPED_ARRAY(s->mbintra_table, mb_array_size) || + if (!(s->mbintra_table = av_mallocz(mb_array_size)) || // Note the + 1 is for a quicker MPEG-4 slice_end detection - !FF_ALLOCZ_TYPED_ARRAY(s->mbskip_table, mb_array_size + 2)) + !(s->mbskip_table = av_mallocz(mb_array_size + 2))) return AVERROR(ENOMEM); memset(s->mbintra_table, 1, mb_array_size);