From patchwork Sat May 21 05:21:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35865 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp919911pzb; Fri, 20 May 2022 22:22:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUMCnJXx8/r0fBYsTwA1yZKqb9Wf3wQMpzcB7IhixFGmJnQd6ia1N8dp0NE5xM73/tVqkH X-Received: by 2002:a17:907:728f:b0:6f4:5d2d:38c8 with SMTP id dt15-20020a170907728f00b006f45d2d38c8mr11135043ejc.345.1653110570171; Fri, 20 May 2022 22:22:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653110570; cv=none; d=google.com; s=arc-20160816; b=sraklhCW7XI2lNc/sThyGCsDqEBOjwQtIz5WlcqRGafnqCVMJxDGvCcHuzZq5P25q/ UFLLAfUVEKAKDzLtDH1IVZJokTgfaHlb+5VycHo7av3Ttac+n0xD140qf+TiE/KS+AOF Ld+jwonngrspB4gLIO9EHEotCzmzXmvh0ybEvef4ilYZRNcyaZljLlu+2Uykkf3FdoOG JTH7a1rJImsjfmFQ64SFRhbQOOsasYnxwfrxbHGY65eGYrdLS8CXRQ3un39OCWjF3Fj+ zEGHy8Y6OBxYSQai1jc5E8V+/ngYaKw1qxc85ZqOoObnsSJv7oPxD3ZdeP8LTL6ihgA0 sorA== 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=d+gNINdqrnx4Z8CWbmbfAR+gyf0fmDvsKWBxP6ZQNbo=; b=hKpD/n9ezawxlpyGUPZC/Nx1AFA7FBZjxpRLj5cwOqAw81+PqAfX5WNO4ryXT7WnIW Agtyn1LxcViBCncLd9qD62wgwrD46zPUuxZNgws6eaJWittaHKojRYd0RAp/yfVFauT2 BgfWhORBWmQ8MXTMASCuROpEdu+au++XV8hSQAII2nkXZS47ygP/0eJh4ha72zwpuJoW 3l2xvXRCJM5BjFi9rgqQL0ktLCHg9PBwQHudy1ppSt3XrBOewKa3hPdstlA0tDaWdWKl nExZ6GQLw3qOn9Vb9Unl+avvd2mtZlce45idx+aT6Rbb69rlcnJRsHjUUfnGMk81oPuU vfow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=m74dll0y; 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 hq24-20020a1709073f1800b006feb408957bsi3377221ejc.924.2022.05.20.22.22.49; Fri, 20 May 2022 22:22:50 -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=m74dll0y; 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 E8CEB68B506; Sat, 21 May 2022 08:21:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A41968B4A0 for ; Sat, 21 May 2022 08:21:49 +0300 (EEST) Received: by mail-pg1-f170.google.com with SMTP id a9so7313168pgv.12 for ; Fri, 20 May 2022 22:21:49 -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=vx2TslwIOcIR6Sni/VDSsIzDqWpQv9vOiRKO4krgmDA=; b=m74dll0ymuB1LGip82rd1pfvREqTeVSxodZUWYyt7ocA6LwmGfj0r162y/ofFCxwbl wAVqhmTveHvlTwfo2NnH90RyQYiF9BQDKXZ4d9VHXAPVSQkmrTYdMWMo3b542VrwckOw zQHrXMAr4t2FM31T2cWyLbj+ydiDQuzb8pQv/BWjg7GM/iqgkh9bxx4RGcFkWafltn75 v9Tu3liaYxkNxbYZwv0etxkPYJT/e+8oDWvf34n7BaQibqS5lW08V4OsRflWmIZdAkQ2 9sNzNIY+I7n7/esw2Hw/1p/xw/ILsoKNFbr9ZtOFehto0fYO8LCet6N6Yd1zjeGqNpas wB+A== 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=vx2TslwIOcIR6Sni/VDSsIzDqWpQv9vOiRKO4krgmDA=; b=FRlE5SVMGqMIQKt5eHu4msafJIVrMNwk7wP2Nsz9tVKG8cEpSY+avMKSE+2SisLVgg kRAtmi02gwLp/lRWUXxZLdKftb7Wyfbc/uRnDzswRFTzOK9KU61G5Ip3IC8o1CwsceH7 EzZfMcx2JtOMbjIHfQzSd7cXcKMizEXSi8m4K1MwGWMAoabeUDL2k4isAVVTcF8nwixr wk2T9oivVMewcdg7K2mBklXCkJM+TlYfC4qyFtTqVTivHP5BQGT7GJuRNI8W2A3lx1gD 8KPPboaCJOz0qKy7oJJGV7IeJgwekLP6EEcOX9GN0MIyGSiTOXfPQxPGDfda6Ix75oXC hZ4A== X-Gm-Message-State: AOAM533zAQyYHK8nVHwYUskmbK0d57cjKjynTBiHeM5bZUi5AT/nYudI 6zD0xN7topj0gbZvzQYoQ59kQIi6AG4CDQ== X-Received: by 2002:a63:6901:0:b0:3f9:caa5:cffc with SMTP id e1-20020a636901000000b003f9caa5cffcmr3735727pgc.324.1653110507495; Fri, 20 May 2022 22:21:47 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id y17-20020a170902d65100b001620ce2ca39sm81061plh.231.2022.05.20.22.21.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 May 2022 22:21:47 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Sat, 21 May 2022 05:21:36 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v5 06/10] libavformat/asfdec: avoid clang warnings 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: Michael Niedermayer , softworkz , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CdszMf+Nj0ze From: softworkz such as: - bugprone-macro-parentheses - wextra-semi-stmt 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 81a29f99d5..91c3874ac7 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -906,21 +906,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; \ } @@ -1003,9 +1003,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)) { @@ -1066,9 +1066,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); @@ -1144,7 +1144,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;