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

[jccr] disable jccr for blocks when tr-depth != depth, i.e. 64×64

Browse source
This commit is contained in:
Joose Sainio 2021-08-19 14:27:55 +03:00
parent 54302915e1
commit 3a73abd264
4 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/encode_coding_tree.c
View file

@ -429,7 +429,7 @@ static void encode_transform_unit(encoder_state_t * const state,
bool chroma_cbf_set = cbf_is_set(cur_pu->cbf, depth, COLOR_U) || bool chroma_cbf_set = cbf_is_set(cur_pu->cbf, depth, COLOR_U) ||
cbf_is_set(cur_pu->cbf, depth, COLOR_V); cbf_is_set(cur_pu->cbf, depth, COLOR_V);
if (chroma_cbf_set) { if (chroma_cbf_set || joint_chroma) {
encode_chroma_tu(state, x, y, depth, width_c, cur_pu, &scan_idx, coeff, joint_chroma); encode_chroma_tu(state, x, y, depth, width_c, cur_pu, &scan_idx, coeff, joint_chroma);
} }
} }

2
src/intra.c
View file

@ -619,7 +619,7 @@ static void intra_recon_tb_leaf(
} }
kvz_pixels_blit(pred, block , width, width, width, lcu_width); kvz_pixels_blit(pred, block , width, width, width, lcu_width);
if(color != COLOR_Y) { if(color != COLOR_Y && cfg->jccr) {
kvz_pixels_blit(pred, block2, width, width, width, lcu_width); kvz_pixels_blit(pred, block2, width, width, width, lcu_width);
} }
} }

25
src/search.c
View file

@ -310,6 +310,7 @@ double kvz_cu_rd_cost_chroma(const encoder_state_t *const state,
cu_info_t *const tr_cu = LCU_GET_CU_AT_PX(lcu, x_px, y_px); cu_info_t *const tr_cu = LCU_GET_CU_AT_PX(lcu, x_px, y_px);
double tr_tree_bits = 0; double tr_tree_bits = 0;
double joint_cbcr_tr_tree_bits = 0;
double coeff_bits = 0; double coeff_bits = 0;
double joint_coeff_bits = 0; double joint_coeff_bits = 0;
@ -328,13 +329,21 @@ double kvz_cu_rd_cost_chroma(const encoder_state_t *const state,
if (tr_depth == 0 || cbf_is_set(pred_cu->cbf, depth - 1, COLOR_U)) { if (tr_depth == 0 || cbf_is_set(pred_cu->cbf, depth - 1, COLOR_U)) {
tr_tree_bits += CTX_ENTROPY_FBITS(ctx, cbf_is_set(pred_cu->cbf, depth, COLOR_U)); tr_tree_bits += CTX_ENTROPY_FBITS(ctx, cbf_is_set(pred_cu->cbf, depth, COLOR_U));
} }
if(state->encoder_control->cfg.jccr) {
joint_cbcr_tr_tree_bits += CTX_ENTROPY_FBITS(ctx, pred_cu->joint_cb_cr & 1);
}
int is_set = cbf_is_set(pred_cu->cbf, depth, COLOR_U); int is_set = cbf_is_set(pred_cu->cbf, depth, COLOR_U);
ctx = &(state->cabac.ctx.qt_cbf_model_cr[is_set]); ctx = &(state->cabac.ctx.qt_cbf_model_cr[is_set]);
if (tr_depth == 0 || cbf_is_set(pred_cu->cbf, depth - 1, COLOR_V)) { if (tr_depth == 0 || cbf_is_set(pred_cu->cbf, depth - 1, COLOR_V)) {
tr_tree_bits += CTX_ENTROPY_FBITS(ctx, cbf_is_set(pred_cu->cbf, depth, COLOR_V)); tr_tree_bits += CTX_ENTROPY_FBITS(ctx, cbf_is_set(pred_cu->cbf, depth, COLOR_V));
} }
if(state->encoder_control->cfg.jccr) {
ctx = &(state->cabac.ctx.qt_cbf_model_cr[pred_cu->joint_cb_cr & 1]);
joint_cbcr_tr_tree_bits += CTX_ENTROPY_FBITS(ctx, (pred_cu->joint_cb_cr & 2) >> 1);
}
} }
if (tr_cu->tr_depth > depth) { if (tr_cu->tr_depth > depth) {
int offset = LCU_WIDTH >> (depth + 1); int offset = LCU_WIDTH >> (depth + 1);
int sum = 0; int sum = 0;
@ -347,6 +356,13 @@ double kvz_cu_rd_cost_chroma(const encoder_state_t *const state,
return sum + tr_tree_bits * state->lambda; return sum + tr_tree_bits * state->lambda;
} }
if (state->encoder_control->cfg.jccr) {
const cabac_ctx_t* ctx = &(state->cabac.ctx.joint_cb_cr[cbf_is_set(pred_cu->cbf, depth, COLOR_U) * 2 + cbf_is_set(pred_cu->cbf, depth, COLOR_V) - 1]);
tr_tree_bits += CTX_ENTROPY_FBITS(ctx, 0);
ctx = &(state->cabac.ctx.joint_cb_cr[(pred_cu->joint_cb_cr & 1) * 2 + ((pred_cu->joint_cb_cr & 2) >> 1) - 1]);
joint_cbcr_tr_tree_bits += CTX_ENTROPY_FBITS(ctx, 1);
}
// Chroma SSD // Chroma SSD
int ssd = 0; int ssd = 0;
int joint_ssd = 0; int joint_ssd = 0;
@ -383,21 +399,22 @@ double kvz_cu_rd_cost_chroma(const encoder_state_t *const state,
} }
} }
double bits = tr_tree_bits + coeff_bits; double bits = tr_tree_bits + coeff_bits;
double joint_bits = tr_tree_bits + joint_coeff_bits; double joint_bits = joint_cbcr_tr_tree_bits + joint_coeff_bits;
double cost = (double)ssd + bits * state->c_lambda; double cost = (double)ssd + bits * state->c_lambda;
double joint_cost = (double)joint_ssd + joint_bits * state->c_lambda; double joint_cost = (double)joint_ssd + joint_bits * state->c_lambda;
if ((cost < joint_cost || !pred_cu->joint_cb_cr) || !state->encoder_control->cfg.jccr) { if ((cost < joint_cost || !pred_cu->joint_cb_cr) || !state->encoder_control->cfg.jccr) {
tr_cu->joint_cb_cr = 0; pred_cu->joint_cb_cr = 0;
return cost; return cost;
} }
cbf_clear(&pred_cu->cbf, depth, COLOR_U); cbf_clear(&pred_cu->cbf, depth, COLOR_U);
cbf_clear(&pred_cu->cbf, depth, COLOR_V); cbf_clear(&pred_cu->cbf, depth, COLOR_V);
if (tr_cu->joint_cb_cr & 1) { if (pred_cu->joint_cb_cr & 1) {
cbf_set(&pred_cu->cbf, depth, COLOR_U); cbf_set(&pred_cu->cbf, depth, COLOR_U);
} }
if (tr_cu->joint_cb_cr & 2) { if (pred_cu->joint_cb_cr & 2) {
cbf_set(&pred_cu->cbf, depth, COLOR_V); cbf_set(&pred_cu->cbf, depth, COLOR_V);
} }
int lcu_width = LCU_WIDTH_C; int lcu_width = LCU_WIDTH_C;

2
src/transform.c
View file

@ -539,7 +539,7 @@ void kvz_quantize_lcu_residual(encoder_state_t * const state,
if (chroma) { if (chroma) {
quantize_tr_residual(state, COLOR_U, x, y, depth, cur_pu, lcu, early_skip); quantize_tr_residual(state, COLOR_U, x, y, depth, cur_pu, lcu, early_skip);
quantize_tr_residual(state, COLOR_V, x, y, depth, cur_pu, lcu, early_skip); quantize_tr_residual(state, COLOR_V, x, y, depth, cur_pu, lcu, early_skip);
if(state->encoder_control->cfg.jccr){ if(state->encoder_control->cfg.jccr && cur_pu->tr_depth == cur_pu->depth){
quantize_tr_residual(state, COLOR_UV, x, y, depth, cur_pu, lcu, early_skip); quantize_tr_residual(state, COLOR_UV, x, y, depth, cur_pu, lcu, early_skip);
} }
} }