From patchwork Sat Aug 31 21:25:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51266 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:4027:b0:48e:c0f8:d0de with SMTP id ky39csp1102376vqb; Sat, 31 Aug 2024 14:35:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWc7dLgOly+hLwFBHjZVWH3ahTzl/yJbvXlZVV4yrlyJR5Fok5XmNS2t5bZLKKQ2PS2VH535RoYLeXXWv0YDe9J@gmail.com X-Google-Smtp-Source: AGHT+IGn/q329/6puhU9KkH+Qe3y/EJYnFItxLDy9XN7YoLWdhdgl1KT4lQzWliP33vbI+M7d+Hu X-Received: by 2002:a05:651c:199f:b0:2f0:198e:cf86 with SMTP id 38308e7fff4ca-2f6108908bamr85127441fa.33.1725140111283; Sat, 31 Aug 2024 14:35:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725140111; cv=none; d=google.com; s=arc-20240605; b=hzRbe7RJqusvhHLflCp50RqTbfCdUB3wl1ffjvcpb6mc9kpdbtw8oTaanHmIOJJYm3 zAIrcTzG+kNuSlFpRpvc8mi0fXnUG9yvlX3mx2KQ+CDuXK3bnQ/Dzp9Aj1Ib+quLz3a9 sXbR3vM5sdRjAdVCOMwClFJgDuMPzgmvrcifzkKfN+E5FkXFGRcLMCY2V6cQryVm9AUx 979yZnGZ76DDO1mKQOBJqp3DtRmgZuNrGiGLlZ6oi8Bci6BUt0VNUoh3m2sp/HWjAI2B bsOI0XxPd8TiY6P51LUeCJ9UAbY/oyvE3VcU9CT+RLlpw0iozzG4kh2L77SZ709CTi0I AQrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:message-id:date:to:from :dkim-signature:delivered-to; bh=7nbWCuQwDkC16AQS5GoISTqHRr07f8VhM/rW4p9S6z8=; fh=mLkBQceLb8D9f+BOlqd6YzMp0Ug6ToY5UXClJOqpwTc=; b=iJxY3p1kFfSNOOVB10dlmwQm9cBQPQh26xQvjfkdT+S8wJ3U4lE5DtAaoZ2lGHn5ec 9I2ZHrOs8HqvZWbc4UNQlP70NDiGkYZb34Ldh36vX/wyMDW6W+pnTx5kpFcxFlJvp5G+ iHvzQSHP6ASoJioJFCAFkhSBxlDIPzBsb+4/TQ49cRQOCPhVP+M8TKVCbVH0Mb0mD7at E/E5WtHi7D+hEN2khIveQtwHrZIaS+bD9B2qpGrpSsx6tRTuztW6AG6HG7n3jJTtY1mB uEm7cBZbjgRpcIczclIqDUx9OVgQn4MizxY5HCOoHKedNlSYDVywgP2rSUJ//YAXVd8C Bfgw==; 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=nLTtP0MG; 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; dara=fail header.i=@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 38308e7fff4ca-2f61518a304si22643411fa.640.2024.08.31.14.35.10; Sat, 31 Aug 2024 14:35:11 -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=nLTtP0MG; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2894868DED5; Sun, 1 Sep 2024 00:26:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3FA068DB9E for ; Sun, 1 Sep 2024 00:26:26 +0300 (EEST) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a86e5e9ff05so361524366b.1 for ; Sat, 31 Aug 2024 14:26:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725139586; x=1725744386; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=rcWSwFuZCh6B+kcK6bRA+4MISerw9Ue3ipjI0ujxk38=; b=nLTtP0MGiGyUU5JdtTWGdzPkEKRC617QYlx35NbVcPVxw5di/DWKiVXb4cSvDN4Kcf 2wKGLv+YU+z7kd1wOkXBJBAG3/mgvgrcEa2ETw+haMiwjQqm5W/HV23jbNNujLpgbY/I awogRY6Q29pzPcUJy0D3hhq2sGwgfiD1YxpAmc0NckMjV/pQD/MEwNWOZiZshIHF2A9X sGBdAnwR5+eXsU+URE9ZSw5Rnl8AZh7ZppqgcWMrNELbuO3daqUpdWvuhRESpFmQ+KSc tcgkqnl3kUZWt12SFW+tuiOu+EMpMRMcCwNxk77MJoxh9oqr2YNutZHhCYyNqjLhRJuh K3Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725139586; x=1725744386; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rcWSwFuZCh6B+kcK6bRA+4MISerw9Ue3ipjI0ujxk38=; b=NFyp3tv2Cjl4bsfpx+mokX7fH9crterHBIxGKAPw0+FuyZYcc1bu5H1Qdx7tqaxSF4 o/2xBPKSrVE0MJxXwBmMxOHFLNenJrgp+sIhOo8BjC7PCtwXSnsUvZJhMw7q+MJuZKV1 tc0WG49WmJWXmCnWCSfyVMkofvtkrayEmQkWF4zcblkutW/iAiWtG/ffhEE5N14FzcdB iIGtKn9WhDw9RLBxDpbzo5U71uZyhU9Vo1VS3NbJmyXJtld0XHSi3M5vzR6dpDldtihI uVwY8LwEI4BKhMsm3qhM7DxlFMS0FwTKRs2vX5rDBRP6zeT0yaZRc2XTTalS4y0xUtsG 7QMA== X-Gm-Message-State: AOJu0YxJvza13oF5KPco7zxdpny81U6iGdH1z6lX2vmjA3NluA9xxfD4 2f8CFQvzFe9UxJskH6/IES9AWQ2nTLcTlsx+akFu1A8Y5sY2sEGGC2uYwA== X-Received: by 2002:a17:907:6d02:b0:a7a:81b6:ea55 with SMTP id a640c23a62f3a-a897fad368emr666451266b.56.1725139585294; Sat, 31 Aug 2024 14:26:25 -0700 (PDT) Received: from MacBook-Pro-von-Marvin.fritz.box (p200300cccf117800d4f553fc086e4e41.dip0.t-ipconnect.de. [2003:cc:cf11:7800:d4f5:53fc:86e:4e41]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a898900f079sm362696566b.66.2024.08.31.14.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Aug 2024 14:26:24 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 31 Aug 2024 23:25:45 +0200 Message-Id: <20240831212545.83095-1-epirat07@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) MIME-Version: 1.0 Subject: [FFmpeg-devel] [RFC] [PATCH] avcodec/cbs_h266: Fix copy paste mistake 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: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HzGPjulxq3y4 The us macro expect the range_max here, which seems should be MAX_UINT_BITS(hlen) here. Fix CID1618757 Copy-paste error --- This code is non-trivial to understand so I might be wrong about this, it would be great if someone actually familiar with this can have a look if my assesment is correct here. Also if it isn't, a comment here might help to clarify things. libavcodec/cbs_h266_syntax_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index a8f5af04d0..0704da1d40 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1208,7 +1208,7 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, win_top_edge_ctus > current->sps_subpic_ctu_top_left_y[i] ? win_top_edge_ctus - current->sps_subpic_ctu_top_left_y[i] : 0, - MAX_UINT_BITS(wlen), 1, i); + MAX_UINT_BITS(hlen), 1, i); } else { infer(sps_subpic_height_minus1[i], tmp_height_val -