hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-24 10:34:05 +00:00
Code Issues Actions Projects Releases Wiki Activity

Modify slice header to conform VVC

Browse source
This commit is contained in:
Marko Viitanen 2018-07-25 10:17:42 +03:00
parent 95ce1e1a25
commit 9befe35961
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/encoder_state-bitstream.c
View file

@ -814,7 +814,7 @@ static void kvz_encoder_state_write_bitstream_slice_header_independent(
WRITE_UE(stream, 0, "collocated_ref_idx"); WRITE_UE(stream, 0, "collocated_ref_idx");
} }
} }
// ToDo: VVC check num of merge cands, might be 7
WRITE_UE(stream, 5-MRG_MAX_NUM_CANDS, "five_minus_max_num_merge_cand"); WRITE_UE(stream, 5-MRG_MAX_NUM_CANDS, "five_minus_max_num_merge_cand");
} }
@ -852,9 +852,11 @@ void kvz_encoder_state_write_bitstream_slice_header(
WRITE_UE(stream, 0, "slice_pic_parameter_set_id"); WRITE_UE(stream, 0, "slice_pic_parameter_set_id");
if (!first_slice_segment_in_pic) { if (!first_slice_segment_in_pic) {
/*
if (encoder->pps.dependent_slice_segments_enabled_flag) { if (encoder->pps.dependent_slice_segments_enabled_flag) {
WRITE_U(stream, !independent, 1, "dependent_slice_segment_flag"); WRITE_U(stream, !independent, 1, "dependent_slice_segment_flag");
} }
*/
int lcu_cnt = encoder->in.width_in_lcu * encoder->in.height_in_lcu; int lcu_cnt = encoder->in.width_in_lcu * encoder->in.height_in_lcu;
int num_bits = kvz_math_ceil_log2(lcu_cnt); int num_bits = kvz_math_ceil_log2(lcu_cnt);
@ -865,9 +867,9 @@ void kvz_encoder_state_write_bitstream_slice_header(
WRITE_U(stream, slice_start_rs, num_bits, "slice_segment_address"); WRITE_U(stream, slice_start_rs, num_bits, "slice_segment_address");
} }
if (independent) { //if (independent) {
kvz_encoder_state_write_bitstream_slice_header_independent(stream, state); kvz_encoder_state_write_bitstream_slice_header_independent(stream, state);
} //}
if (encoder->tiles_enable || encoder->cfg.wpp) { if (encoder->tiles_enable || encoder->cfg.wpp) {
int num_entry_points = 0; int num_entry_points = 0;