hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-23 18:14:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

[isp] Keep cabac contexts up to date for the different isp tus

Browse source
This commit is contained in:
Joose Sainio 2022-12-21 11:53:55 +02:00 committed by Marko Viitanen
parent c744f79117
commit eae7d72384
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/search.c
View file

@ -1313,7 +1313,7 @@ static double search_cu(
if (can_use_intra && !skip_intra) { if (can_use_intra && !skip_intra) {
intra_search.pred_cu = *cur_cu; intra_search.pred_cu = *cur_cu;
if(tree_type != UVG_CHROMA_T) { if(tree_type != UVG_CHROMA_T) {
uvg_search_cu_intra(state, &intra_search, lcu, tree_type, cu_loc); uvg_search_cu_intra(state, &intra_search, lcu, is_separate_tree ? UVG_LUMA_T : tree_type, cu_loc);
} }
#ifdef COMPLETE_PRED_MODE_BITS #ifdef COMPLETE_PRED_MODE_BITS
// Technically counting these bits would be correct, however counting // Technically counting these bits would be correct, however counting

20
src/search_intra.c
View file

@ -298,12 +298,18 @@ static double search_intra_trdepth(
double split_cost = INT32_MAX; double split_cost = INT32_MAX;
double nosplit_cost = INT32_MAX; double nosplit_cost = INT32_MAX;
cabac_data_t cabac_data;
memcpy(&cabac_data, &state->search_cabac, sizeof(cabac_data_t));
state->search_cabac.update = 1;
if (width <= TR_MAX_WIDTH && height <= TR_MAX_WIDTH) { if (width <= TR_MAX_WIDTH && height <= TR_MAX_WIDTH) {
const bool mts_enabled = (state->encoder_control->cfg.mts == UVG_MTS_INTRA || state->encoder_control->cfg.mts == UVG_MTS_BOTH) const bool mts_enabled = (state->encoder_control->cfg.mts == UVG_MTS_INTRA || state->encoder_control->cfg.mts == UVG_MTS_BOTH)
&& PU_IS_TU(pred_cu); && PU_IS_TU(pred_cu);
nosplit_cost = 0.0; nosplit_cost = 0.0;
const bool has_been_split = 1 << pred_cu->log2_width != cu_loc->width ||
1 << pred_cu->log2_height != cu_loc->height;
cbf_clear(&pred_cu->cbf, COLOR_Y); cbf_clear(&pred_cu->cbf, COLOR_Y);
if (reconstruct_chroma) { if (reconstruct_chroma) {
@ -345,9 +351,7 @@ static double search_intra_trdepth(
if(pred_cu->intra.mip_flag && (width < 16 || height < 16)) { if(pred_cu->intra.mip_flag && (width < 16 || height < 16)) {
max_lfnst_idx = 0; max_lfnst_idx = 0;
} }
const bool is_local_dual_tree = pred_cu->log2_width + pred_cu->log2_height < 6 && tree_type == UVG_BOTH_T;
int start_idx = 0; int start_idx = 0;
int end_idx = state->encoder_control->cfg.lfnst && PU_IS_TU(pred_cu) && int end_idx = state->encoder_control->cfg.lfnst && PU_IS_TU(pred_cu) &&
uvg_can_use_isp_with_lfnst(width, height, pred_cu->intra.isp_mode, tree_type) ? max_lfnst_idx : 0; uvg_can_use_isp_with_lfnst(width, height, pred_cu->intra.isp_mode, tree_type) ? max_lfnst_idx : 0;
@ -431,6 +435,12 @@ static double search_intra_trdepth(
continue; continue;
} }
} }
if (!has_been_split) {
memcpy(&state->search_cabac, &cabac_data, sizeof(cabac_data));
state->search_cabac.update = 1;
}
double rd_cost = uvg_cu_rd_cost_luma( double rd_cost = uvg_cu_rd_cost_luma(
state, state,
cu_loc, cu_loc,
@ -442,8 +452,7 @@ static double search_intra_trdepth(
trafo != MTS_SKIP) { trafo != MTS_SKIP) {
if (!constraints[0] && constraints[1]) { if (!constraints[0] && constraints[1]) {
transform_bits += CTX_ENTROPY_FBITS( transform_bits += CTX_ENTROPY_FBITS(
&state->search_cabac.ctx.lfnst_idx_model[is_local_dual_tree || &state->search_cabac.ctx.lfnst_idx_model[tree_type == UVG_LUMA_T],
tree_type == UVG_LUMA_T],
lfnst_idx != 0); lfnst_idx != 0);
if (lfnst_idx > 0) { if (lfnst_idx > 0) {
transform_bits += CTX_ENTROPY_FBITS( transform_bits += CTX_ENTROPY_FBITS(
@ -593,6 +602,7 @@ static double search_intra_trdepth(
split_cost += search_intra_trdepth(state, &split_cu_loc[i], nosplit_cost, search_data, lcu, tree_type); split_cost += search_intra_trdepth(state, &split_cu_loc[i], nosplit_cost, search_data, lcu, tree_type);
} }
} }
memcpy(&state->search_cabac, &cabac_data, sizeof(cabac_data));
if (!PU_IS_TU(pred_cu) || split_cost < nosplit_cost) { if (!PU_IS_TU(pred_cu) || split_cost < nosplit_cost) {
return split_cost; return split_cost;