From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 946D249734 for ; Sun, 19 May 2024 02:49:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B06B068D20C; Sun, 19 May 2024 05:49:25 +0300 (EEST) Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D2BE68D16C for ; Sun, 19 May 2024 05:49:19 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 2FC041BF205 for ; Sun, 19 May 2024 02:49:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716086958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Dew8ZjhtHCoc8+FzxjJBYtL9mUq63eoACGEc++1XYZs=; b=EvkClkB540jOvBNmbLQpSVi8omrwIg5XJJUxj9Mmt6JW0qEZyfrMNRW/UOms9dVEEFqfzy XsTjE6nzRVinjIDROnAu4F3jBmUFeZUE2gnm0Fs5l5wQTKvMORDIV4yzR2IL7nD2sLF+JZ ckjxWe3BvimJo90MzuqTpADb+wtV/VJjTwOLB14Shn5FatxkR/utB+qaxQgnA9Q9kaiLTL 43IKUeqW+T8zzGVBCbMTFSmBmu/LpEjH4xSyS+bCoaHjqRcSXsPGnBEWL0xh3ssTYg9pf4 kuHkZRqkO4rHciuk+B+54FZTolGqXsWkEmFU4qCbn30MBQAO9HPHG32kor2Uig== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 May 2024 04:49:08 +0200 Message-ID: <20240519024915.1944150-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240519024915.1944150-1-michael@niedermayer.cc> References: <20240519024915.1944150-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/9] avcodec/vvc/ctu: Simplify code at the end of pred_mode_decode() 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This simplification assumes that the code is correct Fixes: CID1560036 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/vvc/ctu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/vvc/ctu.c b/libavcodec/vvc/ctu.c index 53f92ca10f7..7495ced0d5a 100644 --- a/libavcodec/vvc/ctu.c +++ b/libavcodec/vvc/ctu.c @@ -1080,12 +1080,10 @@ static PredMode pred_mode_decode(VVCLocalContext *lc, } if (pred_mode_ibc_flag) pred_mode = MODE_IBC; + return pred_mode; } else { - pred_mode_flag = is_4x4 || mode_type == MODE_TYPE_INTRA || - mode_type != MODE_TYPE_INTER || IS_I(rsh); - pred_mode = pred_mode_flag ? MODE_INTRA : MODE_INTER; + return MODE_INTRA; } - return pred_mode; } static void sbt_info(VVCLocalContext *lc, const VVCSPS *sps) -- 2.45.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".