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

Revert "Revert "Fix keeping of reference frames over IDR boundary.""

Browse source 
This reverts commit 87936eb99f.

Conflicts:
	src/encoderstate.c
This commit is contained in:
Marko Viitanen 2015-09-14 12:33:30 +03:00
parent e12612e938
commit 3217e70f99
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/encoderstate.c
View file

@ -682,7 +682,7 @@ static void encoder_state_remove_refs(encoder_state_t *state) {
refnumber = encoder->cfg->gop[state->global->gop_offset].ref_neg_count + encoder->cfg->gop[state->global->gop_offset].ref_pos_count; refnumber = encoder->cfg->gop[state->global->gop_offset].ref_neg_count + encoder->cfg->gop[state->global->gop_offset].ref_pos_count;
check_refs = 1; check_refs = 1;
} else if (state->global->slicetype == SLICE_I) { } else if (state->global->slicetype == SLICE_I) {
refnumber = 1; refnumber = 0;
} }
// Remove the ref pic (if present) // Remove the ref pic (if present)
while (check_refs || state->global->ref->used_size > (uint32_t)refnumber) { while (check_refs || state->global->ref->used_size > (uint32_t)refnumber) {
@ -762,10 +762,10 @@ static void encoder_state_new_frame(encoder_state_t * const state) {
} }
} }
encoder_state_remove_refs(state);
encoder_state_ref_sort(state);
} }
encoder_state_remove_refs(state);
encoder_state_ref_sort(state);
double lambda; double lambda;
if (encoder->cfg->target_bitrate > 0) { if (encoder->cfg->target_bitrate > 0) {
// Rate control enabled. // Rate control enabled.