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

When GOP is used, verify the references are available

Browse source
This commit is contained in:
Marko Viitanen 2015-03-26 10:38:21 +02:00
parent fe581b881e
commit c40ca49b6c
1 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/encoder_state-bitstream.c
View file

@ -597,6 +597,7 @@ void encoder_state_write_bitstream_slice_header(encoder_state_t * const state)
if (state->global->pictype != NAL_IDR_W_RADL
&& state->global->pictype != NAL_IDR_N_LP) {
int last_poc = 0;
int poc_shift = 0;
WRITE_U(stream, state->global->poc&0x1f, 5, "pic_order_cnt_lsb");
WRITE_U(stream, 0, 1, "short_term_ref_pic_set_sps_flag");
@ -604,8 +605,21 @@ void encoder_state_write_bitstream_slice_header(encoder_state_t * const state)
WRITE_UE(stream, ref_positive, "num_positive_pics");
fprintf(stderr, "\nPOC: %d [L0 ", state->global->poc);
for (j = 0; j < ref_negative; j++) {
int8_t delta_poc = 0;
int8_t delta_poc = state->encoder_control->cfg->gop[state->global->gop_offset].ref_neg[j];
if (state->encoder_control->cfg->gop_len) {
int8_t found = 0;
do {
delta_poc = state->encoder_control->cfg->gop[state->global->gop_offset].ref_neg[j + poc_shift];
for (j = 0; j < state->global->ref->used_size; j++) {
if (state->global->ref->images[j]->poc == state->global->poc - delta_poc) {
found = 1;
break;
}
}
poc_shift++;
} while (!found);
}
WRITE_UE(stream, state->encoder_control->cfg->gop_len?delta_poc - last_poc - 1:0, "delta_poc_s0_minus1");
last_poc = delta_poc;
@ -614,8 +628,23 @@ void encoder_state_write_bitstream_slice_header(encoder_state_t * const state)
}
fprintf(stderr, "] [L1 ");
last_poc = 0;
poc_shift = 0;
for (j = 0; j < ref_positive; j++) {
int8_t delta_poc = state->encoder_control->cfg->gop[state->global->gop_offset].ref_pos[j];
int8_t delta_poc = 0;
if (state->encoder_control->cfg->gop_len) {
int8_t found = 0;
do {
delta_poc = state->encoder_control->cfg->gop[state->global->gop_offset].ref_pos[j + poc_shift];
for (j = 0; j < state->global->ref->used_size; j++) {
if (state->global->ref->images[j]->poc == state->global->poc + delta_poc) {
found = 1;
break;
}
}
poc_shift++;
} while (!found);
}
fprintf(stderr, "%d ", state->global->poc + delta_poc);