From patchwork Sat May 7 09:36:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35632 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2088736pzb; Sat, 7 May 2022 02:38:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypVzdjoZKp33oXmd/LX0gErPyFoobu2diCGZ7qhLzTCss772Qhhs2Udjb7TsNtCiyIoA0a X-Received: by 2002:a17:906:a2c2:b0:6e7:efc2:17f2 with SMTP id by2-20020a170906a2c200b006e7efc217f2mr6370537ejb.542.1651916306606; Sat, 07 May 2022 02:38:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651916306; cv=none; d=google.com; s=arc-20160816; b=x2fyeT7vLbcZ6xTgtCLLKQniIZkIB43AfahvrH85Mgowb4DPQj0Cx6izVvTXaV0rl3 n3eOtJS8QVptZ4pvLJlVvQnog7oj8N+X/ULtNKA8uRGfZRMhzc93injMZEPyFVUehGbU jI4jFObZCh+pXHcII9cx01FKY8hF2iIch74gBW9POakx/aYUJGVYTmxBt+DKPq/kSv4d EQ54fx4urPbLe2Er2cT150Gr7cfk569Ztbfz+dJ8r1k2Y5G9dvRC9xEUOYxED7ZAq6Qc c0pp4sQaR4UGJBmDzbWLQAAuz3mMWyJG74dOybRaR1KAkGI42in8ee05klkCJ1O2UWKb qvHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=esJkTsTvTYVWjpNDsHa6LFZKS+M8o6r+u5/tZS/e98E=; b=xTOniDgiMYUjsNCijY/c6Vm9+iIJp+BGrTQ2UMcpb4OlBDL3kntNZmjXkmNBQABfwo qf/UMfZhbuJB3BrR4oPMXB9D27eKY25Ij39nDSqjKQIKfCmRv1QtYRaT23W1ftRJ/8++ S3PjFTP1t1ybRvl6m84ZLr2FzVX+EbbCuuz+gVmAEKT1/77LiIJYpnv56kTLjgMl9XPa W3PWt1ezDhX0hT1K9+f9d9gVgDLtlpPCTx1BMU+InAaegNav8kYYUOkeD7/IjBrE29R9 VMoX2/xB9qe0wpFrytJ8QF2fl8wkuV9HI6+LOzBqgdctdi4q9JsMt2cmPdrbU9ZYURl1 hEJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Cm3zOiym; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qf42-20020a1709077f2a00b006f38e5c5394si7616604ejc.159.2022.05.07.02.38.26; Sat, 07 May 2022 02:38:26 -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=@gmail.com header.s=20210112 header.b=Cm3zOiym; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F14FA68B3A8; Sat, 7 May 2022 12:37:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D66068B377 for ; Sat, 7 May 2022 12:36:55 +0300 (EEST) Received: by mail-pf1-f172.google.com with SMTP id bo5so8199675pfb.4 for ; Sat, 07 May 2022 02:36:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=9Ojxj87aqOirljqe1W+XVkycJ6Qv00wGjtAvNuXoRmY=; b=Cm3zOiym6n5GfoR1qrFb8NxLwhANnIUxaqLqoUb61GkjJnz5vcCECuPukrxv3AaKaa +vetBeDrvhK+GZZf9itiPGqF9A7hkym0/cG1BjscJM5jBgPHQvGRc2Jgc2xHDhOvxYb1 NXhr/SB7G10eE/Z7FH7VgwkCgd7RQb2lJIXaOF6SuIm5x/a2qr+r1Og10vW8J6DiuEWx DHIKsGIYtnzxjFmlp3uevENaXbC2KcsiFvzv35gnDrHCN2xvO8ddE+f+J/tuVqa5D5Po VVmohOl6vqnJiKI/D8BmrySKnn7DOudgtZ1HfC510VIm6xIZlZbDJrrpVNQVGZL11i/l Ltig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=9Ojxj87aqOirljqe1W+XVkycJ6Qv00wGjtAvNuXoRmY=; b=zQpwXuc3vdKJw0scufRJr8a4sjIsdj9oSmf6hfiFAMVrzeY0ml2F6oTJS26YkaGugz n2p7uXzuDZolB39s2aCFMXYyVu7ImniZ78ePS0nYbK6/Pw08ev0ot4mNtelDbEsqDmaB d+j9xf8irFa2Bd9rg2zOrH/vOnGOPQoh94iamoueRazSB2DHgnZC4d16dp1pwpc62cM1 2yYPMAZGXS7VNFaZgwLMoVRvoY8zPQ8dE3ZdaVbUgwd4UKhQGr3XqbbER1/6z3/aR07p R4p8kbN1NB491pKAgkzgFK3UiaPB9dH43/mcdyECGRwdAX10W4oDVXFShv3OLcLtdLFt BFEQ== X-Gm-Message-State: AOAM533G0lVi5dckEG0iyXFH3VcoaIh21x+Oyv/t/q3zdlqwV2dSqquX fHdeP61l/pGMTx50ucDMhaifcypcgqS92w== X-Received: by 2002:a63:87c3:0:b0:3aa:fc1b:3459 with SMTP id i186-20020a6387c3000000b003aafc1b3459mr6032725pge.210.1651916213989; Sat, 07 May 2022 02:36:53 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d4-20020a170902f14400b0015e8d4eb1fbsm3184152plb.69.2022.05.07.02.36.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 May 2022 02:36:53 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Sat, 07 May 2022 09:36:40 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 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 Cc: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +sQhFG92NTcc From: softworkz 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;