From patchwork Fri Sep 17 02:02:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30292 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1781508iov; Thu, 16 Sep 2021 19:03:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3YyW8TdvlE7iJVkgNO4B6gnF+hCBOk4XrUUkJYMY/jyJrpzBN60VSlqZGQjpvhd/F1qbn X-Received: by 2002:a17:906:5959:: with SMTP id g25mr9603649ejr.501.1631844208629; Thu, 16 Sep 2021 19:03:28 -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 w10si6873637ejv.170.2021.09.16.19.03.27; Thu, 16 Sep 2021 19:03:28 -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=EH0uAYOU; 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 67A1B68B0D7; Fri, 17 Sep 2021 05:03:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2020.outbound.protection.outlook.com [40.92.89.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EE7A68A441 for ; Fri, 17 Sep 2021 05:03:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VVeQsbIB9JefocUGNxBXdVUlDasrrayZNKzu8jIMNhGToPDGOPYQIdSucKYeqVgovmyfzsn50TU3aVSgdWtDvqpQHb7xy1xpT7MXMEBVnPqnYGLi+d+7nZv1x7rzxSohP0NGfyjoKwNVKgUY6Kc1XrUh3RxVjH0osMMHQTHsLp5IExa8RIGwZiPgrkE6aA1hz8TEt27k9G989bZFUbMPeS2N03B5+9Gk+1cSjL9Hygozvgw4OJ9gztsX+3LGPTn8zNsL3n/cmWeW72B+Mn2nVp/AZkpJmDfqqJjA7wL8Gpw+IMIIwqsaBU/4AqU99z6QnIoOZZtGt2g9VuEviG/xwA== 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; bh=0o1u7a38jORU6XPc7OUPWCJo1BfvrldMTIFABDCkMr4=; b=kz66HtMGPlmV4GXZe3STK9Dm/L80e545be+j6usDVwdXBU58VNDDGptWFKL0rb1tN3uoVZnF/67RsN3ozZ8Vb4MBJWqOlgSbFVKQPqvhHlk3K5KAo/fif7aBOwGGb1NUA88HgT6LJFKLaZ6aPB+O59gW3v0xB4q4AbgpW5ql2RWzrOxW7UxoamEV1TlCzmFD3OrzVROCQwwaFmU80c+OIdtT98aRy1Wtb4yQT4ZyOthxSV3tSROIs8TPVICg+6R90ARwjTk6mN344RtcT7jbjr0IYw376KScmJcRq7m4Q5LGVSjcbuQHdqq+MCmpCcFKq+8B/d5aisQrYieYut3JOw== 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=0o1u7a38jORU6XPc7OUPWCJo1BfvrldMTIFABDCkMr4=; b=EH0uAYOUPdQAsYQTWir2se0vpYLXAYt5sgj7T9hoxEGBhavqVdz5xE8lfOy8ODCwuOINngZbMhcsgcYJUkTjqejRywbIhIXQqIjkaVL19A4JJnRc4kWH5CeBLtgxd3+JQb8Ah/UeKOGl1zceoRyxjYUNUxC2PTHBi4FNFzUTnILvIzU9A+naYm1DwXWGXTauJ5l9rvX2p/r+rZIZk/7mo30JHkueXykBtoBhugztn62y4vMELoeoxud8Ih/98s4hbBcAIEOqTdfUTuObdyc8lwZgvBVvZ2qre8fyu7LG2bETgqJujWOkmrbNZT17G8EXbH63RdfgPR8S9Rk4aObk5Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6872.eurprd03.prod.outlook.com (2603:10a6:20b:294::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Fri, 17 Sep 2021 02:03:15 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.016; Fri, 17 Sep 2021 02:03:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Sep 2021 04:02:54 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [BXgl1fZPeWOQhiwX+TKBKv3jY+0Gh79l] X-ClientProxiedBy: PR1P264CA0012.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:19e::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210917020306.275251-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR1P264CA0012.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:19e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Fri, 17 Sep 2021 02:03:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4858afdd-1fbd-408f-d3e9-08d9797f4f34 X-MS-Exchange-SLBlob-MailProps: pxu8rxgqUgh8Iyy9QXxCxqRTRmqUtWIWrQikd5B7Hevm23hxblAFg81bmuEGiWgLTNRcpEXvKGOc5flttFYmHL+IF3XebX0cu4kTE5tATvX9L++YvXJkOXIQv6oC8cJse5umOsGMXXmjzKvqINmTbINseu4A7Fk9037wOpOwVhDZnYlk9yiMhSk8wy6cotv+E/pECMFwmbx9Pck085idyWVkgSobelf4vFQI8CwAN0gfAfu9xNBbvno1t/pSy09Ohe9k9hmzFxO7Zd4COeYoHq8P4udLNeKgKz//KHDsPLnGSmLOGidn+C5M2rukDgj7dDnQ/X/aupmxsr1CwF7qtMW6lEOTFwG3Qhq2QVH5xODmgNCJuYTKE4zpXl1qKVV+rjIr0dQ+EuB6kdGfu/eFdhWlVwatjTLeyfii7Hb/fQ41oW7pBYTcSZQ9EjMXagLo5t9rwJRy6fG4xwtSHBXsr+5/SF+KNNx5laA56xpHgHYrQLGiL+4gJceexEKlXGOtB6wqYoZee8qHa/Jyx+FSferwUun3NKrxIeyQfpjet7C0Ik+4v7r9OZsxylFO5B01QsTB7Pjw7IbDmrAfjsCpEqPaNK1F30kmizBNQQH0g/uWKdGwYhB5w9orJXdHmoH5feQg7oNCpqaPRhhH15lvkiig+FGVgOfczCggwTPpMsFR55cHoGBUiONegzbEierdEVDt3QoqMLgORsMYyK4k5Q== X-MS-TrafficTypeDiagnostic: AS8PR03MB6872: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6JxnYwTfbv/C8grrFmVL1pig2oFhEJAQZzPmZL/U26LTuZuJZ3qZ5TzVjq3SC3Vfyt/0IpEn29rjJK9EkeKLbWsxYRyzmtq97oD5shCAu8emerFEGZDAG64hhYt7dZ0fFGso7J8HA+IZ+AwhMeaIQ6chz/3WZHG7FTI552oQ7T4K6j3hS/UGujBmdJAqOUQwCRp0D6yMffo+1HiL/b4/nre6vBIlQviPOL6JEUp5IJXz73c1dWSV3O/YY3H6NT5azQxzmj/EjLeu/lUcIGdBm6Os16HalG1vujiFaiurD84r1t31dKWjUS/frjKVNPKEDsKR6tifCb7XwTOXDIzb5W7N3De01//rTsG5+z1tbIwPQ4BKrSCU49hFVcP7Wci0V2aR24U3kAJFtT9tO6UCeunqRX8a2iMrHBxdwjKHgfkFRhodLEqrvySbkjGCt58e X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4XhBoOoQegBC7JBOSFgViG+iybhxodl8qUntjr3chXIvlm6d3F2yyAVaSBVEE6sMtQVJcmRBW9zeiembbVmwclZts8w2i3oS2CC4oQsNUzPby3Kk5QPKDmH8AysgwaAqSRRMhWZaOi5PQoo6Y9uryw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4858afdd-1fbd-408f-d3e9-08d9797f4f34 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2021 02:03:14.9790 (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: AS8PR03MB6872 Subject: [FFmpeg-devel] [PATCH 01/13] avcodec/elbg: Remove avoidable buffer 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: 8a02WwDaDDfu Signed-off-by: Andreas Rheinhardt --- libavcodec/elbg.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/elbg.c b/libavcodec/elbg.c index d012d9a384..795fc83f16 100644 --- a/libavcodec/elbg.c +++ b/libavcodec/elbg.c @@ -376,7 +376,6 @@ int avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook, elbg_data elbg_d; elbg_data *elbg = &elbg_d; int i, j, k, steps = 0, ret = 0; - int *dist_cb = av_malloc_array(numpoints, sizeof(int)); int *size_part = av_malloc_array(numCB, sizeof(int)); cell *list_buffer = av_malloc_array(numpoints, sizeof(cell)); cell *free_cells; @@ -394,7 +393,7 @@ int avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook, elbg->utility_inc = av_malloc_array(numCB, sizeof(*elbg->utility_inc)); elbg->scratchbuf = av_malloc_array(5*dim, sizeof(int)); - if (!dist_cb || !size_part || !list_buffer || !elbg->cells || + if (!size_part || !list_buffer || !elbg->cells || !elbg->utility || !elbg->utility_inc || !elbg->scratchbuf) { ret = AVERROR(ENOMEM); goto out; @@ -423,9 +422,8 @@ int avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook, } } elbg->nearest_cb[i] = best_idx; - dist_cb[i] = best_dist; - elbg->error += dist_cb[i]; - elbg->utility[elbg->nearest_cb[i]] += dist_cb[i]; + elbg->error += best_dist; + elbg->utility[elbg->nearest_cb[i]] += best_dist; free_cells->index = i; free_cells->next = elbg->cells[elbg->nearest_cb[i]]; elbg->cells[elbg->nearest_cb[i]] = free_cells; @@ -453,7 +451,6 @@ int avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook, (steps < max_steps)); out: - av_free(dist_cb); av_free(size_part); av_free(elbg->utility); av_free(list_buffer);