From 05218bae212d01708693884cadf676f1ca388447 Mon Sep 17 00:00:00 2001 From: Joose Sainio Date: Wed, 14 Dec 2022 08:47:24 +0200 Subject: [PATCH] [jccr] jccr=4 hasn't been necessary for a long time --- src/cu.h | 2 +- src/search_intra.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/cu.h b/src/cu.h index a2e2234c..bf89e477 100644 --- a/src/cu.h +++ b/src/cu.h @@ -126,7 +126,7 @@ typedef struct uint8_t merge_idx : 3; //!< \brief merge index uint8_t tr_skip : 3; //!< \brief transform skip flag uint8_t tr_idx : 3; //!< \brief transform index - uint8_t joint_cb_cr : 3; //!< \brief joint chroma residual coding + uint8_t joint_cb_cr : 2; //!< \brief joint chroma residual coding uint8_t log2_width : 3; uint8_t log2_height : 3; diff --git a/src/search_intra.c b/src/search_intra.c index f497ea4e..0fe33d58 100644 --- a/src/search_intra.c +++ b/src/search_intra.c @@ -338,7 +338,6 @@ static double search_intra_trdepth( num_transforms = MAX(num_transforms, 2); } pred_cu->intra.mode_chroma = -1; - pred_cu->joint_cb_cr = 4; const int max_tb_size = TR_MAX_WIDTH; // LFNST search params @@ -489,7 +488,6 @@ static double search_intra_trdepth( if (reconstruct_chroma) { int8_t luma_mode = pred_cu->intra.mode; pred_cu->intra.mode_chroma = chroma_mode; - pred_cu->joint_cb_cr = 4; // TODO: Maybe check the jccr mode here also but holy shit is the interface of search_intra_rdo bad currently uvg_intra_recon_cu( state, @@ -544,7 +542,6 @@ static double search_intra_trdepth( if(reconstruct_chroma) { int8_t luma_mode = pred_cu->intra.mode; pred_cu->intra.mode_chroma = chroma_mode; - pred_cu->joint_cb_cr= 4; // TODO: Maybe check the jccr mode here also but holy shit is the interface of search_intra_rdo bad currently uvg_intra_recon_cu(state, search_data, cu_loc, pred_cu, lcu,