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

Use continuous POC for all intra and add aud_irap_or_gdr_au_flag

Browse source
This commit is contained in:
Marko Viitanen 2020-08-25 11:53:55 +03:00
parent b53b53ed09
commit b7638172ca
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/encoder_state-bitstream.c
View file

@ -58,6 +58,8 @@ static void encoder_state_write_bitstream_aud(encoder_state_t * const state)
bitstream_t * const stream = &state->stream;
kvz_nal_write(stream, KVZ_NAL_AUD_NUT, 0, 1);
WRITE_U(stream, 1, 1, "aud_irap_or_gdr_au_flag");
uint8_t pic_type = state->frame->slicetype == KVZ_SLICE_I ? 0
: state->frame->slicetype == KVZ_SLICE_P ? 1
: 2;
@ -1122,14 +1124,7 @@ static void kvz_encoder_state_write_bitstream_picture_header(
#endif
WRITE_UE(stream, 0, "ph_pic_parameter_set_id");
if (state->frame->pictype == KVZ_NAL_IDR_W_RADL
|| state->frame->pictype == KVZ_NAL_IDR_N_LP) {
WRITE_U(stream, 0, 5, "ph_pic_order_cnt_lsb");
}
else {
WRITE_U(stream, state->frame->poc & 0x1f, 5, "ph_pic_order_cnt_lsb");
}
WRITE_U(stream, state->frame->poc & 0x1f, 5, "ph_pic_order_cnt_lsb");
if (state->frame->pictype == KVZ_NAL_IDR_W_RADL
|| state->frame->pictype == KVZ_NAL_IDR_N_LP) {
@ -1302,6 +1297,8 @@ void kvz_encoder_state_write_bitstream_slice_header(
}
//WRITE_U(stream, 0, 1, "slice_ts_residual_coding_disabled_flag");
//kvz_bitstream_align(stream);
}

5
src/encoderstate.c
View file

@ -1228,7 +1228,7 @@ static void encoder_state_init_new_frame(encoder_state_t * const state, kvz_pict
}
kvz_videoframe_set_poc(state->tile->frame, state->frame->poc);
} else if (cfg->intra_period > 0) {
} else if (cfg->intra_period > 1) {
state->frame->poc = state->frame->num % cfg->intra_period;
} else {
state->frame->poc = state->frame->num;
@ -1254,7 +1254,8 @@ static void encoder_state_init_new_frame(encoder_state_t * const state, kvz_pict
cfg->gop_lowdelay ||
!cfg->open_gop) // Closed GOP uses IDR pictures
{
state->frame->pictype = KVZ_NAL_IDR_W_RADL;
state->frame->pictype = KVZ_NAL_IDR_N_LP;
if (cfg->intra_period == 1 && state->frame->num > 0) state->frame->pictype = KVZ_NAL_IDR_W_RADL;
} else {
state->frame->pictype = KVZ_NAL_CRA_NUT;
}