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

Implement writing MRL bits to cabac.

Browse source
This commit is contained in:
siivonek 2021-08-31 06:16:41 +02:00
parent 8fb5220b17
commit 9396940900
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/encode_coding_tree.c
View file

@ -859,7 +859,7 @@ static void encode_intra_coding_unit(encoder_state_t * const state,
int multi_ref_idx = cur_cu->intra.multi_ref_idx;
bool enable_mrl = state->encoder_control->cfg.mrl;
if (cur_cu->type == 1/*intra*/ && (y % LCU_WIDTH) != 0 && !cur_cu->bdpcmMode && enable_mrl) {
if (cur_cu->type == CU_INTRA && (y % LCU_WIDTH) != 0 && !cur_cu->bdpcmMode && enable_mrl) {
if (MAX_REF_LINE_IDX > 1) {
cabac->cur_ctx = &(cabac->ctx.multi_ref_line[0]);
CABAC_BIN(cabac, multi_ref_idx != 0, "multi_ref_line");
@ -930,7 +930,7 @@ static void encode_intra_coding_unit(encoder_state_t * const state,
}
// Is the mode in the MPM array or not
flag[j] = (mpm_preds[j] == -1) ? 0 : 1;
if (true||!(cur_pu->intra.multi_ref_idx || (isp_mode))) {
if (!(cur_pu->intra.multi_ref_idx || (isp_mode))) {
CABAC_BIN(cabac, flag[j], "prev_intra_luma_pred_flag");
}
}

8
src/encoder_state-bitstream.c
View file

@ -661,7 +661,13 @@ static void encoder_state_write_bitstream_seq_parameter_set(bitstream_t* stream,
WRITE_UE(stream, encoder->cfg.log2_parallel_merge_level-2, "log2_parallel_merge_level_minus2");
WRITE_U(stream, 0, 1, "sps_isp_enabled_flag");
WRITE_U(stream, 0, 1, "sps_mrl_enabled_flag");
if (state->encoder_control->cfg.mrl) {
WRITE_U(stream, 1, 1, "sps_mrl_enabled_flag");
} else {
WRITE_U(stream, 0, 1, "sps_mrl_enabled_flag");
}
WRITE_U(stream, 0, 1, "sps_mip_enabled_flag");
// if(!no_cclm_constraint_flag)
if(encoder->chroma_format != KVZ_CSP_400) {