From patchwork Wed Oct 6 06:01:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30925 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp55672iob; Tue, 5 Oct 2021 23:02:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4FLnavaUzcT/teuyEWAdqW8coQ8C9Pe4TpCeqDLAzVNPR9zRSCgA8XZDAFXB4R5hiqyep X-Received: by 2002:a17:907:7752:: with SMTP id kx18mr30205803ejc.276.1633500151635; Tue, 05 Oct 2021 23:02:31 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id de10si20295119edb.150.2021.10.05.23.02.31; Tue, 05 Oct 2021 23:02:31 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=AF2JRhy4; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CBAE968AA89; Wed, 6 Oct 2021 09:01:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2084.outbound.protection.outlook.com [40.92.19.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41E0068AA6E for ; Wed, 6 Oct 2021 09:01:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UuWAU5gn3QUgvhBLwHbo5DrJo9TFGRy1SSNjDoaUzWbTu8u81XS5yAT1sxzCBW5bSDt4WDmHxNAuSHwJ/LqQ8KlKN6aCD1SsjRszhVwuJAlPkG/VG1IMrZbhKel3lyISrMMITjAZMdXgmwM8L8zukMvEz0vaqbVlzMFmZxAR/rsIbl4VPijiF3XqyMRXW9g1pzh9k3gBPerFmG8TQz+toYAMooQssbGXyzWBoOTi1l9sUssWptiAgp6wkuuHgM30nOM92uyvwAsIqKc2W6jZNTqN2dvpL1NCAmj9W34ZzviP2BnjejVXCcR8JKvNa1OFJu7QL2HZlwahPNebA9fFBQ== 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=VvINDtEopHzlurO/TC0D8GYaEnPWnBZwlYjknzOy6jQ=; b=W/5vCwTiEyOabQUeZ4LbLKAA6RodBiqGwSLjdAdT90P17OJgj9DTIJ5hXudxpBGXcX14oPzYbSe79WsnY/n1mqxC2q5GlOGAd46rce5+UC1PHRx5r4B5pAcK7cTGvi2S7wixm3lqcIBzeslNXVdOHK+2w6s3jcM4B+ameeOHSI2i/VrApn/rCDG65r4c9vjX+uzyDLZWvDzwO8CjuMi4D9G9O8WEPQr968gOYzN7cad4/WiUlACHJQ8nNW/+oxUG4C4G92dcHbndNkM6ToLKFbjqVuTEvbUnPfIzPhVNzoUjqL9FaaFi6IBcjLMGlDXetRMg2iFvWQ/BORCC7YX9rg== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VvINDtEopHzlurO/TC0D8GYaEnPWnBZwlYjknzOy6jQ=; b=AF2JRhy45fyiHWWlYZ0nukh+LUCq6b4Ec0/9V1QCBRpdPRy0RvEXKqIwxlwqsEhM0VzO4bc95z/aaBXhuDj5L09A6bSIPZnvC5+QARXR6Lzy8mxrNX/KJ72N9bZ9VoC1ISxZUCWNcd7t6HOn+5tmoTRT0RnWE5o8phelmnk4vlPUIKJJFGU2z/6RRC/S/oJy1QnNe47Jd7daDJcvk/5XycnEC+6ylyZgdKf64zDkhM3Dt6tnBceoeOQc9AXsZ3pN4/o1w0Hx60qPS5rqxbp0AbhgwkO4iZAU6ngnkn++nzeH5AiMitjm0QJXKhVu3c7Jn35H0zFQT6ur8kOnYOIyvA== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6253.namprd04.prod.outlook.com (2603:10b6:208:d9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Wed, 6 Oct 2021 06:01:06 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 06:01:06 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6 07/11] libavformat/asfdec: Fix macro definition and use Thread-Index: AQHXuneNCI3QoF4fUUuB67TyYvzBXg== Date: Wed, 6 Oct 2021 06:01:06 +0000 Message-ID: References: <04c4183da3bb06cba3013b35c928876c5c8959f6.1633499980.git.softworkz@hotmail.com> <7e6f65bafd8a5d426f72aaddb1766040255f1d9d.1633499980.git.softworkz@hotmail.com> <9f1f7004020091a995b54d8752172b9e429aed53.1633499980.git.softworkz@hotmail.com> <1f9e954eaf80cbf2666e9011ff5c18ddaef9b270.1633499980.git.softworkz@hotmail.com> <67a3ef814a8956660209ea96afdc4b6b0727e094.1633499980.git.softworkz@hotmail.com> In-Reply-To: <67a3ef814a8956660209ea96afdc4b6b0727e094.1633499980.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [n9aMIKTNt9U0AR6IvbzxdHYXyTulSk+Q] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 16a2f506-e329-4c33-3000-08d9888eaff5 x-ms-traffictypediagnostic: MN2PR04MB6253: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PdYRC6CH/S+9Is631b3LaHLc81rVJD3Ge3Br8eRYdK9bj2Yi0ZQVPwE+HvwPZCTSl1KZjWdsvUU+5NACabLA0oeF9aO8Ve2hSoYChvN40kYyYgBxnOrDm1531xaC8n0V7yzBO6OX20zfZAE9KhjZKP6d2KfsN1Lz/cqU2Xr6R4DsOm+8ZbdkwnTJb5c/uNUHihjD3svUkl7k2ZZadPD5UCT8YqXB0rxEIFXcVsP7d6lcZKkmi4OrRLnStuZlUVblNTCLNoM04BtdtLBxisKi3MaA+3BhZrbgpkL9Btwuel+3mF2OBem9FYToahlChGxjS3IXngGz92yZoTvXjhGCPczIEI5nlekqTqJVZiIv1foSLknIw40wG5zakvFB5IjXxsx+AmX13AORlUvNJ0QdnmBHlJENYYdwh8bS4XIKRgFM+EEg+ysiGEkheHAiEBDZ x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 50t+Kdl2QAw7toYazFz5A/Y7dpIOf3E8obpnENM2JawvqGL2DzAyFmLuCW+cMWjqYtxcfvFPbd/QH5sVjNnkzPUyjWad9wqxAg5JWVvxswtKtk7hKsLarzP9jp2KhY0Yny+m2Dbw/bHx3xgzT8AQ4A== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 16a2f506-e329-4c33-3000-08d9888eaff5 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 06:01:06.7941 (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: MN2PR04MB6253 Subject: [FFmpeg-devel] [PATCH v6 07/11] libavformat/asfdec: Fix macro definition and use 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +TAlJ/oLA8sR Signed-off-by: softworkz --- libavformat/asfdec_f.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index e87c78cd6c..a7b5ffe465 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -896,21 +896,21 @@ static int asf_read_header(AVFormatContext *s) } #define DO_2BITS(bits, var, defval) \ - switch (bits & 3) { \ + switch ((bits) & 3) { \ case 3: \ - var = avio_rl32(pb); \ + (var) = avio_rl32(pb); \ rsize += 4; \ break; \ case 2: \ - var = avio_rl16(pb); \ + (var) = avio_rl16(pb); \ rsize += 2; \ break; \ case 1: \ - var = avio_r8(pb); \ + (var) = avio_r8(pb); \ rsize++; \ break; \ default: \ - var = defval; \ + (var) = (defval); \ break; \ } @@ -993,9 +993,9 @@ static int asf_get_packet(AVFormatContext *s, AVIOContext *pb) asf->packet_flags = c; asf->packet_property = d; - DO_2BITS(asf->packet_flags >> 5, packet_length, s->packet_size); - DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored - DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length + DO_2BITS(asf->packet_flags >> 5, packet_length, s->packet_size) + DO_2BITS(asf->packet_flags >> 1, padsize, 0) // sequence ignored + DO_2BITS(asf->packet_flags >> 3, padsize, 0) // padding length // the following checks prevent overflows and infinite loops if (!packet_length || packet_length >= (1U << 29)) { @@ -1056,9 +1056,9 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb) asf->stream_index = asf->asfid2avid[num & 0x7f]; asfst = &asf->streams[num & 0x7f]; // sequence should be ignored! - DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0); - DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); - DO_2BITS(asf->packet_property, asf->packet_replic_size, 0); + DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0) + DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0) + DO_2BITS(asf->packet_property, asf->packet_replic_size, 0) av_log(asf, AV_LOG_TRACE, "key:%d stream:%d seq:%d offset:%d replic_size:%d num:%X packet_property %X\n", asf->packet_key_frame, asf->stream_index, asf->packet_seq, asf->packet_frag_offset, asf->packet_replic_size, num, asf->packet_property); @@ -1134,7 +1134,7 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb) return AVERROR_INVALIDDATA; } if (asf->packet_flags & 0x01) { - DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal + DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0) // 0 is illegal if (rsize > asf->packet_size_left) { av_log(s, AV_LOG_ERROR, "packet_replic_size is invalid\n"); return AVERROR_INVALIDDATA;