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 8A56340D45 for ; Mon, 7 Feb 2022 02:18:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8BA0F68B216; Mon, 7 Feb 2022 04:18:27 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073046.outbound.protection.outlook.com [40.92.73.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A178468B1C1 for ; Mon, 7 Feb 2022 04:18:21 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NFP2XWEOde1ufR8P2mDU7iIA6AgrDvxKtY6MPvdUe+geiQ/RjPdG+/M2yLVgHOJlXego16GCTrFqHYAHJ2SfEg7irnOZB9RQUsQimo7QVcR4eP4Yx7x6tlNRImBylBf/NfUw34xmb8ivwqNz32Sq/EGpIwe42SB7Jsbhpa2fEdc6s2jHFd0oe7esBUFc2NPjNVKK9e7h7UKOpuvtY6W56EBjw5JI4Vz3XB5Ci49lbLFU26tRyB1Hhz8BA6shQxbDHocP90WVZGr+6DpDSshuW5c+RcpwDS7tB7XpDIHcFl6Y4Px0YW2yyJ9OKqGJEPoYPFjFNHibhBl3p/PLpQD8vg== 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=5MVnm9cy+NBNMztVzbcD8qp+/XdDIlZ8faurGo6VTy4=; b=BQwcPFVI1QK1+vFem5VkgSO5xsdOlxDgkGIQNrGlaLlsJ5zHR3rih3GXYgj8WGZSmjwILM2f0HGHm2iBZi/wdmKYE4PgJn4Xh1n8DA3Cgr6GE5o2T7jvi3WBXdrJ6ubbfNOmolo3gLZPNC8pykiiIKpwG78uz6Q3E5NXZf8TS9Dsqu33wI9CekIHfqAV9L93A86IMgo8P5KHWZPZ8j0JER76dirPbuBOH5Ow55jqeDm3G+w/EF+OaeC6tq7vuIYKuv5EjAADlWl6AfbNmFjYH0cXSvsIPkRYRGcJyX9INbpuuFbZQnjwlpzRo5sxoKkSfpY1vgsEw/Wu4Pq+IY7Z6A== 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=5MVnm9cy+NBNMztVzbcD8qp+/XdDIlZ8faurGo6VTy4=; b=P0JCEA1kdz9TfAIYNF6WGAzunho8tw7lwENgUvn82OwxEEgN5wM348uf/bA15mzZOiqi2fWQZMsgmuqidjrA8HpmZJbVWMzKmeG/8o7E/qK8EzJydTRsYN22vKihyZ6zZN1MRvfp0/1AOro0T+n0AYa/lU1m6cSaYkylfeEajVFVpjLtdJv0+ofCjl3n6njTk8fMrOtHX/o58/aUufvGeB+41ncPPhAzjPjAjckM3NBCFfIKmZ21ATY6b7jHGXTmlsfRnSI8KbWEPEM08faaIUfXVRywfoN/mvjRekCSjbg2S5QZWy+prBAmeQDKNShG8boOpXf5esYziGKcOMHCPQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB4571.eurprd03.prod.outlook.com (2603:10a6:10:1a::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Mon, 7 Feb 2022 02:18:19 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.018; Mon, 7 Feb 2022 02:18:19 +0000 Message-ID: Date: Mon, 7 Feb 2022 03:18:17 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [8z8elJfV3HdYbTmbbjIhLCCbUdbojtT5] X-ClientProxiedBy: AM6P193CA0130.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:85::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 858447f7-038b-40ad-f4a4-08d9e9e01b2c X-MS-TrafficTypeDiagnostic: DB7PR03MB4571:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wsXiagzHESp5ngu1vtFCQ/xhG7d39roYEQkYXXNd7tH3BsvSwHQ36ZGqW23rAWFG8VNCNWho27jIY8RTm1sWuD9n6dHbuD6jvAi+/D9wuBglT2DAYpCDa5Ap42KwxNGJv2T8UagHusXjcXvltlDsY7QOICT4ke1g6MRaPyfwgYVEDR8i2NxgRZlHAcpDr33ror1jdymZcNuSMXdN53RXW+29aoAvV36dK7zr6oBUjyiKrOsUYNj/drgk9Hgm5LPmWNsYYA2D8k2kD12SokAynKJ31k0zkMfFsLLObgmUzeupQeFcdnxT4iDaTmkBTWfuZphn97DRlmVJBSqDVNOFZfPMu0NawcU4M80X9kbce5KF9N2Enb3mVyVhdXkXdjP6y8RKo/aRqrS3J933FH9QtuWhxiVZcst1OjNGghWoarPlrT0r+tT3RELa7VcSIRw0KEXuU1CJa4ALwJCI3E50m5gBt+xvj1VCxzJYJGo1zuThVfEDx48g0yWxSqESSfd0h0JmGDM+QoEKLjakBVZdQpAZXRbLIJluL4yEBLpUspWV/GfGYsk6/q8vMrzgXi+cepepEHz+Ch9rXR6/pJDx/Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Q2tJc0RLRXpJRG1aSlZ4cGVDNW1CWkRiNnBMK29lcE1lT1VQWDNrWUY5RGZk?= =?utf-8?B?Zi95bzJTWHIrQk1qYitEUkE3TlFkTWVVZHhBTWRJdE5kZmpXWS9DV29FdDUr?= =?utf-8?B?MTJyM1REUUlYU1B6MXJrK2ZDU0x1aTNnZ2ZIeHlSYnpobndlV29PNG5JRFRN?= =?utf-8?B?RUVSNmovUmdhMGxIK3BOTVgyNXNqcHZhODE0Q3ZpR3Y5R1YzRk5FY0ZRbHY3?= =?utf-8?B?djJ1VmU3aEg2bkxkSmhyRWdJWDNUQUcxZnVyVllZamZrR3IxRXcxeW5NdUNC?= =?utf-8?B?bWZXVE03VFJCSm51QzdnU04vdFllemdBV0VaL2VRUFdwbUxMRjcxWGtXcloz?= =?utf-8?B?elNXLytMYmhsZW5idUNaL1hVWlp5VGptbGx1NWx3dmlISHhVcnNBRDdmS0N4?= =?utf-8?B?d1BZNUpmbGp2K0RudExHdmlZTmdxbjUveXRxZnlNekV6dFE5SDRabkRZT1o5?= =?utf-8?B?RGVTRzRwVm9RMnNDN0JkaDlsWW9wU2xDTUtRdmVOUGcwcURQM2ZlU2hQdEQ0?= =?utf-8?B?OEY1V2IwSHV2QytpZ2tzMGFoaXYyaEJ3aFRpbXpibmVuRnpDS1FKM3Z2dU5t?= =?utf-8?B?eGc4QzFPVTFFWHZRZDlvcUVFTEdHSjVTTWMvWHFsdkE5QzBTK1U2c0FRN1pW?= =?utf-8?B?bVFpTWVuMHN3ZUJQZVZvejV4NGttUjdZOXpVVTdzNFNBcGRuOC9mVElZVDlT?= =?utf-8?B?akhWN1llZDFySWFlM2p2ZTdUVjQ2QWkySzhqZnBrRjRaN2VZMXVsTnNPTkI3?= =?utf-8?B?UXBOWHcrZXVjVHBLKzhYaG5hYTJ5Nk8zZFdBMllLb2VRMkJvQzRxRkNkeFpV?= =?utf-8?B?aFlqWXVPZTZjL3YvMDRmSW1ldEdFVGpoTGxJU3NhdUxNaGNqcVN3cjFxU2ta?= =?utf-8?B?S0g4dkVvMmF1cEZYbDRTTEI0NjRqTFBZaWJGOWlndU83TjExR1JabnkzQWsw?= =?utf-8?B?cm1vYjZhejROTDZpMkd0MEQ3dEZ1Y0ZxNUNxam5qMCtjMmptM3RiV3grNzB1?= =?utf-8?B?ZjV3TG54ODdtOXpQODAyS3ZMYWtMa0lJMXY3ZnVJYWpuWTh6MmRYNVFET1NZ?= =?utf-8?B?UEZlNFJybzFRbmgxMnNBTERsTm5HQzdydVYzWEZRZDdvMjN0Tjg5SnY3VFhP?= =?utf-8?B?OVI0eGdIUWZIQXhHTEJOWVg3azZWNmg2c2pibXcwSkxhMWUzV2MvWU5WYzJU?= =?utf-8?B?N3RQWXNIdk5WdWVka1VEaUFBR25qZWVDVXpVNlZOWTd2QitudVlhb1FtUHNr?= =?utf-8?B?K1NUbU5NcVI5RmQydGtNanJiOURZMnB5NDZ6V1JoRHk2UXN4QT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 858447f7-038b-40ad-f4a4-08d9e9e01b2c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2022 02:18:19.0168 (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: DB7PR03MB4571 Subject: Re: [FFmpeg-devel] [PATCH 1/7] avcodec/cbs_mpeg2: Remove redundant counter 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: > Use -1 as the position in ff_cbs_insert_unit_data() > which implicitly reuses frag->nb_units as the counter. > > Also switch to a do-while-loop, as it is more natural > than a for-loop now that the counter is gone. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/cbs_mpeg2.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c > index 26400f279f..4395bbf047 100644 > --- a/libavcodec/cbs_mpeg2.c > +++ b/libavcodec/cbs_mpeg2.c > @@ -148,7 +148,8 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, > CodedBitstreamUnitType unit_type; > uint32_t start_code = -1; > size_t unit_size; > - int err, i, final = 0; > + int err; > + int final = 0; > > start = avpriv_find_start_code(frag->data, frag->data + frag->data_size, > &start_code); > @@ -157,7 +158,7 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, > return AVERROR_INVALIDDATA; > } > > - for (i = 0;; i++) { > + do { > unit_type = start_code & 0xff; > > if (start == frag->data + frag->data_size) { > @@ -185,16 +186,13 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, > final = 1; > } > > - err = ff_cbs_insert_unit_data(frag, i, unit_type, (uint8_t*)start, > + err = ff_cbs_insert_unit_data(frag, -1, unit_type, (uint8_t*)start, > unit_size, frag->data_ref); > if (err < 0) > return err; > > - if (final) > - break; > - > start = end; > - } > + } while (!final); > > return 0; > } 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".