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

move the intra bit calculation so that it is used also with lambda rc

Browse source
This commit is contained in:
Joose Sainio 2019-11-19 14:16:48 +02:00
parent a07833f3e6
commit ddb4e5a131
2 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/encoder_state-ctors_dtors.c
View file

@ -54,6 +54,7 @@ static int encoder_state_config_frame_init(encoder_state_t * const state) {
state->frame->rc_alpha = 3.2003; state->frame->rc_alpha = 3.2003;
state->frame->rc_beta = -1.367; state->frame->rc_beta = -1.367;
state->frame->icost = 0;
const encoder_control_t * const encoder = state->encoder_control; const encoder_control_t * const encoder = state->encoder_control;
const int num_lcus = encoder->in.width_in_lcu * encoder->in.height_in_lcu; const int num_lcus = encoder->in.width_in_lcu * encoder->in.height_in_lcu;
@ -70,10 +71,6 @@ static int encoder_state_config_frame_init(encoder_state_t * const state) {
state->frame->new_ratecontrol = kvz_get_rc_data(NULL); state->frame->new_ratecontrol = kvz_get_rc_data(NULL);
// state->frame->bpp_d = fopen("bits.txt", "wb");
// state->frame->c_d = fopen("c.txt", "wb");
// state->frame->k_d = fopen("k.txt", "wb");
return 1; return 1;
} }

26
src/rate_control.c
View file

@ -311,6 +311,17 @@ static double pic_allocate_bits(encoder_state_t * const state)
} }
if (state->frame->is_irap && encoder->cfg.intra_bit_allocation) { if (state->frame->is_irap && encoder->cfg.intra_bit_allocation) {
int total_cost = 0;
for (int y = 0; y < encoder->cfg.height; y += 8) {
for (int x = 0; x < encoder->cfg.width; x += 8) {
int cost = xCalcHADs8x8_ISlice(state->tile->frame->source->y + x, y, state->tile->frame->source->stride);
total_cost += cost;
kvz_get_lcu_stats(state, x / 64, y / 64)->i_cost += cost;
}
}
state->frame->icost = total_cost;
state->frame->remaining_weight = total_cost;
double bits = state->frame->cur_gop_target_bits / MAX(encoder->cfg.gop_len, 1); double bits = state->frame->cur_gop_target_bits / MAX(encoder->cfg.gop_len, 1);
double alpha, beta = 0.5582; double alpha, beta = 0.5582;
if (bits * 40 < encoder->cfg.width * encoder->cfg.height) { if (bits * 40 < encoder->cfg.width * encoder->cfg.height) {
@ -433,19 +444,6 @@ static INLINE double calculate_weights(encoder_state_t* const state, const int l
void kvz_estimate_pic_lambda(encoder_state_t * const state) { void kvz_estimate_pic_lambda(encoder_state_t * const state) {
const encoder_control_t * const encoder = state->encoder_control; const encoder_control_t * const encoder = state->encoder_control;
if(encoder->cfg.intra_bit_allocation && state->frame->is_irap) {
int total_cost = 0;
for (int y = 0; y < encoder->cfg.height; y += 8) {
for (int x = 0; x < encoder->cfg.width; x += 8) {
int cost = xCalcHADs8x8_ISlice(state->tile->frame->source->y + x, y, state->tile->frame->source->stride);
total_cost += cost;
kvz_get_lcu_stats(state, x / 64, y / 64)->i_cost += cost;
}
}
state->frame->icost = total_cost;
state->frame->remaining_weight = total_cost;
}
const int layer = encoder->cfg.gop[state->frame->gop_offset].layer - (state->frame->is_irap ? 1 : 0); const int layer = encoder->cfg.gop[state->frame->gop_offset].layer - (state->frame->is_irap ? 1 : 0);
const int ctu_count = state->tile->frame->height_in_lcu * state->tile->frame->width_in_lcu; const int ctu_count = state->tile->frame->height_in_lcu * state->tile->frame->width_in_lcu;
@ -755,8 +753,6 @@ static void update_pic_ck(encoder_state_t * const state, double bpp, double dist
state->frame->new_ratecontrol->pic_c_para[layer] = new_c; state->frame->new_ratecontrol->pic_c_para[layer] = new_c;
state->frame->new_ratecontrol->pic_k_para[layer] = new_k; state->frame->new_ratecontrol->pic_k_para[layer] = new_k;
} }
// fprintf(state->frame->c_d, "Frame %d\tC:\t%f\tbpp\t%f\tdistortion\t%f\tlambda\t%f\n", state->frame->num, new_c, bpp, distortion, lambda);
// fprintf(state->frame->k_d, "Frame %d\tK:\t%f\tbpp\t%f\tdistortion\t%f\tlambda\t%f\n", state->frame->num, new_k, bpp, distortion, lambda);
} }