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

Fix valgrind warning.

Browse source 
- Attribute state->global->slicetype was used before being initialized.
- The reference frame lists should be updated based on current frame,
  not on previous frame (or uninitialized data).
This commit is contained in:
Ari Koivula 2015-04-29 17:22:53 +03:00
parent afcccb5c81
commit c0c9bc619a
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/encoderstate.c
View file

@ -784,14 +784,9 @@ static void encoder_state_new_frame(encoder_state_t * const state) {
} }
if (state->global->is_radl_frame) { if (state->global->is_radl_frame) {
// Clear the reference list
encoder_state_clear_refs(state);
state->global->slicetype = SLICE_I; state->global->slicetype = SLICE_I;
state->global->pictype = NAL_IDR_W_RADL; state->global->pictype = NAL_IDR_W_RADL;
} else { } else {
encoder_state_remove_refs(state);
encoder_state_ref_sort(state);
state->global->slicetype = encoder->cfg->intra_period==1 ? SLICE_I : (state->encoder_control->cfg->gop_len?SLICE_B:SLICE_P); state->global->slicetype = encoder->cfg->intra_period==1 ? SLICE_I : (state->encoder_control->cfg->gop_len?SLICE_B:SLICE_P);
state->global->pictype = NAL_TRAIL_R; state->global->pictype = NAL_TRAIL_R;
if (state->encoder_control->cfg->gop_len) { if (state->encoder_control->cfg->gop_len) {
@ -800,6 +795,14 @@ static void encoder_state_new_frame(encoder_state_t * const state) {
} }
} }
} }
if (state->global->is_radl_frame) {
encoder_state_clear_refs(state);
} else {
encoder_state_remove_refs(state);
encoder_state_ref_sort(state);
}
if (state->encoder_control->cfg->gop_len) { if (state->encoder_control->cfg->gop_len) {
if (state->global->slicetype == SLICE_I) { if (state->global->slicetype == SLICE_I) {
state->global->QP = state->encoder_control->cfg->qp; state->global->QP = state->encoder_control->cfg->qp;