From patchwork Wed Jan 5 21:18:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33092 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1089539iog; Wed, 5 Jan 2022 13:18:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJyxn9xnC5csc7V+NXo/WRyY1cO5u5SXMFEizsqRo0pA3YLcCxUx5iFcdLgx/iTyJDwkJ26m X-Received: by 2002:a05:6402:40c3:: with SMTP id z3mr37747081edb.386.1641417510121; Wed, 05 Jan 2022 13:18:30 -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 i39si36899eda.211.2022.01.05.13.18.28; Wed, 05 Jan 2022 13:18:30 -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=GJa6wOJD; 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 1D18C689BFF; Wed, 5 Jan 2022 23:18:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2093.outbound.protection.outlook.com [40.92.91.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 878B0689BFF for ; Wed, 5 Jan 2022 23:18:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hYEvYglOcbupfMMPNGbbbZdfRJS1Rr5d23lzC656ujsJcx5kf7R3/Okg1MBQ2lgXaTAqlKpyToCRomQLVIL2TvPvSBMyLKGVUcISlFvSYPtC4QqjeP7q0gpvpZ3HzcpB/cuLKJ6mGNr0FLgFcwPDTG+ou3n9IyQc0luAL76NZD2exd/qiKqSFLhEr9bkhKEwC28yUQNloz2fT4L8ZWNwg/4QAvxykcUOgUemtMHCIc2nGkq0aIZ+WKd+lEu5+JjpL8DEvKfGH9hclgKdkR5/83ESAGPOgcGUL8wqcfLNAQKAidJ05k10JDpJVuQ2AtNg73p5U7RT+prWCRscLKO0Dw== 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=wwr+6EfTOtG5Z//Qdd4hvOt/zbCS6tk/PfwtQ+SdE94=; b=jWnwkZuLdedIwVxHnTWFmUhDoL9J7JV2JxrlTj+wGDVxAPJ4msuN18ynP3JECFQjcQk/v/XvCayaTuenDkh8hklDyBnnFL4U/e1IW3/GJfrHm4GmPuMaRx00JFR1ZhzoAfev0rsJXUSwnTMQOX6EtkTG//5EsqSg73neXtnMrn7ppS9D67GnYtsFpxVDQ1jqM0VG21LBX2OQIzvLEW1FhesCh++dS1MdMcqqs+QFE+nOZmjrM6u8DFJ03ITR8tWKKU4+HgF6tFRF8OVoDkVOLKEUqa+WuxbIA0CGi3aFVM3sTE0RrLOzIdhu0KuFPnAdsHl2Pxj7IqoAS28MpuWOZw== 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=wwr+6EfTOtG5Z//Qdd4hvOt/zbCS6tk/PfwtQ+SdE94=; b=GJa6wOJDLI7YVuObv8d60v2nB5qaPiPYZHR+JvMQW+AoyjPmblw5VXvNrEg5cOCuuYqw9NwVJzlKHX7oE918qOw5n6SEsAuC49SVxVcXE+fZDKfAhFgtxo2umDExpQ59ChC0zYMYFrJ4xYLXU0S1+WcxzwqJCyG5a7uNOIc0Xkyu1eBBLvil4Msl2jNrxZgj82XOrUS/ft/JWiLfB1q7Kib1oAJWskrZUV7KiuW5jCdliUFuVKziNcc13a+N+ePf1AqtMwjeB0lZQkmUpXqewHA+C9Bpc/F15P965BkMn/bZkRfzAYXJgaZk381465qnR9qODEWhPp8N0CGz61f1SQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5379.eurprd03.prod.outlook.com (2603:10a6:20b:c1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.14; Wed, 5 Jan 2022 21:18:21 +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:18:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 22:18:11 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [d87Y3V3OKUYBzoIpfjgveUQ1MRCH/ids] X-ClientProxiedBy: AM0PR07CA0017.eurprd07.prod.outlook.com (2603:10a6:208:ac::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105211814.652006-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 47e0032c-f77e-4b12-240c-08d9d090e67b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JLW3JzCk1VgEeinm/sEhvzyILC0AUkzFzldIHtyq88Ec90rsCx9wvdsD1d5QB7TzXG7oD4Fmre4nO97sm+FBf77nCsu9F8JxOLQaAsg31WnWVMOglk6otzWXri01S6ybaVzVbZYwv+SQ5JlVyg6ooNBYeks1P29c3YAuMnZBT7ovAcliYaH0OZFlTFzMoHtWhSaBZ3A5YRwsVvZR1O8tlUjotNG17XvF1Aji3ss82asjix/dqB+e9mbgd9htZsuimX36pa/3Yj+UygIscaImVfWftBroj+c+B1PViF/aSrWKTw/+5voazxlHcC0KzKCT5X4m4tDYY2eGJ3e6NTzm6/DIIH0S0Hf28F2+taHnYJEyjasnrEeiupOWrJAH/v/cBP44JUXshXKxXmw2avap1AKNaSQIlOTaNMOnz9T1P0O2XdbvHkdhEAohBuWo/oGqoTVmlWVWOqzfdMuacr5fnqiShZOyQ0vbTMou23jQ0gwwe+0LsN2beILyQ/QpR+c2apwMA0/SwiFB0TTYlayQtARGqemiHSYG71iJePjY826M+YvWh99iHuwR9EJmbjSzkS0kbgHMiyhhfs7S/q3xMxkbMphL2mi2YjiVK8cLhmon2OQqq4G8n4aNj+6QUcy8N6Banm5Pr1avJFEE04Hu2qOEd69GiJFWpdn/5eBXgb0HO//7fbU6fg67Jq+tfTycZHdaeBFGgCP4ERyqbxMYmfZIAEb97Dvblxj95Q1PrQYw= X-MS-TrafficTypeDiagnostic: AM6PR03MB5379:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JifedZD0go64e7lyPvroXjWRhVT6V4rRBnILX8lC7cPVlakdaZcX3FjPv/QncAwtv+Xretnfuo1QDPWT8DwZHeFgoUbLlwXwIyN6jLM3+d39TCT0XsmDUu0DqwyJnB6b/0chWOWwNP5QtnAMhVquXsdVslXOA/ksQx7vHrcG42vZ6UKXd7UsYqAu0+49r2QTlTeiYI4eVCqDY7CJ7QVpRVLdqGvxxV4kqIo2rQi8mVZ4KX3hCZOvKUkknfvvryuUSp6Av6xaPRWNyd9ixNyVZ2VFrhCEtJAmjlCNShRdHAmrW/aEOzCajOUdBjxs+7xVhENMZxlqm329mteHirVdv0pBaRFcC8L2CvP7X83eTEK/GRsRfk97bLtdSBvLcYOgKTn/TnZ3nhJHyBmRTXQLPwxsVKzWoILkgRHJGebstG30TYXo8whVIblwgloE1UxGht1yxx9YuAOtNX7vTRAgwGRTCyw7fMeQuXZiDL+izAwub4bCvYOsYD1sEjcm0sZ7KCJxG77O5X4S4aPfwJnawrXx8ClSe4UYtitQz6AEZk6YHOcX1Da6Ky8y03ljuX3fIScgdI4F2TOpRT+W0uIADQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FHhex9Ny2Pb/2kRSzbv6iluxv/Z6KwRVGVfR+imCwfG2Jr93Y1AVrzfvYPNx1Crgrkm3DKrwdPzGptby2uEo5dP/Ns+r3GzsoCG8ExX2yY9DnXUD4cGt7fkpKOLOHVflbgJ21UZNvZ5IKjJ68EvxNKo81BOCS7BIxJs5iz/2USGGJysS+6uf4g1GJMY+D/HHe3LwIdN2g84C1boscvjbLcfdPW229nS4GEPeLLmrdQGd7iP2ML+OfA2VdQ8FzNu6qayCxAMo+Snw74vv6hgx2uo8xziPOMZ9lwaVXPnxocMNxN3ZQ59xMlJarGxIemes1idOsDiSimkQTwegf0sEbhHuDF4J6x/V3oPQLVt6fZg5SPKDwubrn9FnYOaxovQd2hBtOdKCZo6tWYzIG1k0MC/Utjf81Rgr/O0J+KNxMcOhLjZawnTGKxm231RkMn7xSwSwLp6he03S0z4F+WI+5sr85m+D7UL9Og8Al7SLahxIN/Bry7AN+VcrMSjJLtcxn7eKN8dMuuQa7oW6C6hstm5Z6at/3sU4FcM6TbiT53cILpwzvA016K/D7M6lxVUHFScww7mG2omq97BfmRc2kPoehHo0uvRGmBP44/s7D7cwIwck5SVWxVT/udhxx07kEIXFJx6VZm+PJ/4FQyFWgr27Y1Ot6TvmqkLgghB7qh1t1uJ0ubW0j0ETo8h7loptRA6OnjULHim2dgyX8L3RHZRuL4tkeNbslo3M8NTRKbWUzQzyQcTxtPwyevTT76mnQxTsU7evSh0oUAoAnumWRVCkXZDq4uHkqKrwNPBSb3QTLwT4eGHmEH2BYMW1f4MS2Em3ZK7xWfwQ7+cCKd75d9xt37IKrMVmhophUSX4HRtij9AfV6J3VQ3TQ+RQPVFguG4AsQcSJC95ubCDRXcdNqpyAT9RthpzhK/wFeGeTQfSOaAvxFhw7m1dQBXl8j/WcH1Ocr1TF7b4XXO+w0Petg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47e0032c-f77e-4b12-240c-08d9d090e67b 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:18:21.2845 (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: AM6PR03MB5379 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/hevcdec: Combine multiple 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: wbD4BCyEyHZ0 Reduces the number of allocs and frees. Signed-off-by: Andreas Rheinhardt --- libavcodec/hevcdec.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 8d7a4f7147..568bdb5ab7 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2621,17 +2621,15 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal) const uint8_t *data = nal->data; int length = nal->size; HEVCLocalContext *lc = s->HEVClc; - int *ret = av_malloc_array(s->sh.num_entry_point_offsets + 1, sizeof(int)); - int *arg = av_malloc_array(s->sh.num_entry_point_offsets + 1, sizeof(int)); + int *ret = av_malloc_array(s->sh.num_entry_point_offsets + 1, 2 * sizeof(int)); + int *arg; int64_t offset; int64_t startheader, cmpt = 0; int i, j, res = 0; - if (!ret || !arg) { - av_free(ret); - av_free(arg); + if (!ret) return AVERROR(ENOMEM); - } + arg = ret + s->sh.num_entry_point_offsets + 1; if (s->sh.slice_ctb_addr_rs + s->sh.num_entry_point_offsets * s->ps.sps->ctb_width >= s->ps.sps->ctb_width * s->ps.sps->ctb_height) { av_log(s->avctx, AV_LOG_ERROR, "WPP ctb addresses are wrong (%d %d %d %d)\n", @@ -2716,7 +2714,6 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal) res += ret[i]; error: av_free(ret); - av_free(arg); return res; }