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 E1A2B46211 for ; Sat, 7 Oct 2023 17:27:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A2E668CAC7; Sat, 7 Oct 2023 20:27:37 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2057.outbound.protection.outlook.com [40.92.90.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABE9B68C7F0 for ; Sat, 7 Oct 2023 20:27:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iEYm53aZjvmmCI51LR8rTSiMIVjt2cYBAaFpb3vOrMazvdBo8l+kPu05XOrgQY/biZb8c7VclVFoiNAtqBpGkVVXrRb/8G1Dh0JA8OliCqokl6FDG8k73P3o38ujvf2Lm8gwqC37YdWAPQFcMEZRl7TWLPcppdxq/sQ067CT0EdsjP51jGO53ZrD9wm10o92KOF0vn7aCJVrF2RbvX8YiHbDB5XAinKg4EUsfaff4ehcvK0loljegiB22I/diH4YyWE4wvpfKMPXX82R1mvAMBt+8kOenyrtBmt0LQPxP+fugOx2xfvWwccYZEllgq16IxGJkGLzBzGlPjGejQAfvg== 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=Rypk7pLLCAIHkQQFn+/vKX38jmI56zxsuGnYGKhoEvs=; b=ZjBiJKrITntQ9IKzv85PhsgSc581/2X/4u9F96NeE81DtwWFPzlqOGbIHNb0Rp9ui9GZFbKBDtHi3ObTLUCaETrD3ziTvnbP36xmIwwPr/g1sZaJfXtkGmaXxBOMCejRcBzQykNerH2V8+K9vmHxuO6PC/uwCA/k+Lso5O6pVenwL0rhdj2Y34VCHwHOX9udYtQQbdtQF3iFIK8PP8+WYV2GQSUUtiMJ8r648EyUxuPdqBY4DsDNl+7GwiNLRrdy5CC13Yg/nEujJbDOnUC7SiThIMqvHYxhB04YkNz1u1zKP9qHkiRRB5ChJHT2gUNYq/QJD3AiEJgf/oH2mE4SnQ== 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=Rypk7pLLCAIHkQQFn+/vKX38jmI56zxsuGnYGKhoEvs=; b=Xdyd05F+MVQGPpUEMDgS3K0AVXGBgnCoA4DuUBCz5xNaje1N4NKllxizHNANDu9EFL0ni5MhP0TBnPP9V85TfBXvWIbS4bPmujB2Zj85KQzzXF9qKCXvLKjSXnXrXX1RT4B+yRLE2AscdNvWu74iYfocWBv0+0w2smoV7YVRAoi9omluHgfO1iiP+uP+ZxrA/0ODqn8+I92+/GmWRs7QPNgz/BVpHQiHIIuOYaD5IQXPCp1kr4fFtgo3nR73WHxKtuvGn7FrcIK5Va23EMnoUovKZRWWPZ8Bhp5M2jFWkiLJj2HxeSQbEXF8unrTmGy8PlbHyWSOipKcjwDIgRSc9g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PAXP250MB0423.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:288::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.38; Sat, 7 Oct 2023 17:27:29 +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; Sat, 7 Oct 2023 17:27:29 +0000 Message-ID: Date: Sat, 7 Oct 2023 19:28:43 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20231007163313.GP3543730@pb2> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20231007163313.GP3543730@pb2> X-TMN: [p0eYkrkhfBmaCwqQ7HXVFlna7IWKvCXC] X-ClientProxiedBy: FR3P281CA0202.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a5::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PAXP250MB0423:EE_ X-MS-Office365-Filtering-Correlation-Id: e704195c-451d-44e2-9615-08dbc75aaddd X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a+bq/ZMvElLCNyREpAyvZb1VpxTsUK+n0dJZXfJH2T+zIC36E52hi1Z5uA+hZG4h8dpMeMUmMNc9B+3twINtj/rYnMCUq57JMFW+gn0py4MUBF8SKUD+k3Ri+1RSyQRuDrg5d/lP1AQkMANyIsY4o8HKytsVyrzMVzEW3C5VmdM9oLkopB544GhMqkdV6KsSYDm4f3LxwWo9R01mZlXj+8x1D5m6Frp1kYzWSF25/Bmv5i9Br4qk18tZ9uh0gzmfDaDFcEm8BpoPztf/FkJqqzfvxFJ2RHvgCKJyXuhPcjoA7QekpTFNeXF2wyR+ivNsA4QzZBfZayZh2EIhm23bXz6/NTLlZX6a8lJMBHG4GE8pHFg9SKso34putSwpNM8f6AC5vQjK4Wgf7bN7aJNOpkrxf/93KIzJ7pYzZ2lu9R31ek/ZfoDfrw99r+3gHg7Ep3vLeWmT6I7RkZUfQHbupx5KL9iaQq4GVfd0QgITaHYYcIZNexpdSiBFyal3XlDiv5hDhHH4QVc/BoxSodIB3EqGFDWnaryU76gFzHsUF4v74RaCYMPT+DKVbbcPIjY5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NWhLUXlZenNNZWZCZkswbEU0ZGpsTHAxVDhlblFKWjltQ1dyZWtGVDZGMUdX?= =?utf-8?B?d05sMlVhU2EvLzMvOU0rd3l6SUFaVmNaSklodWhGVG1nZHdoRklYcytZZHlP?= =?utf-8?B?RWJ2bmJwbGZIUHVMSTEzSExEYUl2WTVRZ0swcWhrNFl6STRmNHVtaDdxeG1Y?= =?utf-8?B?THo0NGpUQkRhVG5pVmRxRGtDUTdtYlE4ZDMxU0FqM2ZHeWJSZWUzc0NHa0RT?= =?utf-8?B?dys3Ui8waXkwQVBkU1ZwZGFxQU5PZ3FxOStYK1R0cGUxbDU5RkFYOG52WTM4?= =?utf-8?B?WVF0TEt2cFlXNWhZdkVHTVhjUnQ1YSsvNGl3allEVm5lUXQ5Vzdnd04xTEJJ?= =?utf-8?B?YmQ4WHkwYVVQdms5M2tWWnlhYk1kVXlscHZFOGNxblFpeGwraXdFY0xpaVdn?= =?utf-8?B?dFBPcEMxWUFIcVVYaUcxYmJxcGU5ZnZYeGc1THZ3cGJscTg4ZUsxV1owZml3?= =?utf-8?B?U3dteTJMNTRSTEVZYnJCTGpLaXpmbDBTS29nMlI1c2E2endzSnRoV1hGeFZR?= =?utf-8?B?cGp1NU1nQnZwa2thbkZJSjlhRGhXTE43cjNmTUpFRjlTQU5GR2dJM2lDakFF?= =?utf-8?B?djRtaWpuNENwRzVJcnZ0bVZwem9ZV2lGcDBhUUw5ak1XWWNkZCtMU0ZZYzJF?= =?utf-8?B?L1IvUXZDaldrRmsrc0lqOWQ0OFlaWHI3QkRVQkRCa2lSTTJKSnRwWnV2RzRM?= =?utf-8?B?UjR2UG9yelpqSlNOVGNJVS9sVjJzUGIyTFpCRXRTS0hzbncweGRUZEZtaldE?= =?utf-8?B?ai9zK3l6YWN0V3J1c3ozYzZQVDRKMmZVc1V6K1I5UHQwWWtVN0pCekFVZU1E?= =?utf-8?B?bFZHUnR1RXl2T2lLYjFzb3lURkZGcERYYWMrUS90YVFWYWgzVllIRFdIY3dR?= =?utf-8?B?YnFZNW83anFILzRaT1RtcWdxSUI2c0RLYmFwR05UaUx4bmRHeTdCTXN5Y2Nw?= =?utf-8?B?SmE2Y2dYZlRicXdoc2NsVWRxOHN4eU9CSTl0Z20xcVoyYkUzMGhZMFh4NWgv?= =?utf-8?B?RUdWcnE4YVM1bTN4Wk9vYTNQUjhCajk1UHdXK0ZST0VZL1E3ZHdORWlBZE9h?= =?utf-8?B?L2hvQWY3TExGNWhPZ2FZdzUyNHUzeXpONmFXY0hySjVBZFRLM2RBdFFPWVhI?= =?utf-8?B?NlBmMkpxelV5ZnhZNXZRa1ExVHB1MC8yd3JGeFU2ZVBrcGVzeWZRSVVmN1RM?= =?utf-8?B?aTlQOFNNb0pOVGFIcko1V3ZtNFRjOGQ3NkdXWXBSNjJSU3lDQnJkd004NDl5?= =?utf-8?B?M3lySEZ2amNXZHFBZ2VZVFFvUnJ2UEpqUmVqWjVkKzFCK1JjdXMySU5ZVHlV?= =?utf-8?B?a0V3bWRHNmdEZnNiUUxjTlN1UU9YazViS0Y1UDNFT21aL3V3Y3d3bmgrbGZl?= =?utf-8?B?WEhkZFR1VTQ2YmJzaXA5TUdBRXIxUzV1L1l3VkVVd1pzZ0s5ZnkyR0p3UHQ3?= =?utf-8?B?TE1qYnhBcDhIMzZvWGlzMVAwL0E0czUwemhqRThyNGlmMFQ0UWxNZVUxSHZL?= =?utf-8?B?ZTlmZjNmbnVSZ1c1QUkycnp5Y2xrL29HR3U4Ynh1a1V2Y01CcWY3VWlwM0pO?= =?utf-8?B?MFMzVEYxdHpoOERaRFh3dEVYOExZYm9ZY2p4Q0Z2dEllNzAraEtVdS85QlAy?= =?utf-8?B?eisyTkpEbkk4K29oSEc3VnVFRFBkNnFFeWVSdksyZmc5QU1SQTlYcC8wanFU?= =?utf-8?Q?9COZsFKnVZ2GKjYQ818k?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e704195c-451d-44e2-9615-08dbc75aaddd X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2023 17:27:29.0479 (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: PAXP250MB0423 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: 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. - 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".