[jccr] jccr=4 hasn't been necessary for a long time

This commit is contained in:
Joose Sainio 2022-12-14 08:47:24 +02:00 committed by Marko Viitanen
parent b69e9b2958
commit 05218bae21
2 changed files with 1 additions and 4 deletions

View file

@ -126,7 +126,7 @@ typedef struct
uint8_t merge_idx : 3; //!< \brief merge index uint8_t merge_idx : 3; //!< \brief merge index
uint8_t tr_skip : 3; //!< \brief transform skip flag uint8_t tr_skip : 3; //!< \brief transform skip flag
uint8_t tr_idx : 3; //!< \brief transform index 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_width : 3;
uint8_t log2_height : 3; uint8_t log2_height : 3;

View file

@ -338,7 +338,6 @@ static double search_intra_trdepth(
num_transforms = MAX(num_transforms, 2); num_transforms = MAX(num_transforms, 2);
} }
pred_cu->intra.mode_chroma = -1; pred_cu->intra.mode_chroma = -1;
pred_cu->joint_cb_cr = 4;
const int max_tb_size = TR_MAX_WIDTH; const int max_tb_size = TR_MAX_WIDTH;
// LFNST search params // LFNST search params
@ -489,7 +488,6 @@ static double search_intra_trdepth(
if (reconstruct_chroma) { if (reconstruct_chroma) {
int8_t luma_mode = pred_cu->intra.mode; int8_t luma_mode = pred_cu->intra.mode;
pred_cu->intra.mode_chroma = chroma_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 // TODO: Maybe check the jccr mode here also but holy shit is the interface of search_intra_rdo bad currently
uvg_intra_recon_cu( uvg_intra_recon_cu(
state, state,
@ -544,7 +542,6 @@ static double search_intra_trdepth(
if(reconstruct_chroma) { if(reconstruct_chroma) {
int8_t luma_mode = pred_cu->intra.mode; int8_t luma_mode = pred_cu->intra.mode;
pred_cu->intra.mode_chroma = chroma_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, uvg_intra_recon_cu(state,
search_data, cu_loc, search_data, cu_loc,
pred_cu, lcu, pred_cu, lcu,