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 382914ACA0 for ; Sun, 19 May 2024 09:48:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85CF868CAC9; Sun, 19 May 2024 12:48:36 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2036.outbound.protection.outlook.com [40.92.89.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6218068C533 for ; Sun, 19 May 2024 12:48:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SX7k1uXU/ZQKN2d41p0qgkd1gsImnbH4DGT2wv5JTY5XmVbksozeO6VfzYcUPpYM7EeU8YAWgjG5CTaUEcZXnSdXdLRwTkOJqoLOA5252yN9Kddp1TLN+/zeB/Ecmos1lBU49KbtfyAzuy3bxSNKZ9fwuHp+4enBHwXZtE5caDx7RnIeOG6XaeOyjlvdxT7p7dWxn4lunUiwFuH47of5ulFb68RfCQQ3KELV7vPhMTf+yibETF5k6EipaMW8sUIHQZ6LEoLOAY+cyqDLJGDShbaGbKQL6ifO3nC2NIrC03KLBilM8SPChZoO3rmrhM2omRvFWCdDXobrA1Gczc457g== 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=RkFuca4N+fQ+/0+wj24G7zOpqr1/q12PfgugIvvmWrE=; b=Tbp6PF5T3OLOOcoqhrD4MpqOH7vlwVswF5nNJwxzPC06+ZmyoPRa8Wk2+UpJABsWb+4kA6LAVp/A3RXwpue962gxRwqbjlyUX01d0sPjOAiq3TWsPJVRhiJgtDvjJLZNMSx+YYgnyaga8yfIeZDPHA1sheUGrIl/1BBu3orbKnxOywdyKciixkFnKY9e3xCcmKPTdv+aEJfjtQb+2yz1RLmdZfbH2TECoGRhLm+IeKnpIFnXAepaXZ+de8vI84gKZ6unWPgimfkMcQM2v+1x4iIGFmzVnysq5IzBa/7T7kT2EMIcoZ6+RkhRSLbEsyjRkbpoVakc1aVQI/XGw4g9jw== 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=RkFuca4N+fQ+/0+wj24G7zOpqr1/q12PfgugIvvmWrE=; b=GLYpFbFqM7YsMkTckd/J9QVE/iP/O8iUCkf+CVxpfRX+lOrky/9hKJtS29UcTuupcWKM2prLiSHgkY+RPuiZcYg7mD/wCsieSy4RfirjZurFhahBi+TVVaott+c0AyCzbZ+fRLqu0l7xKhSMRP80sIYg5kxXCppCy9NcCMxL/PoYJjufTYL77MLwYtpYWzoHD6osddHra/MD0AQeziS28T3uR7NVkxE484bH/5tlGA58m3e4mSTKrbEzeFCKpe9NYb0w8dSQfQtopA3bJCs9K9YI+eyrl860Jvh3L3N3vnnhhnAMKrOZBtrv3FDbV+vT0xuvg0li2ipY9URgEp6c+g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0365.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.31; Sun, 19 May 2024 09:48:28 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7544.052; Sun, 19 May 2024 09:48:27 +0000 Message-ID: Date: Sun, 19 May 2024 11:48:25 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [uD71TxxBWIJoPfwA9ovcHkcSnGZNIJgr7oknhMwBZMw=] X-ClientProxiedBy: ZR2P278CA0042.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <42f1fa12-97cd-4983-9d74-8f3d04b98aab@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0365:EE_ X-MS-Office365-Filtering-Correlation-Id: 67767426-0b0f-4c8b-bd0f-08dc77e8d554 X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: UKYJbLL2ZG9H+GGqI9GoGJXBtrmL7IeWPW0qSrh3gZ46pWSC0urE34VfFpT2pTR+Hjts8aodlCAu7mE8HLP0xDqBfMIh65Yrc1yXvQK5HxYXk71K0W4Pi7tVyfHUtCwwO2x9LjazYU97rICO4DwN0MzIHeTYgTI2FMti0JNJA+VbDej2ThauwshOxPsD7/GE4HPi8oUTe6MC9tyi/RIylM7TA2z6T0+BoX8Cqj3SHQjrZxVtJfkl1uavW6VFiV2X3XKsN+i8O39xlisaIAOtrGPooVh3sIgMOMpQALmZLlnsooYpXd8yjZ6N1IheGKZJPWqrkbTB92nSYq/zIFe0qzDKKvZZH6s0r7RlJF6l0X/Kc6E96uPxxlmdaFh+CEv6lFg8lJwne/k5MvwJsRMniGrByQVFsBd5ccxqIe7orXRuhv99trDyUBcg2jcp5FZUrr8WmoVc4qKkkQ4f9g8uKEjWKin+8mFH10uUcwzuXxD7xLTIUlDk7yoBdkhcJRw57UbdwRb5Tl5e6gynsvjjKUpCSyfAnCFBShYJagrenHrdH6qeCyRT/qR8utKA4rzO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MVlhT3hrRkcrZGk0eWwrd0REQmtXaGYrRHhWdWIxeGJ4Q2FWU2xMS3RFalhl?= =?utf-8?B?ZTg1L2R0TTBtWm9ReGk3N1Q5YXMzeDh0S0VuOVc0bytmeHI5V2ZJMlZYajRT?= =?utf-8?B?OTREUnJKeU5EYjZKK2prZTVxSUlxbVhtZDhQcDNiM0FtRWdTNlAwYXUza2RY?= =?utf-8?B?UmNzRlhhOVFhOUhZb2NXVWdFaEt2VDJSUGQ2cEMvaFlWQWVxbkhkMlY1TWZT?= =?utf-8?B?V0JNUXVaODZwVUJZSDdNblpVSXRwWUlKVjBYR0ZSYmg0eU5Pd0ptNWtBUlJG?= =?utf-8?B?R2xRNVQrdWJMQ3Z5WVRweFIvbEJWM1gvTXdJNTJlem5RdnN1Q3BvMEQrMTZ5?= =?utf-8?B?NDgrM1ZUVXdja01LK3NhVGIrQWRYSVlvaEVBaFl5bWFNaUNwK3BRaFpubVc3?= =?utf-8?B?bmNtQkFuRmFkVjJxTFlMTDFQcGdWV0k1S24vd0dZbGRHMmgvMkd2TXY4MEVm?= =?utf-8?B?T2tnR2d0TitPQkE4NmJhMHpVT1ZzU2RHbkxzaE5OaGNMUUZHVlgrVzlQcDlM?= =?utf-8?B?SEZPV1hFRmdrVEt5bm00c0U0ZnNSZTFYUHpXdks2eUREQ3ErU1doTDFZb1k0?= =?utf-8?B?T0E5SlhMU1NkNmNockI0OXNQemVGb21rcmp5WU9SNndneWFHMzVCb1hTQVg3?= =?utf-8?B?Z2dVZnAzVEhzS3NyV0hKRFlMNWJ4dzdibUZXV0VBL2NSY0xmNnhCU2Jvc1V5?= =?utf-8?B?dU0wNkJMMVFqLzJoYVlQVUpTdHRTWityOWphbVVlT1IvSUVjanhGT05jcElr?= =?utf-8?B?c3lIRTZpL2I4K2ZFd0g0Ykl3NHpSQm1LekNhMW5wdkpnc3FLK2RMRUhYRTRW?= =?utf-8?B?amtxa0dxRDhaMDk0L1VFY3hYekpsRHF6UDVWdlpJdHBoM1pDc1IxNnJWS2M5?= =?utf-8?B?dUxmaE9XcDJXODJWZUhmR050SzVXT3UzelBtaFMwemZ3dG1SaDRpZjNTT0Jl?= =?utf-8?B?Q0V5WC9QRzBqR2lZMUFjZnVLRkphWE1aNlNqYjRFaExTUXVMeGR6QmF6dmxJ?= =?utf-8?B?Z2MzYm5CRXhxRmlkQ0ZxTkdCNmxvTGZ4TE9mZGllZm9yVnRYb3JHem9vdzlY?= =?utf-8?B?YUNYM1BrOUYvWUw5RERMSFF1NjhKUyt5cjYzTkZtRXIwSkVJQlZPZUU1cTk3?= =?utf-8?B?MktwY0wvazJ6a0tVemgvQmhQaEFEeGxJZ1NteHZ3WDNiSzhkQkljUjMyZURo?= =?utf-8?B?TE1ZT3Y3Q2x4dlUvYllFU3JvQzl0Q0Z4Smo2VjVuY2pJMzFJZytRQytGdlFK?= =?utf-8?B?TEtsRHpzN1NLOUJJcXhMNVdENnBkV0NxeGRrQlFCQ1Y1RGxQekhQQzJBb2Qw?= =?utf-8?B?Unl2Rlg5c0NPWEhnc0hML2Y2d3R4bkZXTW1zV3FWSndBek9PVUVhUGQ2N0pR?= =?utf-8?B?dzB3MkdOaytsZHo5Wm9MczlXR2NJa0FnYnlEZzFldlk4RTNxM01aaEFZMVpP?= =?utf-8?B?alc2WElmNkdpM0MxaGk1Wk5PdE5zVXE3b0tOeG1TczZtY1M1RWFOTDUxcVJx?= =?utf-8?B?MXZVMHZkTllqYmc2NXR2d1c1L2hYMU4zLzJOa2lPNC85OGxBcy8xUmMvV1Rs?= =?utf-8?B?ckJzeitDRjFraTFONVk3MjdQQ2lSaTlUOHN4Z3pTZmlTR2o4cGU1UHBCM1lO?= =?utf-8?B?dm40cVNXNEVkRElFbDBySVloWnFHNzNsQVJXNVozUEt4cGVlOXh4dkVQREo3?= =?utf-8?B?T1kvUEdGcm9rZzR5UkpiWjRjb1ArcmNWTW9MTElWNWN5emVXQnRSZ3F3PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67767426-0b0f-4c8b-bd0f-08dc77e8d554 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2024 09:48:27.7856 (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: DU2P250MB0365 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/ac3enc_template: Avoid always-true check 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: > This might also help Coverity with issue #1596532. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/ac3enc_template.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c > index 49fc6d7f37..049666fdca 100644 > --- a/libavcodec/ac3enc_template.c > +++ b/libavcodec/ac3enc_template.c > @@ -31,6 +31,7 @@ > #include > > #include "libavutil/attributes.h" > +#include "libavutil/avassert.h" > #include "libavutil/mem_internal.h" > > #include "audiodsp.h" > @@ -50,14 +51,15 @@ > */ > static void apply_mdct(AC3EncodeContext *s, uint8_t * const *samples) > { > - int blk, ch; > + av_assert1(s->num_blocks > 0); > > - for (ch = 0; ch < s->channels; ch++) { > + for (int ch = 0; ch < s->channels; ch++) { > const SampleType *input_samples0 = (const SampleType*)s->planar_samples[ch]; > /* Reorder channels from native order to AC-3 order. */ > const SampleType *input_samples1 = (const SampleType*)samples[s->channel_map[ch]]; > + int blk = 0; > > - for (blk = 0; blk < s->num_blocks; blk++) { > + do { > AC3Block *block = &s->blocks[blk]; > SampleType *windowed_samples = s->RENAME(windowed_samples); > > @@ -71,7 +73,8 @@ static void apply_mdct(AC3EncodeContext *s, uint8_t * const *samples) > windowed_samples, sizeof(*windowed_samples)); > input_samples0 = input_samples1; > input_samples1 += AC3_BLOCK_SIZE; > - } > + } while (++blk < s->num_blocks); > + > /* Store last 256 samples of current frame */ > memcpy(s->planar_samples[ch], input_samples0, > AC3_BLOCK_SIZE * sizeof(*input_samples0)); Will apply this patchset 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".