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

[mip] Fix MIP cabac write.

Browse source
This commit is contained in:
siivonek 2022-01-26 13:33:51 +02:00
parent a4366dbcc5
commit 55e4091030
4 changed files with 47 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cabac.h
View file

@ -107,7 +107,7 @@ typedef struct
cabac_ctx_t sig_coeff_group_model[4];
cabac_ctx_t luma_planar_model[2];
cabac_ctx_t multi_ref_line[2];
cabac_ctx_t mip_flag;
cabac_ctx_t mip_flag[4];
cabac_ctx_t bdpcm_mode[4];
cabac_ctx_t joint_cb_cr[3];
cabac_ctx_t transform_skip_model_luma;

11
src/context.c
View file

@ -93,6 +93,13 @@ static const uint8_t MULTI_REF_LINE_MODE[4][2] = {
{ 5, 8, },
};
static const uint8_t MIP_FLAG[4][4] = {
{ 56, 57, 50, 26, },
{ 41, 57, 58, 26, },
{ 33, 49, 50, 25, },
{ 9, 10, 9, 6, },
};
static const uint8_t INIT_INTRA_LUMA_MPM_FLAG[4] = {
44, 36, 45, 6
};
@ -483,6 +490,10 @@ void kvz_init_contexts(encoder_state_t *state, int8_t QP, int8_t slice)
kvz_ctx_init(&cabac->ctx.multi_ref_line[0], QP, MULTI_REF_LINE_MODE[slice][0], MULTI_REF_LINE_MODE[3][0]);
kvz_ctx_init(&cabac->ctx.multi_ref_line[1], QP, MULTI_REF_LINE_MODE[slice][1], MULTI_REF_LINE_MODE[3][1]);
for (i = 0; i < 4; i++) {
kvz_ctx_init(&cabac->ctx.mip_flag[i], QP, MIP_FLAG[slice][i], MIP_FLAG[3][i]);
}
kvz_ctx_init(&cabac->ctx.chroma_pred_model, QP, INIT_CHROMA_PRED_MODE[slice], INIT_CHROMA_PRED_MODE[3]);
kvz_ctx_init(&cabac->ctx.cclm_flag, QP, INIT_CCLM_FLAG[slice], INIT_CCLM_FLAG[3]);

34
src/encode_coding_tree.c
View file

@ -856,7 +856,7 @@ static void encode_intra_coding_unit(encoder_state_t * const state,
// Code MIP related bits
bool enable_mip = state->encoder_control->cfg.mip;
bool mip_flag = enable_mip ? cur_cu->intra.mip_flag : false;
int8_t mip_flag = enable_mip ? cur_cu->intra.mip_flag : false;
bool mip_transpose = enable_mip ? cur_cu->intra.mip_is_transposed : false;
int8_t mip_mode = enable_mip ? cur_cu->intra.mode : 0;
uint8_t num_mip_modes;
@ -877,8 +877,34 @@ static void encode_intra_coding_unit(encoder_state_t * const state,
}
if (cur_cu->type == CU_INTRA && !cur_cu->bdpcmMode && enable_mip) {
// Derive mip flag context id
uint8_t ctx_id = 0;
const int cu_width = LCU_WIDTH >> depth;
const int cu_height = cu_width; // TODO: height for non-square blocks
const int pu_x = PU_GET_X(cur_cu->part_size, cu_width, x, 0);
const int pu_y = PU_GET_Y(cur_cu->part_size, cu_width, y, 0);
const cu_info_t* left_pu = NULL;
const cu_info_t* above_pu = NULL;
if (pu_x > 0) {
assert(pu_x >> 2 > 0);
left_pu = kvz_cu_array_at_const(frame->cu_array, pu_x - 1, pu_y + cu_width - 1);
}
if (left_pu != NULL) {
ctx_id = left_pu->intra.mip_flag ? 1 : 0;
}
// Don't take the above PU across the LCU boundary.
if (pu_y % LCU_WIDTH > 0 && pu_y > 0) {
assert(pu_y >> 2 > 0);
above_pu = kvz_cu_array_at_const(frame->cu_array, pu_x + cu_width - 1, pu_y - 1);
}
if (above_pu != NULL) {
ctx_id += above_pu->intra.mip_flag ? 1 : 0;
}
ctx_id = (cu_width > 2 * cu_height || cu_height > 2 * cu_width) ? 3 : ctx_id;
// Write MIP flag
cabac->cur_ctx = &(cabac->ctx.mip_flag);
cabac->cur_ctx = &(cabac->ctx.mip_flag[ctx_id]);
CABAC_BIN(cabac, mip_flag, "mip_flag");
if (mip_flag) {
// Write MIP transpose flag & mode
@ -1050,7 +1076,7 @@ static void encode_intra_coding_unit(encoder_state_t * const state,
}
// Code chroma prediction mode.
if (state->encoder_control->chroma_format != KVZ_CSP_400 && depth != 4 && !mip_flag) {
if (state->encoder_control->chroma_format != KVZ_CSP_400 && depth != 4) {
encode_chroma_intra_cu(cabac, cur_cu, x, y, frame, cu_width, state->encoder_control->cfg.cclm);
}
@ -1058,7 +1084,7 @@ static void encode_intra_coding_unit(encoder_state_t * const state,
encode_mts_idx(state, cabac, cur_cu);
if (state->encoder_control->chroma_format != KVZ_CSP_400 && depth == 4 && x % 8 && y % 8 && !mip_flag) {
if (state->encoder_control->chroma_format != KVZ_CSP_400 && depth == 4 && x % 8 && y % 8) {
encode_chroma_intra_cu(cabac, cur_cu, x, y, frame, cu_width, state->encoder_control->cfg.cclm);
encode_transform_coeff(state, x, y, depth, 0, 0, 0, 1, coeff);
}

6
src/encoder_state-bitstream.c
View file

@ -668,7 +668,11 @@ static void encoder_state_write_bitstream_seq_parameter_set(bitstream_t* stream,
WRITE_U(stream, 0, 1, "sps_mrl_enabled_flag");
}
WRITE_U(stream, 0, 1, "sps_mip_enabled_flag");
if (state->encoder_control->cfg.mip) {
WRITE_U(stream, 1, 1, "sps_mip_enabled_flag");
} else {
WRITE_U(stream, 0, 1, "sps_mip_enabled_flag");
}
// if(!no_cclm_constraint_flag)
if(encoder->chroma_format != KVZ_CSP_400) {
WRITE_U(stream, encoder->cfg.cclm, 1, "sps_cclm_enabled_flag");