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

Move qp_to_lambda so it is defined before use. Change some tabs to spaces

Browse source
This commit is contained in:
siivonek 2020-03-19 22:13:53 +02:00
parent 0a4ce3c0aa
commit 2a85be5752
2 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cfg.c
View file

@ -138,7 +138,7 @@ int kvz_config_init(kvz_config *cfg)
cfg->me_max_steps = (uint32_t)-1;
cfg->vaq = 0;
cfg->vaq = 0;
cfg->scaling_list = KVZ_SCALING_LIST_OFF;

60
src/rate_control.c
View file

@ -637,6 +637,20 @@ static double get_ctu_bits(encoder_state_t * const state, vector2d_t pos) {
return avg_bits;
}
static double qp_to_lambda(encoder_state_t* const state, int qp)
{
const int shift_qp = 12;
double lambda = 0.57 * pow(2.0, (qp - shift_qp) / 3.0);
// NOTE: HM adjusts lambda for inter according to Hadamard usage in ME.
// SATD is currently always enabled for ME, so this has no effect.
// bool hadamard_me = true;
// if (!hadamard_me && state->frame->slicetype != KVZ_SLICE_I) {
// lambda *= 0.95;
// }
return lambda;
}
void kvz_set_ctu_qp_lambda(encoder_state_t * const state, vector2d_t pos) {
double bits = get_ctu_bits(state, pos);
@ -754,22 +768,22 @@ void kvz_set_ctu_qp_lambda(encoder_state_t * const state, vector2d_t pos) {
// Apply variance adaptive quantization
if (ctrl->cfg.vaq) {
vector2d_t lcu = {
pos.x + state->tile->lcu_offset_x,
pos.y + state->tile->lcu_offset_y
};
int id = lcu.x + lcu.y * state->tile->frame->width_in_lcu;
int aq_offset = round(state->frame->aq_offsets[id]);
state->qp += aq_offset;
// Maximum delta QP is clipped between [-26, 25] according to ITU T-REC-H.265 specification chapter 7.4.9.10 Transform unit semantics
// Since this value will be later combined with qp_pred, clip to half of that instead to be safe
state->qp = CLIP(state->frame->QP - 13, state->frame->QP + 12, state->qp);
state->qp = CLIP_TO_QP(state->qp);
state->lambda = qp_to_lambda(state, state->qp);
state->lambda_sqrt = sqrt(state->lambda);
vector2d_t lcu = {
pos.x + state->tile->lcu_offset_x,
pos.y + state->tile->lcu_offset_y
};
int id = lcu.x + lcu.y * state->tile->frame->width_in_lcu;
int aq_offset = round(state->frame->aq_offsets[id]);
state->qp += aq_offset;
// Maximum delta QP is clipped between [-26, 25] according to ITU T-REC-H.265 specification chapter 7.4.9.10 Transform unit semantics
// Since this value will be later combined with qp_pred, clip to half of that instead to be safe
state->qp = CLIP(state->frame->QP - 13, state->frame->QP + 12, state->qp);
state->qp = CLIP_TO_QP(state->qp);
state->lambda = qp_to_lambda(state, state->qp);
state->lambda_sqrt = sqrt(state->lambda);
ctu->qp = state->qp;
ctu->lambda = state->lambda;
ctu->qp = state->qp;
ctu->lambda = state->lambda;
}
}
@ -915,22 +929,6 @@ void kvz_update_after_picture(encoder_state_t * const state) {
}
}
static double qp_to_lambda(encoder_state_t * const state, int qp)
{
const int shift_qp = 12;
double lambda = 0.57 * pow(2.0, (qp - shift_qp) / 3.0);
// NOTE: HM adjusts lambda for inter according to Hadamard usage in ME.
// SATD is currently always enabled for ME, so this has no effect.
// bool hadamard_me = true;
// if (!hadamard_me && state->frame->slicetype != KVZ_SLICE_I) {
// lambda *= 0.95;
// }
return lambda;
}
/**
* \brief Allocate bits and set lambda and QP for the current picture.
* \param state the main encoder state