[LMCS] Always allocate the LMCS APS struct to simplify things

This commit is contained in:
Marko Viitanen 2021-05-26 17:01:19 +03:00
parent a5ff9284a8
commit bb12894575

View file

@ -434,9 +434,9 @@ int kvz_encoder_state_init(encoder_state_t * const child_state, encoder_state_t
children_allow_tile = 1;
start_in_ts = 0;
end_in_ts = child_state->tile->frame->width_in_lcu * child_state->tile->frame->height_in_lcu;
if (child_state->encoder_control->cfg.lmcs_enable) {
child_state->tile->frame->lmcs_aps = calloc(1, sizeof(lmcs_aps));
}
child_state->tile->frame->lmcs_aps = calloc(1, sizeof(lmcs_aps));
break;
case ENCODER_STATE_TYPE_SLICE:
assert(child_state->parent);
@ -743,7 +743,7 @@ void kvz_encoder_state_finalize(encoder_state_t * const state) {
FREE_POINTER(state->children);
}
if (state->type == ENCODER_STATE_TYPE_MAIN && state->encoder_control->cfg.lmcs_enable) {
if (state->type == ENCODER_STATE_TYPE_MAIN) {
FREE_POINTER(state->tile->frame->lmcs_aps);
}