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

[dual-tree] Fix CCLM+dual tree

Browse source
This commit is contained in:
Joose Sainio 2022-06-09 13:42:58 +03:00
parent cf144e2724
commit b8215baa30
3 changed files with 41 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/intra.c
View file

@ -491,8 +491,9 @@ static void predict_cclm(
const lcu_t* const lcu,
uvg_intra_references* chroma_ref,
uvg_pixel* dst,
cclm_parameters_t* cclm_params
)
cclm_parameters_t* cclm_params,
enum kvz_tree_type tree_type
)
{
assert(mode == LM_CHROMA_IDX || mode == LM_CHROMA_L_IDX || mode == LM_CHROMA_T_IDX);
assert(state->encoder_control->cfg.cclm);
@ -516,13 +517,15 @@ static void predict_cclm(
// The luma reference is only needed when we are not on the edge of the picture.
// Because the reference pixels that are needed on the edge of the ctu this code
// is kinda messy but what can you do
const int ctu_size = tree_type == KVZ_CHROMA_T ? LCU_WIDTH_C : LCU_WIDTH;
if (y0) {
if (y_scu == 0) available_above_right = MIN(width / 2, (64-x_scu - width * 2) / 2);
for (; available_above_right < width / 2; available_above_right++) {
int x_extension = x_scu + width * 2 + 4 * available_above_right;
// TODO: Dual tree
const cu_info_t* pu = LCU_GET_CU_AT_PX(lcu, x_extension, y_scu - 4);
if (x_extension >= LCU_WIDTH || pu->type == CU_NOTSET) break;
x_extension >>= tree_type == KVZ_CHROMA_T;
const cu_info_t* pu = LCU_GET_CU_AT_PX(lcu, x_extension, (y_scu >> (tree_type==KVZ_CHROMA_T)) - 4);
if (x_extension >= ctu_size || pu->type == CU_NOTSET || (pu->type == CU_INTRA && pu->intra.mode_chroma == -1)) break;
}
if(y_scu == 0) {
if(!state->encoder_control->cfg.wpp) available_above_right = MIN(width / 2, (state->tile->frame->width - x0 - width * 2) / 4);
@ -544,10 +547,12 @@ static void predict_cclm(
}
if(x0) {
if (x_scu == 0) available_left_below = MIN(width / 2, (64 - y_scu - height * 2) / 2);
for (; available_left_below < height / 2; available_left_below++) {
int y_extension = y_scu + height * 2 + 4 * available_left_below;
const cu_info_t* pu = LCU_GET_CU_AT_PX(lcu, x_scu - 4, y_extension);
if (y_extension >= LCU_WIDTH || pu->type == CU_NOTSET) break;
y_extension >>= tree_type == KVZ_CHROMA_T;
const cu_info_t* pu = LCU_GET_CU_AT_PX(lcu, (x_scu >> (tree_type == KVZ_CHROMA_T)) - 4, y_extension);
if (y_extension >= ctu_size || pu->type == CU_NOTSET || (pu->type == CU_INTRA && pu->intra.mode_chroma == -1)) break;
if(x_scu == 32 && y_scu == 0 && pu->depth == 0) break;
}
for(int i = 0; i < height + available_left_below * 2; i++) {
@ -1375,7 +1380,8 @@ void uvg_intra_predict(
const color_t color,
uvg_pixel* dst,
const intra_search_data_t* data,
const lcu_t* lcu
const lcu_t* lcu,
enum kvz_tree_type tree_type
)
{
const int stride = (((state->tile->frame->width + 7) & ~7) + FRAME_PADDING_LUMA);
@ -1409,7 +1415,8 @@ void uvg_intra_predict(
if (data->pred_cu.depth != data->pred_cu.tr_depth || data->cclm_parameters[color == COLOR_U ? 0 : 1].b <= 0) {
predict_cclm(
state, color, width, width, x, y, stride, intra_mode, lcu, refs, dst,
(cclm_parameters_t*)&data->cclm_parameters[color == COLOR_U ? 0 : 1]);
(cclm_parameters_t*)&data->cclm_parameters[color == COLOR_U ? 0 : 1],
tree_type);
}
else {
linear_transform_cclm(&data->cclm_parameters[color == COLOR_U ? 0 : 1], dst, dst, width, width);
@ -1449,7 +1456,8 @@ static void intra_recon_tb_leaf(
int depth,
lcu_t *lcu,
color_t color,
const intra_search_data_t* search_data)
const intra_search_data_t* search_data,
enum kvz_tree_type tree_type)
{
const uvg_config *cfg = &state->encoder_control->cfg;
const int shift = color == COLOR_Y ? 0 : 1;
@ -1501,7 +1509,7 @@ static void intra_recon_tb_leaf(
width, height,
};
uvg_intra_predict(state, &refs, &loc, color, pred, search_data, lcu);
uvg_intra_predict(state, &refs, &loc, color, pred, search_data, lcu, tree_type);
const int index = lcu_px.x + lcu_px.y * lcu_width;
uvg_pixel *block = NULL;
@ -1606,11 +1614,11 @@ void uvg_intra_recon_cu(
// Process a leaf TU.
if (has_luma) {
intra_recon_tb_leaf(state, x, y, depth, lcu, COLOR_Y, search_data);
intra_recon_tb_leaf(state, x, y, depth, lcu, COLOR_Y, search_data, tree_type);
}
if (has_chroma) {
intra_recon_tb_leaf(state, x, y, depth, lcu, COLOR_U, search_data);
intra_recon_tb_leaf(state, x, y, depth, lcu, COLOR_V, search_data);
intra_recon_tb_leaf(state, x, y, depth, lcu, COLOR_U, search_data, tree_type);
intra_recon_tb_leaf(state, x, y, depth, lcu, COLOR_V, search_data, tree_type);
}
uvg_quantize_lcu_residual(state, has_luma, has_chroma && !(search_data->pred_cu.joint_cb_cr & 3),

5
src/intra.h
View file

@ -133,8 +133,9 @@ void uvg_intra_predict(
const color_t color,
uvg_pixel* dst,
const intra_search_data_t* data,
const lcu_t* lcu
);
const lcu_t* lcu,
enum kvz_tree_type tree_type
);
void uvg_intra_recon_cu(
encoder_state_t* const state,

29
src/search_intra.c
View file

@ -668,7 +668,8 @@ static int search_intra_chroma_rough(
uvg_intra_references *refs_v,
intra_search_data_t* chroma_data,
lcu_t* lcu,
int8_t luma_mode)
int8_t luma_mode,
enum kvz_tree_type tree_type)
{
assert(depth != 4 || (x_px & 4 && y_px & 4));
@ -688,7 +689,7 @@ static int search_intra_chroma_rough(
for (int i = 0; i < modes_count; ++i) {
const int8_t mode_chroma = chroma_data[i].pred_cu.intra.mode_chroma;
if (mode_chroma == luma_mode || mode_chroma == 0 || mode_chroma >= 81) continue;
uvg_intra_predict(state, refs_u, &loc, COLOR_U, pred, &chroma_data[i], lcu);
uvg_intra_predict(state, refs_u, &loc, COLOR_U, pred, &chroma_data[i], lcu, tree_type);
//costs[i] += get_cost(encoder_state, pred, orig_block, satd_func, sad_func, width);
switch (width) {
case 4: chroma_data[i].cost += uvg_satd_4x4(pred, orig_block);
@ -706,9 +707,8 @@ static int search_intra_chroma_rough(
uvg_pixels_blit(orig_v, orig_block, width, width, origstride, width);
for (int i = 0; i < modes_count; ++i) {
const int8_t mode_chroma = chroma_data[i].pred_cu.intra.mode_chroma;
if (mode_chroma == luma_mode || mode_chroma == 0 || mode_chroma >= 81)
continue;
uvg_intra_predict(state, refs_v, &loc, COLOR_V, pred, &chroma_data[i], lcu);
if (mode_chroma == luma_mode || mode_chroma == 0 || mode_chroma >= 81) continue;
uvg_intra_predict(state, refs_v, &loc, COLOR_V, pred, &chroma_data[i], lcu, tree_type);
//costs[i] += get_cost(encoder_state, pred, orig_block, satd_func, sad_func, width);
switch (width) {
case 4: chroma_data[i].cost += uvg_satd_4x4(pred, orig_block);
@ -1056,9 +1056,9 @@ static int16_t search_intra_rough(
int offset = 4;
search_proxy.pred_cu.intra.mode = 0;
uvg_intra_predict(state, refs, &loc, COLOR_Y, preds[0], &search_proxy, NULL);
uvg_intra_predict(state, refs, &loc, COLOR_Y, preds[0], &search_proxy, NULL, KVZ_LUMA_T);
search_proxy.pred_cu.intra.mode = 1;
uvg_intra_predict(state, refs, &loc, COLOR_Y, preds[1], &search_proxy, NULL);
uvg_intra_predict(state, refs, &loc, COLOR_Y, preds[1], &search_proxy, NULL, KVZ_LUMA_T);
get_cost_dual(state, preds, orig_block, satd_dual_func, sad_dual_func, width, costs);
mode_checked[0] = true;
mode_checked[1] = true;
@ -1108,7 +1108,7 @@ static int16_t search_intra_rough(
for (int i = 0; i < PARALLEL_BLKS; ++i) {
if (mode + i * offset <= 66) {
search_proxy.pred_cu.intra.mode = mode + i*offset;
uvg_intra_predict(state, refs, &loc, COLOR_Y, preds[i], &search_proxy, NULL);
uvg_intra_predict(state, refs, &loc, COLOR_Y, preds[i], &search_proxy, NULL, KVZ_LUMA_T);
}
}
@ -1180,7 +1180,7 @@ static int16_t search_intra_rough(
for (int block = 0; block < PARALLEL_BLKS; ++block) {
search_proxy.pred_cu.intra.mode = modes_to_check[block + i];
uvg_intra_predict(state, refs, &loc, COLOR_Y, preds[block], &search_proxy, NULL);
uvg_intra_predict(state, refs, &loc, COLOR_Y, preds[block], &search_proxy, NULL, KVZ_LUMA_T);
}
@ -1267,7 +1267,7 @@ static void get_rough_cost_for_2n_modes(
double bits[PARALLEL_BLKS] = { 0 };
for(int mode = 0; mode < num_modes; mode += PARALLEL_BLKS) {
for (int i = 0; i < PARALLEL_BLKS; ++i) {
uvg_intra_predict(state, &refs[search_data[mode + i].pred_cu.intra.multi_ref_idx], cu_loc, COLOR_Y, preds[i], &search_data[mode + i], NULL);
uvg_intra_predict(state, &refs[search_data[mode + i].pred_cu.intra.multi_ref_idx], cu_loc, COLOR_Y, preds[i], &search_data[mode + i], NULL, KVZ_LUMA_T);
}
get_cost_dual(state, preds, orig_block, satd_dual_func, sad_dual_func, width, costs_out);
@ -1490,7 +1490,8 @@ int8_t uvg_search_intra_chroma_rdo(
COLOR_U,
u_pred,
&chroma_data[mode_i],
lcu);
lcu,
tree_type);
uvg_intra_predict(
state,
&refs[COLOR_V - 1],
@ -1498,7 +1499,8 @@ int8_t uvg_search_intra_chroma_rdo(
COLOR_V,
v_pred,
&chroma_data[mode_i],
lcu);
lcu,
tree_type);
uvg_generate_residual(
&lcu->ref.u[offset],
u_pred,
@ -1657,7 +1659,8 @@ int8_t uvg_search_cu_intra_chroma(
&refs_v,
chroma_data,
lcu,
intra_mode);
intra_mode,
tree_type);
}
if (num_modes > 1) {