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 7E03A41267 for ; Mon, 9 Oct 2023 12:29:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E23168CA4B; Mon, 9 Oct 2023 15:29:15 +0300 (EEST) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2012.outbound.protection.outlook.com [40.92.48.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7B7568C7AD for ; Mon, 9 Oct 2023 15:29:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZOs9eJzuZPUMWCMGBrpu3tQm5U8cCN/9sHILhTf+CPKf/6LS73CfxeGinPmEe6ZNvgNGtohHWsJ7IFex/XOxGlXKhzriv5Rdlb7k0G7II8ffGNR+ovWHQWJ8s9W/x9cPNuv36Ru/+xyrvlc0Y3k7eRe1lHUIwf49sX+7Gqaf63WzUM33hYMQOUrGUdq28j8YWHVZaeNWoN37tJ9rAKkT1QUoa22++80DsYjDrFYK6hH8TEie5aYaBcjagiMf3QgysLjzuJH3FrcZBU2DRZZq9R2T+KQqTJq0KEsTfppyfyCXrYW6L1T8TWsvCaDzZpN7zAg0/QMKkLp6tHmPBEqCyw== 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=tOMUxM1k0TF4CH9RTcWZZxTgg1kj2J1/ts1/yGhHP3g=; b=hBPnR+vLyFR9pQlkZYzeJQR0P5DGdoEb3Hw7uwLfRI4SuG79iQHhEbdTSY+CcES46VjRYD4iOtVzpqHcNFXpzBa406qgPixGJicytXh+c3Yw/DdWR4r9ulV4F4XeK5qLGlwKRn7kooql43U4p1IwNcFws9drYr6bS3AczFS4Tx31ImsyRVsxwcMarl8Dm8WTWkRbBaNLAt8EkC36wYJRGal3gRMoEkqCnKriKy/90fsXWKOut25HwboJOFS5ahE+2pz78zUwVmORQKVhtHd9I0Xxd13SvkglZQ35hogvAACxi7XmuW5sEZoDroTvZTC1pbZBE1CZrO3D8LAkzdF2vQ== 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=tOMUxM1k0TF4CH9RTcWZZxTgg1kj2J1/ts1/yGhHP3g=; b=BymP0fg1MzQ4ZYyNJniO3irOjy8y6X7CzzPLShuG7Egm7TFVCPqmwHZmzvD6HP8+9ceo4J/qyzrNtY5PEFjjNZs02qs8MA95UvlAmWgwtdHZxqnycV3kn2nXL93mG5eC8XQt3qq3AKjfJJ19jebLV7xhGvupCLzIfsFy93se2iweW+2ynnmQXyi/Du7G0TmmFS8grVpymMwvOS4hocM9/0Gs9ufW6V9X1gbO7iQNBRqp5RXgpCveSVW9GqVwu6cQ5uKPCEjcw4pAyVouN17DL+3NZtwIJjFeNExbaBTlBsBGu4WpJUe6b/3z7M1efkz79Mp9vk7uRJJzYNwfWBXvsA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0025.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b6::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.37; Mon, 9 Oct 2023 12:29:07 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::3126:4823:194e:6f86]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::3126:4823:194e:6f86%4]) with mapi id 15.20.6838.040; Mon, 9 Oct 2023 12:29:07 +0000 Message-ID: Date: Mon, 9 Oct 2023 14:30:21 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20231007163313.GP3543730@pb2> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [asRvW9Rn8b943+MCX9ZpROxXUnkUhZoP] X-ClientProxiedBy: ZR2P278CA0068.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <22f556f0-4462-4a3b-850d-f48972ae22dc@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0025:EE_ X-MS-Office365-Filtering-Correlation-Id: 45d97a6e-aeb1-4004-d367-08dbc8c35472 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /D+J30bfg5EtV7jl1RK67ymFRkrZpYvVITsyleV4uXn09+FOP+SYgfydNIo9Vfnps16wGW3alkHK8ThuIhGUBGZmGZtsqp7ehXowgdkhsdaG/8hkc+jlvVGDt/caVHGzwVprLOtzdQzlqQr1U54L1IArPBW4ly3u7N8+0pLWmmUG4Ski9sr8Jw2VbC6h45Ay4fx72gqVzbxu97i/GPagjCpEQgJJXRyOPzXcuANBgDgUoJ93lJ9jzTvlDuyuPpsmw/6qyBdsGnn1bP0yB8n7KDjJdPP+oPiAIV8OGy8fpvw6Su/yUSXzhlyaTLiTRZgLQumZTL4gXR62Yd+ruISIZgsMS6JeVW0XT+1kWYhEscTFYI8IPL3PqWd/E8I5I3kuB2Vkp8byWKxzSqd9eloCojrPHw0TE+3B66i1muyKfxZDauiHbhNp89G9mqoskenTwcJVlY6srMHrreuZCpkHYZbZo1G6lpSvnKgweoLxtcqv8VX1mR2J3xwCNm4TleVbggoimpBcCOgsicZYGCFqvUuQkTtpESP41LydJfGU2PLOBpr52Y5CT1JKqyZyYsVP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cVJEdnFOR21FdmtpMlV1dzB2cHpkNkdncXJFMkxWVllJLzFlUlQ3cDVnRm9Q?= =?utf-8?B?aG1KSmh1WmIzUFd4cUhvcVhmNU1HeXhxbHhtd1JzaTRIc3ZuS0ZOY0tsRk5V?= =?utf-8?B?eUtoTG9LejVtVTlNTHoxTWxweTM5cFc0MnV5MXlXbUVsRGxseWlMUDQvbmpk?= =?utf-8?B?Y2xMcWUvSi9DWUw5Qi9Eakkwb2JVQi82eDFtUWQwMlJxUW1hMUh6ekp5OWh0?= =?utf-8?B?TERCaTZUK2dEVEhHUHZ2SllsaDkzZmVmTERZV2M4SEZTNnlnU01Semo4ako0?= =?utf-8?B?TXI1c3lBT2gwT3AyaVJuVFNhNnVIT0ZxZnJMQm02S1dScnU5TnNDSkN4a3Zo?= =?utf-8?B?RXhxekppbXFoajhtRURtaGVGVGN0SHJSRW1wemkyK2s2b0VUbVR5dE9JbW9S?= =?utf-8?B?VC9oUkFQUVlqVVg4WENtNXpaSTdheGkwSDVFTGhJMGwxZU5kbkpiclkxMU9j?= =?utf-8?B?amdlRGVtSUJMdnViS1ljQUhqYy9hV1JKVTdJbHFZTktPUzRMREJxUEN4dC9B?= =?utf-8?B?cFhiNXJEdVhOd21DSEZmZHo0TFBwTVRIcVlqMkwrK0FhU2ppTWVsQzBabVBV?= =?utf-8?B?WW40VmZ6RGhDSVdsek5heEdMaUovUW9wVEN2VDNObFR4YVhiSDFqbzhzcTJ0?= =?utf-8?B?NW53T0g2eEFVQ04zQjJHYnpFaW5sUWR4VE9ucVpQaSs1S0kxVHQvQnFHZG5i?= =?utf-8?B?cjJ5emZrUkc5Y3pXVzB6ZHlZNWpaeVVKbDVhdER4eTU0cERUdnErT2dBZjJP?= =?utf-8?B?aUl0SzlrLzkvdjRkV3ZvU2crQTAycWRQNytvd1E2YU5WRUlseUNpZWEyTDI0?= =?utf-8?B?bDZIS0o4YUZWdFhibUU1Nml6blhBR1M5UWlrVHAwM0s0UXI2dkJTQ01ldDhB?= =?utf-8?B?UmxENHZhZkwrWno0QkFYaHE3SUpnMnRETlFwdk5ibEQ1YzlLWXRHWWFmbnhE?= =?utf-8?B?WEIyazR6SUVQcC9rTEhraDhObXRtWldZTktiRW1oYUhDM3dQREZQcnVPTTB3?= =?utf-8?B?TGVHcitydFFkVkFLOTRMYWlkN2NqNm1qejBOYlFHU3BhZHFqa2NodVdBMFhG?= =?utf-8?B?dy9sNnBOZ0E4STk0SHFSWXFvbm15b3AvRGdORzltSW93cTJoMk00alB2eGtp?= =?utf-8?B?TFA4bk5MU1luNHhJcGlpd3pwaU9tekJGQVFFdnVDTEdleFpXakUrZjhPREF4?= =?utf-8?B?dHAzMU1NcHpMVGpiU2ZzNFFpaVl3NUZHZTF2TWVtR3FtQUMrTDlUTDg0amFv?= =?utf-8?B?SW5Ra0JQUUxjRitkUXRrZVp1TmlHblZ5S01EZXJWUnpsMmdlZTU3NldobitU?= =?utf-8?B?bnhZVU5WT3NmUitZQVlBUGNuazhBNGY0Zi9XQUpFb2VaZ2xON3dKSDU3ZnIr?= =?utf-8?B?emNLaWcwQnVvYjZwd2xTRjNiUFFsTHZzQkppUEhaZFhPYUN3ZGxrVzdmdlpZ?= =?utf-8?B?d0ZTcDFIZjhtbmJYRE1jdTFLM2d4RHVUVHN4aTFVUTFMbGVETW5FaXJ6NjFD?= =?utf-8?B?a3ZRb3R2TExnN0N2aXEwOEwvVnp2WkxJR0RXMk0wY1ZPb0pJOGYzZGtxWVFX?= =?utf-8?B?SSsvM2JZc2cwRE9sbmtjUVVFSmhZd1c4ZEFWNjRmU1MrdERvK0xCWHo3TEpZ?= =?utf-8?B?azBRNmU5cjIzbThHak1OZ2prcHVWTzdleVBLNWM0MnpoS2tkZGV3VnpKdURG?= =?utf-8?Q?orQMlHC3ihlwRh8tM3DN?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45d97a6e-aeb1-4004-d367-08dbc8c35472 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 12:29:07.5492 (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: DU2P250MB0025 Subject: Re: [FFmpeg-devel] [PATCH 06/13] avcodec/mpegvideo_enc: Don't overallocate arrays 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: Andreas Rheinhardt: > Michael Niedermayer: >> On Fri, Oct 06, 2023 at 04:46:29AM +0200, Andreas Rheinhardt wrote: >>> Only entries 0..max_b_frames are ever used. >>> >>> Signed-off-by: Andreas Rheinhardt >>> --- >>> libavcodec/mpegvideo_enc.c | 10 +++++----- >>> 1 file changed, 5 insertions(+), 5 deletions(-) >>> >>> diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c >>> index 1e0aed8db9..c06fdd08fe 100644 >>> --- a/libavcodec/mpegvideo_enc.c >>> +++ b/libavcodec/mpegvideo_enc.c >>> @@ -819,8 +819,8 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) >>> !FF_ALLOCZ_TYPED_ARRAY(s->q_intra_matrix16, 32) || >>> !FF_ALLOCZ_TYPED_ARRAY(s->q_chroma_intra_matrix16, 32) || >>> !FF_ALLOCZ_TYPED_ARRAY(s->q_inter_matrix16, 32) || >>> - !FF_ALLOCZ_TYPED_ARRAY(s->input_picture, MAX_PICTURE_COUNT) || >>> - !FF_ALLOCZ_TYPED_ARRAY(s->reordered_input_picture, MAX_PICTURE_COUNT)) >>> + !FF_ALLOCZ_TYPED_ARRAY(s->input_picture, MAX_B_FRAMES + 1) || >>> + !FF_ALLOCZ_TYPED_ARRAY(s->reordered_input_picture, MAX_B_FRAMES + 1)) >>> return AVERROR(ENOMEM); >>> >>> /* Allocate MV tables; the MV and MB tables will be copied >>> @@ -1231,7 +1231,7 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) >>> } >>> >>> /* shift buffer entries */ >>> - for (i = flush_offset; i < MAX_PICTURE_COUNT /*s->encoding_delay + 1*/; i++) >>> + for (int i = flush_offset; i <= MAX_B_FRAMES; i++) >>> s->input_picture[i - flush_offset] = s->input_picture[i]; >>> >>> s->input_picture[encoding_delay] = pic; >>> @@ -1450,9 +1450,9 @@ static int select_input_picture(MpegEncContext *s) >>> { >>> int i, ret; >>> >>> - for (i = 1; i < MAX_PICTURE_COUNT; i++) >>> + for (int i = 1; i <= MAX_B_FRAMES; i++) >>> s->reordered_input_picture[i - 1] = s->reordered_input_picture[i]; >> >> I see the addition of "int" and that seems neither needed nor >> explained why in the commit message >> > > It's part of the general switch to the loop-based iterators wherever > possible (it is better because it automatically indicates that the value > at the end of the loop doesn't matter and it also allows to more easily > move blocks of code around). I always use them when I touch a loop. > > If it matters: That i in the outer scope survives this patchset, but it > won't survive for long. > Are you ok with this patch and the rest of the patchset? I'd like to apply it tomorrow unless there are objections. - 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".