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 1C4424A086 for ; Sun, 19 May 2024 02:49:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB94E68D231; Sun, 19 May 2024 05:49:27 +0300 (EEST) Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1706B68D119 for ; Sun, 19 May 2024 05:49:20 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3FDBCFF802 for ; Sun, 19 May 2024 02:49:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716086959; 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=Pp/82XlyR5ep+ZPezybvL8vAeWk4440zvUzRr6gFNRM=; b=NG8dui/Gp/dZPEVjDyFr18bECVZiuYDMSKejY1sMMZAP331/+SQ6P2YwZN10FlJ2kNag3C Z2S2pRBxpU5JQyH9fuOb+zus+Z9Dxwe3UAM7p8wO9bKiFMaJX15Z75WRWkzOtz7GjY9RjQ PebvgzTTlHpAr43azKo0hJHo0PXWQdGzglgSwY1xhzqBebSGLLDPlRAtpJzDVgKoIWGYCJ d4pCfeQFGjCD+0V1i+k83O5nOobNix3FqnJWoJYxS2hZaz2kdHctaty1hvrcjCl4DRIYQg lLJWjNcxJV+5+aB7PNjHF/WFuRcIGOSuAATekl170Tab891I1e5O7WOYZOr6pA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 May 2024 04:49:09 +0200 Message-ID: <20240519024915.1944150-3-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 3/9] avcodec/vvc/ctu: Simplify pred_mode_plt_flag 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: Fixes: CID1560039 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/vvc/ctu.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/libavcodec/vvc/ctu.c b/libavcodec/vvc/ctu.c index 7495ced0d5a..b7089b9a004 100644 --- a/libavcodec/vvc/ctu.c +++ b/libavcodec/vvc/ctu.c @@ -1793,7 +1793,6 @@ static int hls_coding_unit(VVCLocalContext *lc, int x0, int y0, int cb_width, in const int hs = sps->hshift[CHROMA]; const int vs = sps->vshift[CHROMA]; const int is_128 = cb_width > 64 || cb_height > 64; - int pred_mode_plt_flag = 0; int ret; CodingUnit *cu = add_cu(lc, x0, y0, cb_width, cb_height, cqt_depth, tree_type); @@ -1811,7 +1810,7 @@ static int hls_coding_unit(VVCLocalContext *lc, int x0, int y0, int cb_width, in mode_type != MODE_TYPE_INTER && ((cb_width * cb_height) > (tree_type != DUAL_TREE_CHROMA ? 16 : (16 << hs << vs))) && (mode_type != MODE_TYPE_INTRA || tree_type != DUAL_TREE_CHROMA)) { - pred_mode_plt_flag = ff_vvc_pred_mode_plt_flag(lc); + int pred_mode_plt_flag = ff_vvc_pred_mode_plt_flag(lc); if (pred_mode_plt_flag) { avpriv_report_missing_feature(fc->log_ctx, "Palette"); return AVERROR_PATCHWELCOME; @@ -1823,31 +1822,21 @@ static int hls_coding_unit(VVCLocalContext *lc, int x0, int y0, int cb_width, in } if (cu->pred_mode == MODE_INTRA || cu->pred_mode == MODE_PLT) { if (tree_type == SINGLE_TREE || tree_type == DUAL_TREE_LUMA) { - if (pred_mode_plt_flag) { - avpriv_report_missing_feature(fc->log_ctx, "Palette"); - return AVERROR_PATCHWELCOME; - } else { - intra_luma_pred_modes(lc); - } + intra_luma_pred_modes(lc); ff_vvc_set_intra_mvf(lc, 0); } if ((tree_type == SINGLE_TREE || tree_type == DUAL_TREE_CHROMA) && sps->r->sps_chroma_format_idc) { - if (pred_mode_plt_flag && tree_type == DUAL_TREE_CHROMA) { - avpriv_report_missing_feature(fc->log_ctx, "Palette"); - return AVERROR_PATCHWELCOME; - } else if (!pred_mode_plt_flag) { - if (!cu->act_enabled_flag) - intra_chroma_pred_modes(lc); - } + if (!cu->act_enabled_flag) + intra_chroma_pred_modes(lc); } } else if (tree_type != DUAL_TREE_CHROMA) { /* MODE_INTER or MODE_IBC */ if ((ret = inter_data(lc)) < 0) return ret; } - if (cu->pred_mode != MODE_INTRA && !pred_mode_plt_flag && !lc->cu->pu.general_merge_flag) + if (cu->pred_mode != MODE_INTRA && !lc->cu->pu.general_merge_flag) cu->coded_flag = ff_vvc_cu_coded_flag(lc); else - cu->coded_flag = !(cu->skip_flag || pred_mode_plt_flag); + cu->coded_flag = !(cu->skip_flag); if (cu->coded_flag) { sbt_info(lc, 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".