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

Fixing P/B frame headers and debug output formatting

Browse source
This commit is contained in:
Marko Viitanen 2020-09-28 14:58:07 +03:00
parent bddfb47a55
commit ac2032eb65
5 changed files with 35 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bitstream.c
View file

@ -266,7 +266,7 @@ void kvz_bitstream_put_se(bitstream_t *stream, int32_t data)
void kvz_bitstream_add_rbsp_trailing_bits(bitstream_t * const stream)
{
#if VERBOSE
printf("%-40s u(%d) : %d\n", "rbsp_stop_one_bit", 1, 1);
printf("%-50s u(%d) : %d\n", "rbsp_stop_one_bit", 1, 1);
#endif
kvz_bitstream_put(stream, 1, 1);
kvz_bitstream_align_zero(stream);
@ -290,7 +290,7 @@ void kvz_bitstream_align_zero(bitstream_t * const stream)
if ((stream->cur_bit & 7) != 0) {
#if VERBOSE
for (int i = 0; i < ((8 - stream->cur_bit) & 7); i++) {
printf("%-40s u(%d) : %d\n", "rbsp_alignment_zero_bit", 1, 0);
printf("%-50s u(%d) : %d\n", "rbsp_alignment_zero_bit", 1, 0);
}
#endif
kvz_bitstream_put(stream, 0, (8 - stream->cur_bit) & 7);

6
src/bitstream.h
View file

@ -85,9 +85,9 @@ void kvz_bitstream_align_zero(bitstream_t *stream);
/* In debug mode print out some extra info */
#ifdef VERBOSE
/* Counter to keep up with bits written */
#define WRITE_U(stream, data, bits, name) { printf("%-40s u(%d) : %d\n", name,bits,data); kvz_bitstream_put(stream,data,bits);}
#define WRITE_UE(stream, data, name) { printf("%-40s ue(v): %d\n", name,data); kvz_bitstream_put_ue(stream,data);}
#define WRITE_SE(stream, data, name) { printf("%-40s se(v): %d\n", name,data); kvz_bitstream_put_se(stream,(data));}
#define WRITE_U(stream, data, bits, name) { printf("%-50s u(%d) : %d\n", name,bits,data); kvz_bitstream_put(stream,data,bits);}
#define WRITE_UE(stream, data, name) { printf("%-50s ue(v): %d\n", name,data); kvz_bitstream_put_ue(stream,data);}
#define WRITE_SE(stream, data, name) { printf("%-50s se(v): %d\n", name,data); kvz_bitstream_put_se(stream,(data));}
#else
#define WRITE_U(stream, data, bits, name) { kvz_bitstream_put(stream,data,bits); }
#define WRITE_UE(stream, data, name) { kvz_bitstream_put_ue(stream,data); }

44
src/encoder_state-bitstream.c
View file

@ -1006,20 +1006,20 @@ static void kvz_encoder_state_write_bitstream_picture_header(
if (state->frame->pictype == KVZ_NAL_IDR_W_RADL
|| state->frame->pictype == KVZ_NAL_IDR_N_LP) {
WRITE_U(stream, 1, 1, "gdr_or_irap_pic_flag");
WRITE_U(stream, 1, 1, "ph_gdr_or_irap_pic_flag");
#if JVET_S0076_ASPECT1
WRITE_U(stream, 0, 1, "ph_non_ref_pic_flag");
#endif
WRITE_U(stream, 0, 1, "gdr_pic_flag");
WRITE_U(stream, 0, 1, "pic_inter_slice_allowed_flag");
WRITE_U(stream, 0, 1, "ph_gdr_pic_flag");
WRITE_U(stream, 0, 1, "ph_inter_slice_allowed_flag");
}
else {
WRITE_U(stream, 0, 1, "gdr_or_irap_pic_flag");
WRITE_U(stream, 0, 1, "ph_gdr_or_irap_pic_flag");
#if JVET_S0076_ASPECT1
WRITE_U(stream, 0, 1, "ph_non_ref_pic_flag");
#endif
WRITE_U(stream, 1, 1, "pic_inter_slice_allowed_flag");
WRITE_U(stream, 1, 1, "pic_intra_slice_allowed_flag");
WRITE_U(stream, 1, 1, "ph_inter_slice_allowed_flag");
WRITE_U(stream, 1, 1, "ph_intra_slice_allowed_flag");
}
#if !JVET_S0076_ASPECT1
@ -1034,10 +1034,11 @@ static void kvz_encoder_state_write_bitstream_picture_header(
}
else {
// ToDo: ALF flag
WRITE_U(stream, state->encoder_control->cfg.tmvp_enable, 1, "pic_temporal_mvp_enabled_flag");
WRITE_U(stream, 0, 1, "pic_mvd_l1_zero_flag");
//WRITE_U(stream, state->encoder_control->cfg.tmvp_enable, 1, "ph_pic_temporal_mvp_enabled_flag");
WRITE_U(stream, 0, 1, "ph_mvd_l1_zero_flag");
}
// getDeblockingFilterControlPresentFlag
@ -1069,7 +1070,7 @@ static void kvz_encoder_state_write_bitstream_ref_pic_list(
int poc_shift = 0;
WRITE_UE(stream, ref_negative, "num_negative_pics");
WRITE_UE(stream, ref_negative, "num_ref_entries[0]");
for (j = 0; j < ref_negative; j++) {
int8_t delta_poc = 0;
@ -1090,12 +1091,12 @@ static void kvz_encoder_state_write_bitstream_ref_pic_list(
}
} while (!found);
}
/*
WRITE_U(stream, j, 1, "inter_layer_ref_pic_flag");
if (j) {
WRITE_UE(stream, j, "ilrp_idx");
}
*/
WRITE_UE(stream, delta_poc, "abs_delta_poc_st");
if (delta_poc+1) WRITE_U(stream, 1, 1, "strp_entry_sign_flag");
last_poc = delta_poc;
@ -1103,7 +1104,7 @@ static void kvz_encoder_state_write_bitstream_ref_pic_list(
}
last_poc = 0;
poc_shift = 0;
WRITE_UE(stream, ref_positive, "num_positive_pics");
WRITE_UE(stream, ref_positive, "num_ref_entries[1]");
for (j = 0; j < ref_positive; j++) {
int8_t delta_poc = 0;
@ -1124,11 +1125,12 @@ static void kvz_encoder_state_write_bitstream_ref_pic_list(
}
} while (!found);
}
/*
WRITE_U(stream, j, 1, "inter_layer_ref_pic_flag");
if (j) {
WRITE_UE(stream, j, "ilrp_idx");
}
*/
WRITE_UE(stream, delta_poc, "abs_delta_poc_st");
if (delta_poc+1) WRITE_U(stream, 0, 1, "strp_entry_sign_flag");
@ -1161,14 +1163,15 @@ void kvz_encoder_state_write_bitstream_slice_header(
kvz_encoder_state_write_bitstream_picture_header(stream, state);
//WRITE_UE(stream, state->frame->slicetype, "slice_type");
if (state->frame->pictype != KVZ_NAL_IDR_W_RADL
&& state->frame->pictype != KVZ_NAL_IDR_N_LP) {
WRITE_UE(stream, state->frame->slicetype, "sh_slice_type");
}
#if JVET_S0193_NO_OUTPUT_PRIOR_PIC
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)
{
WRITE_U(stream, 0, 1, "no_output_of_prior_pics_flag");
WRITE_U(stream, 0, 1, "sh_no_output_of_prior_pics_flag");
}
#endif
if (state->frame->slicetype != KVZ_SLICE_I) {
kvz_encoder_state_write_bitstream_ref_pic_list(stream, state);
@ -1176,16 +1179,17 @@ void kvz_encoder_state_write_bitstream_slice_header(
if (state->encoder_control->cfg.tmvp_enable) {
//WRITE_U(stream, ref_negative ? 1 : 0, 1, "slice_temporal_mvp_enabled_flag");
WRITE_U(stream, 0, 1, "sh_collocated_from_l0_flag");
}
int slice_qp_delta = state->frame->QP - encoder->cfg.qp;
WRITE_SE(stream, slice_qp_delta, "slice_qp_delta");
WRITE_SE(stream, slice_qp_delta, "sh_qp_delta");
if (encoder->cfg.sao_type) {
WRITE_U(stream, 1, 1, "slice_sao_luma_flag");
WRITE_U(stream, 1, 1, "sh_sao_luma_flag");
if (encoder->chroma_format != KVZ_CSP_400) {
WRITE_U(stream, 1, 1, "slice_sao_chroma_flag");
WRITE_U(stream, 1, 1, "sh_sao_chroma_flag");
}
}

2
src/encoderstate.c
View file

@ -1468,7 +1468,7 @@ void kvz_encode_one_frame(encoder_state_t * const state, kvz_picture* frame)
{
#if KVZ_DEBUG_PRINT_CABAC == 1
kvz_cabac_bins_count = 0;
if (state->frame->num == 0) kvz_cabac_bins_verbose = true;
if (state->frame->num == 1) kvz_cabac_bins_verbose = true;
else kvz_cabac_bins_verbose = false;
#endif
encoder_state_init_new_frame(state, frame);

10
src/nal.c
View file

@ -71,11 +71,11 @@ void kvz_nal_write(bitstream_t * const bitstream, const uint8_t nal_type,
#if VERBOSE
// ToDo: Match with the actual bits
printf("%-40s u(%d) : %d\n", "zero_tid_required_flag", 1, zero_tid_required_flag);
printf("%-40s u(%d) : %d\n", "nuh_temporal_id_plus1", 3, temporal_id + 1);
printf("%-40s u(%d) : %d\n", "nal_unit_type_lsb", 4, nal_type_lsb);
printf("%-40s u(%d) : %d\n", "nuh_layer_id_plus1", 7, 1);
printf("%-40s u(%d) : %d\n", "nuh_reserved_zero_bit", 1, 0);
printf("%-50s u(%d) : %d\n", "zero_tid_required_flag", 1, zero_tid_required_flag);
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_lsb);
printf("%-50s u(%d) : %d\n", "nuh_layer_id_plus1", 7, 1);
printf("%-50s u(%d) : %d\n", "nuh_reserved_zero_bit", 1, 0);
#endif
}