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

Merge branch 'fix-intra-in-ra' into 'master'

Browse source 
Fix intra in ra

See merge request cs/ultravideo/vvc/uvg266!9
This commit is contained in:
Joose Sainio 2022-03-14 11:56:07 +02:00
parent 25a8a40de0 f1a3aa60dd
commit f94102f061
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/encode_coding_tree.c
View file

@ -1338,7 +1338,7 @@ void kvz_encode_coding_tree(encoder_state_t * const state,
} }
// Prediction mode // Prediction mode
if (state->frame->slicetype != KVZ_SLICE_I) { if (state->frame->slicetype != KVZ_SLICE_I && cu_width != 4) {
int8_t ctx_predmode = 0; int8_t ctx_predmode = 0;

17
src/encoder_state-bitstream.c
View file

@ -1120,6 +1120,9 @@ static void kvz_encoder_state_write_bitstream_picture_header(
WRITE_U(stream, 0, 1, "ph_mvd_l1_zero_flag"); WRITE_U(stream, 0, 1, "ph_mvd_l1_zero_flag");
} }
if (encoder->cfg.jccr) {
WRITE_U(stream, 0, 1, "ph_joint_cbcr_sign_flag");
}
// END PICTURE HEADER // END PICTURE HEADER
} }
@ -1223,7 +1226,7 @@ static void kvz_encoder_state_write_bitstream_ref_pic_list(
} }
} }
if (ref_negative > 1 || ref_positive > 1) { if ( (state->frame->slicetype != KVZ_SLICE_I && ref_negative > 1 )|| ref_positive > 1) {
WRITE_U(stream, 1, 1, "sh_num_ref_idx_active_override_flag"); WRITE_U(stream, 1, 1, "sh_num_ref_idx_active_override_flag");
if (ref_negative > 1) for(int list = 0; list < 1 + copy_rpl1_from_rpl0; list++) WRITE_UE(stream, ref_negative - 1, "sh_num_ref_idx_active_minus1[0]"); if (ref_negative > 1) for(int list = 0; list < 1 + copy_rpl1_from_rpl0; list++) WRITE_UE(stream, ref_negative - 1, "sh_num_ref_idx_active_minus1[0]");
if (!copy_rpl1_from_rpl0 && ref_positive > 1) WRITE_UE(stream, ref_positive - 1, "sh_num_ref_idx_active_minus1[1]"); if (!copy_rpl1_from_rpl0 && ref_positive > 1) WRITE_UE(stream, ref_positive - 1, "sh_num_ref_idx_active_minus1[1]");
@ -1239,7 +1242,7 @@ void kvz_encoder_state_write_bitstream_slice_header(
const encoder_control_t * const encoder = state->encoder_control; const encoder_control_t * const encoder = state->encoder_control;
#ifdef KVZ_DEBUG #ifdef KVZ_DEBUG
printf("=========== Slice ===========\n"); printf("=========== Slice =========== %d\n", state->frame->poc);
#endif #endif
/* /*
bool first_slice_segment_in_pic = (state->slice->start_in_rs == 0); bool first_slice_segment_in_pic = (state->slice->start_in_rs == 0);
@ -1256,14 +1259,9 @@ void kvz_encoder_state_write_bitstream_slice_header(
kvz_encoder_state_write_bitstream_picture_header(stream, state); kvz_encoder_state_write_bitstream_picture_header(stream, state);
if (encoder->cfg.jccr) {
WRITE_U(stream, 0, 1, "ph_joint_cbcr_sign_flag");
}
if (state->frame->pictype != KVZ_NAL_IDR_W_RADL if (state->frame->pictype != KVZ_NAL_IDR_W_RADL
&& state->frame->pictype != KVZ_NAL_IDR_N_LP) { && state->frame->pictype != KVZ_NAL_IDR_N_LP) {
WRITE_UE(stream, state->frame->slicetype, "sh_slice_type"); WRITE_UE(stream, state->frame->slicetype, "sh_slice_type");
kvz_encoder_state_write_bitstream_ref_pic_list(stream, state);
} }
if (state->frame->pictype == KVZ_NAL_CRA_NUT || state->frame->pictype == KVZ_NAL_IDR_N_LP || state->frame->pictype == KVZ_NAL_IDR_W_RADL || state->frame->pictype == KVZ_NAL_GDR_NUT) if (state->frame->pictype == KVZ_NAL_CRA_NUT || state->frame->pictype == KVZ_NAL_IDR_N_LP || state->frame->pictype == KVZ_NAL_IDR_W_RADL || state->frame->pictype == KVZ_NAL_GDR_NUT)
@ -1315,6 +1313,11 @@ void kvz_encoder_state_write_bitstream_slice_header(
} }
} }
if (state->frame->pictype != KVZ_NAL_IDR_W_RADL
&& state->frame->pictype != KVZ_NAL_IDR_N_LP) {
kvz_encoder_state_write_bitstream_ref_pic_list(stream, state);
}
if (state->frame->slicetype != KVZ_SLICE_I && state->encoder_control->cfg.tmvp_enable) { if (state->frame->slicetype != KVZ_SLICE_I && state->encoder_control->cfg.tmvp_enable) {
int ref_negative = 0; int ref_negative = 0;
int ref_positive = 0; int ref_positive = 0;

2
src/nal.c
View file

@ -77,7 +77,7 @@ void kvz_nal_write(bitstream_t * const bitstream, const uint8_t nal_type,
printf("%-50s u(%d) : %d\n", "zero_tid_required_flag", 1, 0); printf("%-50s u(%d) : %d\n", "zero_tid_required_flag", 1, 0);
printf("%-50s u(%d) : %d\n", "nuh_temporal_id_plus1", 3, temporal_id + 1); printf("%-50s u(%d) : %d\n", "nuh_temporal_id_plus1", 3, temporal_id + 1);
printf("%-50s u(%d) : %d\n", "nal_unit_type_lsb", 4, nal_type); printf("%-50s u(%d) : %d\n", "nal_unit_type_lsb", 4, nal_type);
printf("%-50s u(%d) : %d\n", "nuh_layer_id_plus1", 7, 0); printf("%-50s u(%d) : %d\n", "nuh_layer_id_plus1", 7, 1);
printf("%-50s u(%d) : %d\n", "nuh_reserved_zero_bit", 1, 0); printf("%-50s u(%d) : %d\n", "nuh_reserved_zero_bit", 1, 0);
#endif #endif
} }