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

Fix the bit and frame counts for calculating the gop allocation

Browse source 
Additionally dynamically adjust the smoothing window if there are rapid changes
This commit is contained in:
Joose Sainio 2020-06-24 15:26:54 +03:00
parent 9753820b3a
commit 138651ee85
2 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/encoder_state-bitstream.c
View file

@ -1068,7 +1068,8 @@ static void encoder_state_write_bitstream_main(encoder_state_t * const state)
kvz_update_after_picture(state);
}
state->frame->cur_gop_bits_coded = state->previous_encoder_state->frame->cur_gop_bits_coded;
if(state->frame->gop_offset)
state->frame->cur_gop_bits_coded = state->previous_encoder_state->frame->cur_gop_bits_coded;
state->frame->cur_gop_bits_coded += newpos - curpos;
}

35
src/rate_control.c
View file

@ -27,7 +27,8 @@
#include "pthread.h"
static const int SMOOTHING_WINDOW = 40;
static const int MIN_SMOOTHING_WINDOW = 40;
static int smoothing_window = 40;
static const double MIN_LAMBDA = 0.1;
static const double MAX_LAMBDA = 10000;
#define BETA1 1.2517
@ -147,21 +148,31 @@ static double gop_allocate_bits(encoder_state_t * const state)
// At this point, total_bits_coded of the current state contains the
// number of bits written encoder->owf frames before the current frame.
uint64_t bits_coded = state->frame->total_bits_coded;
int pictures_coded = MAX(0, state->frame->num - encoder->cfg.owf);
int gop_offset = (state->frame->gop_offset - encoder->cfg.owf) % MAX(1, encoder->cfg.gop_len);
if (encoder->cfg.gop_len > 0 && gop_offset != encoder->cfg.gop_len - 1 && encoder->cfg.gop_lp_definition.d == 0) {
int pictures_coded = 0;
if(encoder->cfg.gop_len) {
pictures_coded = MAX(0, state->frame->num - CEILDIV(encoder->cfg.owf, encoder->cfg.gop_len)*encoder->cfg.gop_len);
}
else {
pictures_coded = MAX(0, state->frame->num - encoder->cfg.owf);
}
if (encoder->cfg.gop_len > 0 && encoder->cfg.owf > 0) {
// Subtract number of bits in the partially coded GOP.
bits_coded -= state->frame->cur_gop_bits_coded;
// Subtract number of pictures in the partially coded GOP.
pictures_coded -= gop_offset + 1;
}
// Equation 12 from https://doi.org/10.1109/TIP.2014.2336550
double gop_target_bits =
(encoder->target_avg_bppic * (pictures_coded + SMOOTHING_WINDOW) - bits_coded)
* MAX(1, encoder->cfg.gop_len) / SMOOTHING_WINDOW;
smoothing_window = MAX(MIN_SMOOTHING_WINDOW, smoothing_window - encoder->cfg.gop_len / 2);
double gop_target_bits = -1;
while( gop_target_bits < 0 && smoothing_window < 150) {
// Equation 12 from https://doi.org/10.1109/TIP.2014.2336550
gop_target_bits =
(encoder->target_avg_bppic * (pictures_coded + smoothing_window) - bits_coded)
* MAX(1, encoder->cfg.gop_len) / smoothing_window;
if(gop_target_bits < 0) {
smoothing_window += 10;
}
}
// Allocate at least 200 bits for each GOP like HM does.
return MAX(200, gop_target_bits);
}