From patchwork Sun Mar 24 00:10:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 47392 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c889:b0:1a3:b6bb:3029 with SMTP id hb9csp450047pzb; Sat, 23 Mar 2024 17:10:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVYrKaQQGRqbrJacgQzcbBsmSLikyP/hEXGvRmnWX+kpwSqEvAKM7hd1XOjiFTWtNmTmdEDgsIlhyrdEWqNTXcWop2/qQz1ue24rQ== X-Google-Smtp-Source: AGHT+IEDpSKF72aAb26ITRE2optQ9ZtaKfdaspfOyhipBRPb86YrWiq7Zp3Y7Bvrf0ngthK9LHB4 X-Received: by 2002:a50:cd57:0:b0:56a:ae8a:acc0 with SMTP id d23-20020a50cd57000000b0056aae8aacc0mr2383584edj.21.1711239047878; Sat, 23 Mar 2024 17:10:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711239047; cv=none; d=google.com; s=arc-20160816; b=LqLw9aB+LijhfVW8NGv8i+jO+Gfkk1jNtskSrC2EbLibeBHfY8Vj47LBrim37G0RN+ OhAT76jnLbqd58n+GQadnyjC9JKMz/50zyTqb31lrwRy5DtqYQjdPngNhBgoiAgJ+HZU 3D0LggKimMsPDthAP5GRO0wKqYeXzSnd/+gStQqv2fbi4GwPWNFwTXeYjYzhzMsoN92x Un3HEtQ34WsZVpgbpG0HLHww/WVs1ucPPvmz8MzjoQYAhFa4hLtSvHcBxOu4//RA3BZR NW7V0a3Z7OIx5uwyFXvLDwkxbub6Bwx7SyNQQ6he1zXLLXOlRM9LecRu0Y4sYmI5qmh/ CXpw== 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:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=IYj2LS0+siqSCWj/9uiZDrgjzpf+mAXa3zH0J0fbc/g=; fh=+bdjGe20eEUjtjncwA1dnEEVYNfJL4vyhV+sIRR4l+g=; b=ZnfUog9dLxuR4EZkRyFlsJMDUBlVib3T4VowdvRsGZ29/hrDj48cLjOrraKGUYhTJB jniMU7owpqC7U/oWLhBhZsTa/FXQrU7orN438RAC27y/zSUEQglhhPA9UD5bHzT7WOZB WUMTdsfJFQelXU1IppFYxDU+mTg3+7v1hgp/A89XXxA4jULEdNsdEsadPz9CqZ0FJsfo HGyEVz4oWFj3g8XWvRi81Ff9xaKOGkGb5eNmCu9r/opAZG3VgE9nio8uuI2Tca80Q2g7 U3AJyL6qKXw+9cqNVBx9lA8MCqwCLZus38LbUNLyEE5bTHmlLM5F93bebX1cq2MS96Vh h55g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Y53qPjnM; 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 i3-20020a0564020f0300b0056c09c23c6dsi12919eda.312.2024.03.23.17.10.47; Sat, 23 Mar 2024 17:10:47 -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=20230601 header.b=Y53qPjnM; 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 3B8FA68D3C3; Sun, 24 Mar 2024 02:10:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9541168D383 for ; Sun, 24 Mar 2024 02:10:19 +0200 (EET) Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-3c380e99582so625215b6e.1 for ; Sat, 23 Mar 2024 17:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711239017; x=1711843817; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vVolWNpeBU1OkggCOpHALprYZIMfojwf1wBXtlCwz7A=; b=Y53qPjnMJJMApZyLNi+LgUuGH16dJ6z/t9H/Y5S3QPo6m0QkAIBq/ksEwp2mf14cp9 fvdUXSWtNfycsED8g9QZHIgiOQPmWGlO0huZZ+yaEYPUf+zHdijeydEaCIRTxBNULsGD Ox9UuyllEaEVcgOQkgm87jatACPqjfzkWG8eFeFoQpOJ9KUfbXiJGHkDcpIGYKCk2ENS 9Y6Hk93MAWnhfLp6zpBbPp2J2CnaJgMrlFbBtrUnjgJJs76spDKMjRmi+cr1tLDxCFUP h4raiC+kkCbqaxtEAyucLJxwbADKIZvxdV9PjrkPV88WjKYECZGfOkW7Ay/v6aC69cmw YVrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711239017; x=1711843817; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vVolWNpeBU1OkggCOpHALprYZIMfojwf1wBXtlCwz7A=; b=WPDI45OFe+dpkcfyOyNpn55TS2XLIl4lAURneJrMOuFF4hZScXvJc9eNKdo++Ukx+R 4KrXAszGxbWgfwJEG0ScVYUUHfP03hs+e52/F+aOIsuKAqcX0Qg/lc0LRPa2FdywUvGA 99xgAud52NbHOamdyBPlg2Oa7LACgrVicD4FA4zBwRnQyeSRZmhHuC9DtWO+pPckw8Tl H8LnpJlWivx1AdQHdLhVtUDMM1FRhkbRH3Hd2kTTaI1w3oosNcQC2s2nnLwWz/p26I8B WWAhGvJycNDHJkc4iszB0fv2gERW5fEjw31kubJpBtIpiB5dbP9FSU6odm0119J1tgYD GC8g== X-Gm-Message-State: AOJu0YyvobSUCswwBTVKscel9YCd/bo2fsonrAio0JPYyEnGq0eP9998 JiGoMBOzaAEcE3FkSl6FRQaTow8p2odzLB9+dzMKEuD/BCYXl0YOp8TNyHwECvE= X-Received: by 2002:a9d:6b95:0:b0:6e6:9b39:b1e with SMTP id b21-20020a9d6b95000000b006e69b390b1emr4121481otq.0.1711239017585; Sat, 23 Mar 2024 17:10:17 -0700 (PDT) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id gu5-20020a056214260500b0069684278c8esm433901qvb.21.2024.03.23.17.10.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Mar 2024 17:10:17 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Mar 2024 20:10:14 -0400 Message-ID: <20240324001014.55461-3-leo.izen@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240324001014.55461-1-leo.izen@gmail.com> References: <20240324001014.55461-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avutil/film_grain_params: remove do loop in CHECK macro 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: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MVqLXradOIBU The continue statement will break out of the do/while loop, not the outer loop as intended. This is one (compound) statement anyway, so we can remove the do/while entirely. Signed-off-by: Leo Izen --- libavutil/film_grain_params.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavutil/film_grain_params.c b/libavutil/film_grain_params.c index b3fa37f527..8f8dcee569 100644 --- a/libavutil/film_grain_params.c +++ b/libavutil/film_grain_params.c @@ -70,10 +70,8 @@ const AVFilmGrainParams *av_film_grain_params_select(const AVFrame *frame) continue; #define CHECK(a, b, unspec) \ - do { \ if ((a) != (unspec) && (b) != (unspec) && (a) != (b)) \ - continue; \ - } while (0) + continue CHECK(fgp->bit_depth_luma, bit_depth_luma, 0); CHECK(fgp->bit_depth_chroma, bit_depth_chroma, 0);