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 6E5D942667 for ; Mon, 21 Mar 2022 21:10:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D41D768B143; Mon, 21 Mar 2022 23:10:01 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073014.outbound.protection.outlook.com [40.92.73.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C4096801C8 for ; Mon, 21 Mar 2022 23:09:55 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uaht+voPXeDJcyKvY13F2xy9L/14DAHZdyFTx+juS5/ZzELOcXBH0i/y6MiLxpiGHNXW9NrMA8oV8/E8iwhezjmsdxBpDtMa1npLmOvPcm6flBfbgOCMeu3Xm/PGS1WcafUUZkSg9z27COEg1CrsPbF9C2nQ3N1tHiLs4cXsajxlDkn6bqx88IJDz3YwUqcRwKZneH7+xb1UWfYj5b+vKxnxoI63DGdfsuIxNeunjcBxBKbIItl9SvRG+raSDAF2fTLYvasYbqRWJuVIkvNnVSpzrTMW/CSqIj0BtpOG1QEUdWjdZYlDibu58ySUNeVpiQFdC21lHT0aweyoRuf3eg== 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=cHdPD3bKgxRNr6LkPWBUi87wmX29Zz5MGuS1viNdZfY=; b=C8P57AHp7kFpQCmVaOnauoN/Qju6SwjA3b6ViQlttxoNQHpKgFldX7LyROzPirkkVF0AlByzF1Ul3L3JL1xKgyrnLaNeptCPIwuHSoX07HvKzTUqWkXEGp3F/mXcGtuRtZSNiIfetl1z/3+X2iQszQE7JaJ9z8wnKu9YpNuHnHBttCss+iecL4lRu53F01ZrQK7rr9GC7PUJiMoPEugoNhhiFGNNyDQsFTfnYkD9aMq2R5J+oTgH0jJvtJwRolSD1UgOmFsOgR2ucnqSVz/ePsgP1xVoP26zychVMEuXNfAPTJi3hq0cCZ3a8fsviyr0gqDkITIa/oe3FoAU0ajEPA== 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=cHdPD3bKgxRNr6LkPWBUi87wmX29Zz5MGuS1viNdZfY=; b=IrKT5+Nik0mOJNtOeQbv9Y+qdi4qXTCfKN3YBjEryGkOtxGNOqvzGX+Vu/dFRgB+VSSR5XU44gFwtiuPDPUvPpnzOQEn0m51HQzB4TuQBaj1HXF9JRFp3zsWcYjsPkd87cx6nON105NxPPEhD8iCLoaguJqe7evmrH9Tm5UGSUIech7dNG4WDWnmYHh2rjDIi5nONSTNRjW/+wwmUjI//HCcpOpcJOnMqli+VQnF3c0+mfFwNh3W7NrTEN9C6jHT0V7WWsMxsAeK23w9zaEvIgAOMYP3+36XTSILkyVsjHBgOa/lJWCkH6JEmyqTVqcmEPSCCgqUbV5Dt1np7H9eYA== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by AM9PR01MB7409.eurprd01.prod.exchangelabs.com (2603:10a6:20b:2c0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.14; Mon, 21 Mar 2022 21:09:53 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5081.022; Mon, 21 Mar 2022 21:09:53 +0000 Message-ID: Date: Mon, 21 Mar 2022 22:09:52 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220318131504.18488-1-nicolas.gaullier@cji.paris> From: Andreas Rheinhardt In-Reply-To: <20220318131504.18488-1-nicolas.gaullier@cji.paris> X-TMN: [nmdynOxWN2C00UsQr0QBbmkZubRYGSBD] X-ClientProxiedBy: AS8PR04CA0021.eurprd04.prod.outlook.com (2603:10a6:20b:310::26) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <7ff24749-93b1-1132-0c1f-34ff6b20c000@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0412114-1147-4fad-b417-08da0b7f250f X-MS-TrafficTypeDiagnostic: AM9PR01MB7409:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2MbCPbmN0AC1w7xqJZoSDBCpsf5QevmieJUsqc0FswzfxwvYkHSL9IInQehqRJE+Ao+gfE81/EqWyxA7DQxK7bEhWedunsqYNYcbM+Ap+lgjUbMQ9y3FAMnwLVHHqDkjwsi6IPxsTxmQZah16YBNT3BpoEZuJhh6iiched+6SYosPahNS2GPszg0ivRxcuDcMSdV7RLn5Ky8gwW4X7028bxdSvOuQ/a4gw8T9CcAXKG/3YwCUmMqX1VknX+I37VX1MVKmpLHw6YhQSZXlKapSNACLp13iQk3igVTEQyA7fpcWbqgXMQyEH6Pzom+B3LJ+atZQzFjgcBHtR5xKtiN+loa+SXAdURngQDC7XL3u0Qf0PRdnfPddqWJ7u3GwE2Uq4CMc85njWEZmmvo4Y3emNqi4S7ca0CgnX34j3UIi6vIx3XofmKnWVjVHr9JHrU5yPYdMZQDuDwqX06Axo9sZsBYbaJI2WgMthfmNLrWtbLpSpR/PDOGhQeg4ZsgOdNXgV/OQ7Y1eTR/ch2pG8ltEf7su2zuN+LQc9s2os3TUC8VqzBbtRIfV7y5wM5qwhmO/phha9VX8v2rxdvTyVXoFg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dVQ3VE4zaVh4S2NrU3h6cGZsbFZjZkZCbG5TeVJ2REg4TnFWZGdCUE12R1dy?= =?utf-8?B?WkNsZUFsdFJFM0RuWWdnNWlUZENvNXdHcGl5bkNtckx4NzNVQTl6NmJVQzhi?= =?utf-8?B?R25qUkVCMFZNMWRRYzU4UG15ZGlhMm1rN21hL1JuMHUxZ2ZVbkk0eEEwM2xv?= =?utf-8?B?MCtJbnh5WGEwRDFqK0pQSVd2bGxYaEtQd0wvNjBJZzJzcDFYbkV2VVBld0Zy?= =?utf-8?B?R0t2djYxcE1HbW5XdTVyTU1OOXV4bzlJUEd0d0FKaHdGQm1hN05HY29ZaHlU?= =?utf-8?B?TExXclM1QVlZZEpxL0xUZ3k4OHNZZEpUejc2V2hTZU5McWlScmgxTHVtellW?= =?utf-8?B?VzJ1TUxtelpTNTB4VlAybHlYcUxoVnVFaGpMd3dueG1qQVgrR2hPUDlQVmVU?= =?utf-8?B?UFpodWlsNmlZVDBvYWp4Q2t4cG5Ea3YwNnFOdGs1a1g0eE1xUFowOWdrMlNX?= =?utf-8?B?aU1QWCtITFd0OURGb2IwMk5LUmZzYkZpT0ZqczhtTGRibHB3cFJjNVZyem5o?= =?utf-8?B?dmkvcmY1VWxmaWFZajhWNC94UUhTajZhYzVZUVN2TTFKeU5Rb2gzMDRIcThn?= =?utf-8?B?UmRxRXc5R1hkenhGVGVPVkJ2RUcwT3RMck9Ca3NNZWxITEhpYnV0YUlsMDZQ?= =?utf-8?B?QnBySlljY044cXNGU3BGSHJodXVidWlrQlBkTWdULy8wRFR4LzFqN25ZODJ6?= =?utf-8?B?Qlhwc2ozQlpTRHN1eHl3YUlYN2d6bGk2MXZ3L2xlWXExT1haN0s0NjZHb1ZO?= =?utf-8?B?enpySjQyc2VxV3czcHlRMXF5OTlSR1hDODRUSUZOVzl2SlM1SE9wdTduR2l3?= =?utf-8?B?cWsrU1V5VE9aY3NEcWNRbStMYk0vT2dYL0todmdTb3AzU0l5NFZEMWVvbW5H?= =?utf-8?B?R3NRUnFJdW8xWFZVd2NodElOV09aNUNqcEJsYWppWloraGl3ZHpNejFDNVUz?= =?utf-8?B?YzVyRzJXVVpwSkk0a3J0RjhEMk5xNkJDejZxR3ZwYVJrNDFpWkNuUnZCNGM2?= =?utf-8?B?WmRtOXhNN1lnNHdwMlVicks3K1c3YkZOZWZhVStZaVJQRFBLMlNmaXlBY0FH?= =?utf-8?B?cWJ0RElKdTVweFFMTGtRRkRzcnJ2b2NZRnhxc0lYcTAxSVNJT1VqZitYRmtN?= =?utf-8?B?Ny9LM0lrT1k2SVh0WFRBVDJXa1JBV0tZMmdWU1VKSEpNMGZEOEdiS2FOSmxN?= =?utf-8?B?S3dCaXBiUFlpWXUrOVZHNmJVbStlWVhhTVpBWmcycDFFRGpDT2xCTEpXbjlG?= =?utf-8?B?SHFibUY4NWgvbGN1SFUzWnRneXp6dHFXcUtKZHlmb0JjM2paT3FPQlBUUWVI?= =?utf-8?B?ZXM5VndQRW5sZk9Oc3FxWVJzNTIyZU1NcGZWb1M2RTJTM3k2Mmh1TnkxaG1j?= =?utf-8?B?cW5HN2IxV1UxbHJ2V2tBakhQWnVkcmN6RU1MeXE5U2p6dkk0eDgvYzJmTWdR?= =?utf-8?B?RUhhYlUycDRhK3JOTXhFb3NZS1gwaGo0R1E2TWhteWxzL2lOblRpdjZRRi9j?= =?utf-8?B?L1NCcmFnWFVzNGxJMjVYV2JOa0t5d2xNbmRZc1JPZ215emlKbk9kSE5KckVP?= =?utf-8?Q?p1n0oA5rR3QAgd18NGlg75ubA=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0412114-1147-4fad-b417-08da0b7f250f X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2022 21:09:53.8605 (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: AM9PR01MB7409 Subject: Re: [FFmpeg-devel] [PATCH v2] lavf/mpegenc: fix memory leak in the fifo since the new API 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 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: Nicolas Gaullier: > The older av_fifo_realloc2 implemented an auto grow that should be ported as such. > > This introduces a limitation in the buffer size. > AUTO_GROW_DEFAULT_BYTES is currently 1MB which seems reasonable here. > > Fix regressing since ea511196a6c85eb433e10cdbecb0b2c722faf20d > > Signed-off-by: Nicolas Gaullier > --- > libavformat/mpegenc.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c > index cc47a43288..ba0b5d813a 100644 > --- a/libavformat/mpegenc.c > +++ b/libavformat/mpegenc.c > @@ -461,7 +461,7 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx) > av_get_media_type_string(st->codecpar->codec_type), i); > return AVERROR(EINVAL); > } > - stream->fifo = av_fifo_alloc2(16, 1, 0); > + stream->fifo = av_fifo_alloc2(16, 1, AV_FIFO_FLAG_AUTO_GROW); > if (!stream->fifo) > return AVERROR(ENOMEM); > } > @@ -1151,7 +1151,7 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt) > StreamInfo *stream = st->priv_data; > int64_t pts, dts; > PacketDesc *pkt_desc; > - int preload, ret; > + int preload; > const int is_iframe = st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && > (pkt->flags & AV_PKT_FLAG_KEY); > > @@ -1207,10 +1207,6 @@ static int mpeg_mux_write_packet(AVFormatContext *ctx, AVPacket *pkt) > pkt_desc->unwritten_size = > pkt_desc->size = size; > > - ret = av_fifo_grow2(stream->fifo, size); > - if (ret < 0) > - return ret; > - > if (s->is_dvd) { > // min VOBU length 0.4 seconds (mpucoder) > if (is_iframe && You mean an ever-growing buffer when talking about a "memory leak"? Because I actually don't see any ordinary memory leak. - Andreas _______________________________________________ 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".