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 ESMTPS id 3BFCC4CDF6 for ; Wed, 14 May 2025 13:43:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7117568C63F; Wed, 14 May 2025 16:41:14 +0300 (EEST) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1A3A68C65A for ; Wed, 14 May 2025 16:41:06 +0300 (EEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7399838db7fso854489b3a.0 for ; Wed, 14 May 2025 06:41:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747230065; x=1747834865; 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=bIWWceqI/gU4rMF8rtAel0jcRXp7AaSUNFB2sfYfCQk=; b=giecKsXYOHtMsDAtAsuZutOLJTXQQnJMbyZdxGC57+iiFICd7I4z3hP803j/Amj/0g UDgX8z7cBNfiqGVbfrSOdBscT+2JJiZ/9U9wQiQ3ckTYtVorqRUzpQ2wQtshKrx4c0fA eDNcT2w6Pf3QEcaSgsyZcwPHL2xll/WNhVx01sdr9uw6F56E3bN1H8Pb4a9hzG2VwLRs wM7ggFL3JH2oJaswXJDBAD4MWGRCBPbUNJuU+cYE4xLk26i1ur8+iFk04EMQkEPPrSSW 3HuF8Y1r2Qzulq+wUzN3x9CgSZAfOYAoucaCfbcWcrwuyyCZxD0TT9C1yNU1e0RNGspo HUiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747230065; x=1747834865; 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=bIWWceqI/gU4rMF8rtAel0jcRXp7AaSUNFB2sfYfCQk=; b=sAfPDpA7pz/hATolOIiw3kQzMBW0i1Yt5nc/TjSX62uuN1Gi8gg3BssWZ0ocY7O8WP rmV9H2aLSiJriprFYFs2iSKXnkKnXs2BKBUcW14oY7VNLGYrPY7hCF3TSpaOkt1l7nQ3 7m+JyOAHe4JoOKp43GcuZgTYtl1fqvKUMPRe/1ZD87GiIM089bNu7403OintbktNpCc5 qQjFs/fJ55de7jHZUPZRcPaibfp/ATxBzyRV0FrgmBbNbGk4ldNagdFzyovi8PMivA26 2Zw8O7y2+V6Jfy5gciiU+Q3k2MJivEWNzmTNjHUotCqVwTPe5J8BiAM1rufKekv/6V48 ozwg== X-Gm-Message-State: AOJu0Yzok9XIFfRF1karVacC7p2Xfr14MMSgd0iwoMGTr0bZwpM3U912 S1KcDtaUPZBKqX8JRtmRaiKxVPiAZu+GEcsIgBdw3eejDkbzoTws6TJaCgHE X-Gm-Gg: ASbGnctVGEZa28UTQSxm/92TciPb842a21mM3eNbYQ+itmOkP+XFF7yxbPguqWhCWtb tmwnO3NR/4cb4p4gjh2a1bzLWSqzq4ebD2tD9J2KgKROv5CPQxF4Iz5EdiojnLgRDmUs6Xfd9Ga rxSkoYtkpumTn65OlSgSuvP2AK3Cm2F7h2YnOCcpWk+pUL7Ayb91s/E/3Wj3X01RfJSAj8HxJtB GbLDgCJARYRdPSq3GJib+1CRUIBgyuVEWWhd1X9KZOY18QhhPamOoXYL7tIn7LixcizOVtVnFVL JVkCnukzHxMNbejmVnhj97Gcow+eGRQK3Mjmzf03uEOc2Tq6XrmRBBGX3ePuBFJ8jNET4HC+ X-Google-Smtp-Source: AGHT+IHBYKhkUkOX7koCg6oms91UX0EbwyVzlMyw0t4cMLjHEAD+Gd9R9gtN/3aZisVfsRxvhIvmTw== X-Received: by 2002:a05:6a00:99e:b0:737:cd8:2484 with SMTP id d2e1a72fcca58-74278fc063fmr10466067b3a.6.1747230064937; Wed, 14 May 2025 06:41:04 -0700 (PDT) Received: from localhost.localdomain ([124.79.129.75]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237a8f7edsm9310669b3a.167.2025.05.14.06.41.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 06:41:04 -0700 (PDT) From: toqsxw@gmail.com X-Google-Original-From: toqsxw@outlook.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 May 2025 21:40:22 +0800 Message-ID: <20250514134031.1584-15-toqsxw@outlook.com> X-Mailer: git-send-email 2.44.0.windows.1 In-Reply-To: <20250514134031.1584-1-toqsxw@outlook.com> References: <20250514134031.1584-1-toqsxw@outlook.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 15/23] avcodec/vvc/ctu: fix derive_chroma_intra_pred_mode 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: Wu Jianhua 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: From: Wu Jianhua See 8.4.3 Derivation process for chroma intra prediction mode Signed-off-by: Wu Jianhua --- libavcodec/vvc/ctu.c | 57 +++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/libavcodec/vvc/ctu.c b/libavcodec/vvc/ctu.c index a83c59f27c..e160199580 100644 --- a/libavcodec/vvc/ctu.c +++ b/libavcodec/vvc/ctu.c @@ -895,7 +895,7 @@ static void derive_chroma_intra_pred_mode(VVCLocalContext *lc, enum IntraPredMode luma_intra_pred_mode = SAMPLE_CTB(fc->tab.ipm, x_cb, y_cb); if (cu->tree_type == SINGLE_TREE && sps->r->sps_chroma_format_idc == CHROMA_FORMAT_444 && - intra_chroma_pred_mode == 4 && intra_mip_flag) { + (intra_chroma_pred_mode == 4 || cu->act_enabled_flag) && intra_mip_flag) { cu->mip_chroma_direct_flag = 1; cu->intra_pred_mode_c = luma_intra_pred_mode; return; @@ -1007,34 +1007,38 @@ static void intra_luma_pred_modes(VVCLocalContext *lc) static void intra_chroma_pred_modes(VVCLocalContext *lc) { - const VVCSPS *sps = lc->fc->ps.sps; - CodingUnit *cu = lc->cu; - const int hs = sps->hshift[CHROMA]; - const int vs = sps->vshift[CHROMA]; + const VVCSPS *sps = lc->fc->ps.sps; + CodingUnit *cu = lc->cu; + const int hs = sps->hshift[CHROMA]; + const int vs = sps->vshift[CHROMA]; + int cclm_mode_flag = 0; + int cclm_mode_idx = 0; + int intra_chroma_pred_mode = 0; + + if (!cu->act_enabled_flag) { + cu->mip_chroma_direct_flag = 0; + if (sps->r->sps_bdpcm_enabled_flag && + (cu->cb_width >> hs) <= sps->max_ts_size && + (cu->cb_height >> vs) <= sps->max_ts_size) { + cu->bdpcm_flag[CB] = cu->bdpcm_flag[CR] = ff_vvc_intra_bdpcm_chroma_flag(lc); + } + if (cu->bdpcm_flag[CHROMA]) { + cu->intra_pred_mode_c = ff_vvc_intra_bdpcm_chroma_dir_flag(lc) ? INTRA_VERT : INTRA_HORZ; + } else { + const int cclm_enabled = get_cclm_enabled(lc, cu->x0, cu->y0); - cu->mip_chroma_direct_flag = 0; - if (sps->r->sps_bdpcm_enabled_flag && - (cu->cb_width >> hs) <= sps->max_ts_size && - (cu->cb_height >> vs) <= sps->max_ts_size) { - cu->bdpcm_flag[CB] = cu->bdpcm_flag[CR] = ff_vvc_intra_bdpcm_chroma_flag(lc); - } - if (cu->bdpcm_flag[CHROMA]) { - cu->intra_pred_mode_c = ff_vvc_intra_bdpcm_chroma_dir_flag(lc) ? INTRA_VERT : INTRA_HORZ; - } else { - const int cclm_enabled = get_cclm_enabled(lc, cu->x0, cu->y0); - int cclm_mode_flag = 0; - int cclm_mode_idx = 0; - int intra_chroma_pred_mode = 0; + if (cclm_enabled) + cclm_mode_flag = ff_vvc_cclm_mode_flag(lc); - if (cclm_enabled) - cclm_mode_flag = ff_vvc_cclm_mode_flag(lc); + if (cclm_mode_flag) + cclm_mode_idx = ff_vvc_cclm_mode_idx(lc); + else + intra_chroma_pred_mode = ff_vvc_intra_chroma_pred_mode(lc); + } + } - if (cclm_mode_flag) - cclm_mode_idx = ff_vvc_cclm_mode_idx(lc); - else - intra_chroma_pred_mode = ff_vvc_intra_chroma_pred_mode(lc); + if (!cu->bdpcm_flag[CHROMA]) derive_chroma_intra_pred_mode(lc, cclm_mode_flag, cclm_mode_idx, intra_chroma_pred_mode); - } } static PredMode pred_mode_decode(VVCLocalContext *lc, @@ -2122,8 +2126,7 @@ static int intra_data(VVCLocalContext *lc) if ((ret = hls_palette_coding(lc, tree_type)) < 0) return ret; } else if (!pred_mode_plt_flag) { - if (!cu->act_enabled_flag) - intra_chroma_pred_modes(lc); + intra_chroma_pred_modes(lc); } } -- 2.44.0.windows.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".