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

[lfnst] Include lfnst in chroma search

Browse source
This commit is contained in:
Joose Sainio 2022-06-14 11:57:42 +03:00
parent 36137e2bee
commit cfc3fa9f09
3 changed files with 109 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
src/search_intra.c
View file

@ -246,45 +246,6 @@ static void derive_mts_constraints(cu_info_t *const pred_cu,
}
}
/**
* \brief Derives lfnst constraints.
*
* \param pred_cu Current prediction coding unit.
* \param lcu Current lcu.
* \param depth Current transform depth.
* \param lcu_px Position of the top left pixel of current CU within current LCU.
*/
static void derive_lfnst_constraints(
cu_info_t* const pred_cu,
const int depth,
bool*constraints,
const coeff_t* coeff,
const int width,
const int height)
{
coeff_scan_order_t scan_idx = uvg_get_scan_order(pred_cu->type, pred_cu->intra.mode, depth);
// ToDo: large block support in VVC?
const uint32_t log2_block_size = uvg_g_convert_to_bit[width] + 2;
const uint32_t* scan = uvg_g_sig_last_scan[scan_idx][log2_block_size - 1];
signed scan_pos_last = -1;
for (int i = 0; i < width * height; i++) {
if (coeff[scan[i]]) {
scan_pos_last = i;
}
}
if (scan_pos_last < 0) return;
if (pred_cu != NULL && pred_cu->tr_idx != MTS_SKIP && height >= 4 && width >= 4) {
const int max_lfnst_pos = ((height == 4 && width == 4) || (height == 8 && width == 8)) ? 7 : 15;
constraints[0] |= scan_pos_last > max_lfnst_pos;
constraints[1] |= scan_pos_last >= 1;
}
}
/**
* \brief Perform search for best intra transform split configuration.
@ -432,9 +393,9 @@ static double search_intra_trdepth(
}
}
const unsigned scan_offset = xy_to_zorder(width, lcu_px.x, lcu_px.y);
const unsigned scan_offset = xy_to_zorder(LCU_WIDTH, lcu_px.x, lcu_px.y);
derive_lfnst_constraints(
uvg_derive_lfnst_constraints(
pred_cu,
depth,
constraints,
@ -503,7 +464,7 @@ static double search_intra_trdepth(
pred_cu->intra.mode_chroma = chroma_mode;
pred_cu->joint_cb_cr = 4;
// TODO: Maybe check the jccr mode here also but holy shit is the interface of search_intra_rdo bad currently
const unsigned scan_offset = xy_to_zorder(width_c, lcu_px.x, lcu_px.y);
const unsigned scan_offset = xy_to_zorder(LCU_WIDTH_C, lcu_px.x, lcu_px.y);
uvg_intra_recon_cu(
state,
x_px,
@ -526,7 +487,7 @@ static double search_intra_trdepth(
// Temp constraints. Updating the actual pred_cu constraints here will break things later
bool constraints[2] = {pred_cu->violates_lfnst_constrained_chroma,
pred_cu->lfnst_last_scan_pos};
derive_lfnst_constraints(
uvg_derive_lfnst_constraints(
pred_cu,
depth,
constraints,
@ -538,7 +499,7 @@ static double search_intra_trdepth(
best_lfnst_idx = 0;
continue;
}
derive_lfnst_constraints(
uvg_derive_lfnst_constraints(
pred_cu,
depth,
constraints,
@ -1487,16 +1448,19 @@ int8_t uvg_search_intra_chroma_rdo(
ALIGNED(64) int16_t u_resi[LCU_WIDTH_C * LCU_WIDTH_C];
ALIGNED(64) int16_t v_resi[LCU_WIDTH_C * LCU_WIDTH_C];
for(int lfnst_i = 0; lfnst_i < 3; ++lfnst_i) {
const int lfnst = lfnst_modes_to_check[lfnst_i];
if (lfnst == -1) {
continue;
}
for (int8_t mode_i = 0; mode_i < num_modes; ++mode_i) {
const uint8_t mode = chroma_data[mode_i].pred_cu.intra.mode_chroma;
double mode_bits = uvg_chroma_mode_bits(state, mode, luma_mode);
chroma_data[mode_i].cost = mode_bits * state->lambda;
cu_info_t* pred_cu = &chroma_data[mode_i].pred_cu;
for (int8_t mode_i = 0; mode_i < num_modes; ++mode_i) {
const uint8_t mode = chroma_data[mode_i].pred_cu.intra.mode_chroma;
double mode_bits = uvg_chroma_mode_bits(state, mode, luma_mode);
chroma_data[mode_i].cost = mode_bits * state->lambda;
cu_info_t* pred_cu = &chroma_data[mode_i].pred_cu;
uint8_t best_lfnst_index = 0;
for (int lfnst_i = 0; lfnst_i < 3; ++lfnst_i) {
const int lfnst = lfnst_modes_to_check[lfnst_i];
chroma_data[mode_i].lfnst_costs[lfnst] += mode_bits * state->lambda;
if (lfnst == -1) {
continue;
}
if (pred_cu->tr_depth == pred_cu->depth) {
uvg_intra_predict(
state,
@ -1544,15 +1508,38 @@ int8_t uvg_search_intra_chroma_rdo(
u_resi,
v_resi,
&chorma_ts_out);
// LFNST constraint failed
if(chorma_ts_out.best_u_index == -1 && chorma_ts_out.best_combined_index == -1) {
chroma_data[mode_i].lfnst_costs[lfnst] = MAX_DOUBLE;
continue;
}
if(chorma_ts_out.best_u_cost + chorma_ts_out.best_v_cost < chorma_ts_out.best_combined_cost) {
chroma_data[mode_i].pred_cu.joint_cb_cr = 0;
chroma_data[mode_i].pred_cu.tr_skip |= (chorma_ts_out.best_u_index == CHROMA_TS) << COLOR_U;
chroma_data[mode_i].pred_cu.tr_skip |= (chorma_ts_out.best_v_index == CHROMA_TS) << COLOR_V;
chroma_data[mode_i].cost += chorma_ts_out.best_u_cost + chorma_ts_out.best_v_cost;
chroma_data[mode_i].lfnst_costs[lfnst] += chorma_ts_out.best_u_cost + chorma_ts_out.best_v_cost;
if(lfnst == lfnst_modes_to_check[0]
|| (lfnst == 0
&& chroma_data[mode_i].lfnst_costs[lfnst]
< chroma_data[mode_i].lfnst_costs[lfnst_modes_to_check[0]])) {
chroma_data[mode_i].pred_cu.joint_cb_cr = 0;
chroma_data[mode_i].pred_cu.tr_skip &= 1;
chroma_data[mode_i].pred_cu.tr_skip |= (chorma_ts_out.best_u_index == CHROMA_TS) << COLOR_U;
chroma_data[mode_i].pred_cu.tr_skip |= (chorma_ts_out.best_v_index == CHROMA_TS) << COLOR_V;
best_lfnst_index = lfnst;
chroma_data[mode_i].cost = chroma_data[mode_i].lfnst_costs[lfnst];
}
}
else {
chroma_data[mode_i].pred_cu.joint_cb_cr = chorma_ts_out.best_combined_index;
chroma_data[mode_i].cost += chorma_ts_out.best_combined_cost;
chroma_data[mode_i].lfnst_costs[lfnst] += chorma_ts_out.best_combined_cost;
if (lfnst == lfnst_modes_to_check[0]
|| (lfnst == 0
&& chroma_data[mode_i].lfnst_costs[lfnst]
< chroma_data[mode_i].lfnst_costs[lfnst_modes_to_check[0]])) {
chroma_data[mode_i].pred_cu.joint_cb_cr = chorma_ts_out.best_combined_index;
chroma_data[mode_i].pred_cu.tr_skip &= 1;
best_lfnst_index = lfnst;
chroma_data[mode_i].cost = chroma_data[mode_i].lfnst_costs[lfnst];
}
}
}
else {
@ -1567,6 +1554,7 @@ int8_t uvg_search_intra_chroma_rdo(
memcpy(&state->search_cabac, &temp_cabac, sizeof(cabac_data_t));
}
}
pred_cu->lfnst_idx = best_lfnst_index;
}
sort_modes(chroma_data, num_modes);

56
src/transform.c
View file

@ -158,6 +158,48 @@ int32_t uvg_get_scaled_qp(color_t color, int8_t qp, int8_t qp_offset, int8_t con
return qp_scaled;
}
/**
* \brief Derives lfnst constraints.
*
* \param pred_cu Current prediction coding unit.
* \param lcu Current lcu.
* \param depth Current transform depth.
* \param lcu_px Position of the top left pixel of current CU within current LCU.
*/
void uvg_derive_lfnst_constraints(
cu_info_t* const pred_cu,
const int depth,
bool* constraints,
const coeff_t* coeff,
const int width,
const int height)
{
coeff_scan_order_t scan_idx = uvg_get_scan_order(pred_cu->type, pred_cu->intra.mode, depth);
// ToDo: large block support in VVC?
const uint32_t log2_block_size = uvg_g_convert_to_bit[width] + 2;
const uint32_t* scan = uvg_g_sig_last_scan[scan_idx][log2_block_size - 1];
signed scan_pos_last = -1;
for (int i = 0; i < width * height; i++) {
if (coeff[scan[i]]) {
scan_pos_last = i;
}
}
if (scan_pos_last < 0) return;
if (pred_cu != NULL && pred_cu->tr_idx != MTS_SKIP && height >= 4 && width >= 4) {
const int max_lfnst_pos = ((height == 4 && width == 4) || (height == 8 && width == 8)) ? 7 : 15;
constraints[0] |= scan_pos_last > max_lfnst_pos;
constraints[1] |= scan_pos_last >= 1;
}
}
/**
* \brief NxN inverse transform (2D)
* \param coeff input data (transform coefficients)
@ -454,9 +496,12 @@ void uvg_chroma_transform_search(
transforms[0] = DCT7_CHROMA;
const int trans_offset = width * height;
int num_transforms = 1;
const int can_use_tr_skip = state->encoder_control->cfg.trskip_enable &&
(1 << state->encoder_control->cfg.trskip_max_size) >= width &&
state->encoder_control->cfg.chroma_trskip_enable;
state->encoder_control->cfg.chroma_trskip_enable &&
pred_cu->lfnst_idx == 0;
if (can_use_tr_skip) {
uvg_transformskip(state->encoder_control, u_resi, u_coeff + num_transforms * trans_offset, width);
uvg_transformskip(state->encoder_control, v_resi, v_coeff + num_transforms * trans_offset, width);
@ -506,8 +551,13 @@ void uvg_chroma_transform_search(
scan_order,
&u_has_coeffs,
&v_has_coeffs);
if(pred_cu->type == CU_INTRA) {
if(pred_cu->type == CU_INTRA && transforms[i] != CHROMA_TS) {
bool constraints[2] = { false, false };
uvg_derive_lfnst_constraints(pred_cu, depth, constraints, &u_coeff[i * trans_offset], width, height);
if(!IS_JCCR_MODE(transforms[i])) {
uvg_derive_lfnst_constraints(pred_cu, depth, constraints, &v_coeff[i * trans_offset], width, height);
}
if (constraints[0] || !constraints[1] && pred_cu->lfnst_idx != 0) continue;
}
if (IS_JCCR_MODE(transforms[i]) && !u_has_coeffs) continue;

8
src/transform.h
View file

@ -67,6 +67,14 @@ void uvg_itransform2d(const encoder_control_t * const encoder,
int32_t uvg_get_scaled_qp(color_t color, int8_t qp, int8_t qp_offset, int8_t const* const chroma_scale);
void uvg_derive_lfnst_constraints(
cu_info_t* const pred_cu,
const int depth,
bool* constraints,
const coeff_t* coeff,
const int width,
const int height);
typedef struct {
double best_u_cost;
double best_v_cost;