Skip to content

GitLab

Commit feb517c8 authored by Jingning Han's avatar Jingning Han
Browse files
Options

Make cb4x4 mode support supertx 

This commit makes the cb4x4 mode support supertx operation.

Change-Id: I1a713b2268c1029aebeb43aa6aeb0fa37b16810f
parent 1856e43f
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 31 deletions
av1/common/entropymode.c
View file @ feb517c8
......@@ -1670,12 +1670,22 @@ static const aom_prob default_filter_intra_probs[2] = { 230, 230 };
#if CONFIG_SUPERTX
static const aom_prob default_supertx_prob[PARTITION_SUPERTX_CONTEXTS]
[TX_SIZES] = {
#if CONFIG_CB4X4
#if CONFIG_TX64X64
{ 1, 1, 160, 160, 170, 180 },
{ 1, 1, 200, 200, 210, 220 },
#else
{ 1, 1, 160, 160, 170 },
{ 1, 1, 200, 200, 210 },
#endif // CONFIG_TX64X64
#else
#if CONFIG_TX64X64
{ 1, 160, 160, 170, 180 },
{ 1, 200, 200, 210, 220 },
#else
{ 1, 160, 160, 170 },
{ 1, 200, 200, 210 },
#endif // CONFIG_CB4X4
#endif // CONFIG_TX64X64
};
#endif // CONFIG_SUPERTX
......
av1/common/reconinter.c
View file @ feb517c8
......@@ -1006,6 +1006,11 @@ void av1_setup_pre_planes(MACROBLOCKD *xd, int idx,
}
#if CONFIG_SUPERTX
#if CONFIG_CB4X4
static const uint8_t mask_4[4] = { 64, 62, 12, 0 };
static const uint8_t mask_4_uv[4] = { 64, 62, 12, 0 };
#endif // CONFIG_CB4X4
static const uint8_t mask_8[8] = { 64, 64, 62, 52, 12, 2, 0, 0 };
static const uint8_t mask_16[16] = { 63, 62, 60, 58, 55, 50, 43, 36,
......@@ -1027,6 +1032,9 @@ static const uint8_t mask_32_uv[32] = { 64, 64, 64, 64, 64, 64, 64, 64,
static const uint8_t *get_supertx_mask(int length, int plane) {
switch (length) {
#if CONFIG_CB4X4
case 4: return plane ? mask_4_uv : mask_4;
#endif // CONFIG_CB4X4
case 8: return plane ? mask_8_uv : mask_8;
case 16: return plane ? mask_16_uv : mask_16;
case 32: return plane ? mask_32_uv : mask_32;
......
av1/decoder/decodeframe.c
View file @ feb517c8
......@@ -812,7 +812,12 @@ static void dec_extend_dir(AV1Decoder *const pbi, MACROBLOCKD *const xd,
const int mi_height = mi_size_high[bsize];
int xss = xd->plane[1].subsampling_x;
int yss = xd->plane[1].subsampling_y;
int b_sub8x8 = (bsize < BLOCK_8X8) ? 1 : 0;
#if CONFIG_CB4X4
const int unify_bsize = 1;
#else
const int unify_bsize = 0;
#endif
int b_sub8x8 = (bsize < BLOCK_8X8) && !unify_bsize ? 1 : 0;
BLOCK_SIZE extend_bsize;
int unit, mi_row_pred, mi_col_pred;
......@@ -911,6 +916,11 @@ static void dec_predict_sb_complex(AV1Decoder *const pbi, MACROBLOCKD *const xd,
int i;
const int mi_offset = mi_row * cm->mi_stride + mi_col;
uint8_t *dst_buf1[3], *dst_buf2[3], *dst_buf3[3];
#if CONFIG_CB4X4
const int unify_bsize = 1;
#else
const int unify_bsize = 0;
#endif
DECLARE_ALIGNED(16, uint8_t, tmp_buf1[MAX_MB_PLANE * MAX_TX_SQUARE * 2]);
DECLARE_ALIGNED(16, uint8_t, tmp_buf2[MAX_MB_PLANE * MAX_TX_SQUARE * 2]);
......@@ -966,7 +976,7 @@ static void dec_predict_sb_complex(AV1Decoder *const pbi, MACROBLOCKD *const xd,
mi_row_top, mi_col_top, dst_buf, dst_stride);
break;
case PARTITION_HORZ:
if (bsize == BLOCK_8X8) {
if (bsize == BLOCK_8X8 && !unify_bsize) {
// For sub8x8, predict in 8x8 unit
// First half
dec_predict_b_extend(pbi, xd, tile, 0, mi_row, mi_col, mi_row, mi_col,
......@@ -1030,7 +1040,7 @@ static void dec_predict_sb_complex(AV1Decoder *const pbi, MACROBLOCKD *const xd,
}
break;
case PARTITION_VERT:
if (bsize == BLOCK_8X8) {
if (bsize == BLOCK_8X8 && !unify_bsize) {
// First half
dec_predict_b_extend(pbi, xd, tile, 0, mi_row, mi_col, mi_row, mi_col,
mi_row_top, mi_col_top, dst_buf, dst_stride,
......@@ -1093,7 +1103,7 @@ static void dec_predict_sb_complex(AV1Decoder *const pbi, MACROBLOCKD *const xd,
}
break;
case PARTITION_SPLIT:
if (bsize == BLOCK_8X8) {
if (bsize == BLOCK_8X8 && !unify_bsize) {
dec_predict_b_extend(pbi, xd, tile, 0, mi_row, mi_col, mi_row, mi_col,
mi_row_top, mi_col_top, dst_buf, dst_stride,
top_bsize, BLOCK_8X8, 1, 0);
......@@ -1134,7 +1144,7 @@ static void dec_predict_sb_complex(AV1Decoder *const pbi, MACROBLOCKD *const xd,
dst_buf3, dst_stride3);
}
for (i = 0; i < MAX_MB_PLANE; i++) {
if (bsize == BLOCK_8X8 && i != 0)
if (bsize == BLOCK_8X8 && i != 0 && !unify_bsize)
continue; // Skip <4x4 chroma smoothing
if (mi_row < cm->mi_rows && mi_col + hbs < cm->mi_cols) {
av1_build_masked_inter_predictor_complex(
......@@ -4073,7 +4083,7 @@ static void read_supertx_probs(FRAME_CONTEXT *fc, aom_reader *r) {
int i, j;
if (aom_read(r, GROUP_DIFF_UPDATE_PROB, ACCT_STR)) {
for (i = 0; i < PARTITION_SUPERTX_CONTEXTS; ++i) {
for (j = 1; j < TX_SIZES; ++j) {
for (j = TX_8X8; j < TX_SIZES; ++j) {
av1_diff_update_prob(r, &fc->supertx_prob[i][j], ACCT_STR);
}
}
......
av1/encoder/encodeframe.c
View file @ feb517c8
......@@ -376,9 +376,11 @@ static void set_offsets_extend(const AV1_COMP *const cpi, ThreadData *td,
x->mv_row_max = (cm->mi_rows - mi_row_pred) * MI_SIZE + AOM_INTERP_EXTEND;
x->mv_col_max = (cm->mi_cols - mi_col_pred) * MI_SIZE + AOM_INTERP_EXTEND;
// Set up distance of MB to edge of frame in 1/8th pel units.
// Set up distance of MB to edge of frame in 1/8th pel units.
#if !CONFIG_CB4X4
assert(!(mi_col_pred & (mi_width - mi_size_wide[BLOCK_8X8])) &&
!(mi_row_pred & (mi_height - mi_size_high[BLOCK_8X8])));
#endif
set_mi_row_col(xd, tile, mi_row_pred, mi_height, mi_col_pred, mi_width,
cm->mi_rows, cm->mi_cols);
xd->up_available = (mi_row_ori > tile->mi_row_start);
......@@ -1403,6 +1405,11 @@ static void update_state_sb_supertx(const AV1_COMP *const cpi, ThreadData *td,
struct macroblock_plane *const p = x->plane;
struct macroblockd_plane *const pd = xd->plane;
int hbs = mi_size_wide[bsize] / 2;
#if CONFIG_CB4X4
const int unify_bsize = 1;
#else
const int unify_bsize = 0;
#endif
PARTITION_TYPE partition = pc_tree->partitioning;
BLOCK_SIZE subsize = get_subsize(bsize, partition);
int i;
......@@ -1426,7 +1433,7 @@ static void update_state_sb_supertx(const AV1_COMP *const cpi, ThreadData *td,
set_offsets_supertx(cpi, td, tile, mi_row, mi_col, subsize);
update_state_supertx(cpi, td, &pc_tree->vertical[0], mi_row, mi_col,
subsize, dry_run);
if (mi_col + hbs < cm->mi_cols && bsize > BLOCK_8X8) {
if (mi_col + hbs < cm->mi_cols && (bsize > BLOCK_8X8 || unify_bsize)) {
set_offsets_supertx(cpi, td, tile, mi_row, mi_col + hbs, subsize);
update_state_supertx(cpi, td, &pc_tree->vertical[1], mi_row,
mi_col + hbs, subsize, dry_run);
......@@ -1437,7 +1444,7 @@ static void update_state_sb_supertx(const AV1_COMP *const cpi, ThreadData *td,
set_offsets_supertx(cpi, td, tile, mi_row, mi_col, subsize);
update_state_supertx(cpi, td, &pc_tree->horizontal[0], mi_row, mi_col,
subsize, dry_run);
if (mi_row + hbs < cm->mi_rows && bsize > BLOCK_8X8) {
if (mi_row + hbs < cm->mi_rows && (bsize > BLOCK_8X8 || unify_bsize)) {
set_offsets_supertx(cpi, td, tile, mi_row + hbs, mi_col, subsize);
update_state_supertx(cpi, td, &pc_tree->horizontal[1], mi_row + hbs,
mi_col, subsize, dry_run);
......@@ -1445,7 +1452,7 @@ static void update_state_sb_supertx(const AV1_COMP *const cpi, ThreadData *td,
pmc = &pc_tree->horizontal_supertx;
break;
case PARTITION_SPLIT:
if (bsize == BLOCK_8X8) {
if (bsize == BLOCK_8X8 && !unify_bsize) {
set_offsets_supertx(cpi, td, tile, mi_row, mi_col, subsize);
update_state_supertx(cpi, td, pc_tree->leaf_split[0], mi_row, mi_col,
subsize, dry_run);
......@@ -1558,6 +1565,11 @@ static void update_supertx_param_sb(const AV1_COMP *const cpi, ThreadData *td,
const int hbs = mi_size_wide[bsize] / 2;
PARTITION_TYPE partition = pc_tree->partitioning;
BLOCK_SIZE subsize = get_subsize(bsize, partition);
#if CONFIG_CB4X4
const int unify_bsize = 1;
#else
const int unify_bsize = 0;
#endif
#if CONFIG_EXT_PARTITION_TYPES
int i;
#endif
......@@ -1570,17 +1582,17 @@ static void update_supertx_param_sb(const AV1_COMP *const cpi, ThreadData *td,
break;
case PARTITION_VERT:
update_supertx_param(td, &pc_tree->vertical[0], best_tx, supertx_size);
if (mi_col + hbs < cm->mi_cols && bsize > BLOCK_8X8)
if (mi_col + hbs < cm->mi_cols && (bsize > BLOCK_8X8 || unify_bsize))
update_supertx_param(td, &pc_tree->vertical[1], best_tx, supertx_size);
break;
case PARTITION_HORZ:
update_supertx_param(td, &pc_tree->horizontal[0], best_tx, supertx_size);
if (mi_row + hbs < cm->mi_rows && bsize > BLOCK_8X8)
if (mi_row + hbs < cm->mi_rows && (bsize > BLOCK_8X8 || unify_bsize))
update_supertx_param(td, &pc_tree->horizontal[1], best_tx,
supertx_size);
break;
case PARTITION_SPLIT:
if (bsize == BLOCK_8X8) {
if (bsize == BLOCK_8X8 && !unify_bsize) {
update_supertx_param(td, pc_tree->leaf_split[0], best_tx, supertx_size);
} else {
update_supertx_param_sb(cpi, td, mi_row, mi_col, subsize, best_tx,
......@@ -3969,8 +3981,9 @@ static void rd_pick_partition(const AV1_COMP *const cpi, ThreadData *td,
subsize, &pc_tree->horizontal[0], best_rdc.rdcost);
#if CONFIG_SUPERTX
abort_flag = (sum_rdc.rdcost >= best_rd && bsize > BLOCK_8X8) ||
(sum_rdc.rate == INT_MAX && bsize == BLOCK_8X8);
abort_flag =
(sum_rdc.rdcost >= best_rd && (bsize > BLOCK_8X8 || unify_bsize)) ||
(sum_rdc.rate == INT_MAX && bsize == BLOCK_8X8);
if (sum_rdc.rdcost < INT64_MAX &&
#else
if (sum_rdc.rdcost < best_rdc.rdcost &&
......@@ -4113,8 +4126,9 @@ static void rd_pick_partition(const AV1_COMP *const cpi, ThreadData *td,
#endif
subsize, &pc_tree->vertical[0], best_rdc.rdcost);
#if CONFIG_SUPERTX
abort_flag = (sum_rdc.rdcost >= best_rd && bsize > BLOCK_8X8) ||
(sum_rdc.rate == INT_MAX && bsize == BLOCK_8X8);
abort_flag =
(sum_rdc.rdcost >= best_rd && (bsize > BLOCK_8X8 || unify_bsize)) ||
(sum_rdc.rate == INT_MAX && bsize == BLOCK_8X8);
if (sum_rdc.rdcost < INT64_MAX &&
#else
if (sum_rdc.rdcost < best_rdc.rdcost &&
......@@ -5576,15 +5590,21 @@ static int check_intra_sb(const AV1_COMP *const cpi, const TileInfo *const tile,
int mi_row, int mi_col, BLOCK_SIZE bsize,
PC_TREE *pc_tree) {
const AV1_COMMON *const cm = &cpi->common;
const int hbs = mi_size_wide[bsize] / 2;
const PARTITION_TYPE partition = pc_tree->partitioning;
const BLOCK_SIZE subsize = get_subsize(bsize, partition);
#if CONFIG_EXT_PARTITION_TYPES
int i;
#endif
#if CONFIG_CB4X4
const int unify_bsize = 1;
#else
const int unify_bsize = 0;
#endif
#if !CONFIG_CB4X4
assert(bsize >= BLOCK_8X8);
#endif
if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols) return 1;
......@@ -5592,18 +5612,18 @@ static int check_intra_sb(const AV1_COMP *const cpi, const TileInfo *const tile,
case PARTITION_NONE: return check_intra_b(&pc_tree->none); break;
case PARTITION_VERT:
if (check_intra_b(&pc_tree->vertical[0])) return 1;
if (mi_col + hbs < cm->mi_cols && bsize > BLOCK_8X8) {
if (mi_col + hbs < cm->mi_cols && (bsize > BLOCK_8X8 || unify_bsize)) {
if (check_intra_b(&pc_tree->vertical[1])) return 1;
}
break;
case PARTITION_HORZ:
if (check_intra_b(&pc_tree->horizontal[0])) return 1;
if (mi_row + hbs < cm->mi_rows && bsize > BLOCK_8X8) {
if (mi_row + hbs < cm->mi_rows && (bsize > BLOCK_8X8 || unify_bsize)) {
if (check_intra_b(&pc_tree->horizontal[1])) return 1;
}
break;
case PARTITION_SPLIT:
if (bsize == BLOCK_8X8) {
if (bsize == BLOCK_8X8 && !unify_bsize) {
if (check_intra_b(pc_tree->leaf_split[0])) return 1;
} else {
if (check_intra_sb(cpi, tile, mi_row, mi_col, subsize,
......@@ -5655,6 +5675,11 @@ static int check_supertx_sb(BLOCK_SIZE bsize, TX_SIZE supertx_size,
PC_TREE *pc_tree) {
PARTITION_TYPE partition;
BLOCK_SIZE subsize;
#if CONFIG_CB4X4
const int unify_bsize = 1;
#else
const int unify_bsize = 0;
#endif
partition = pc_tree->partitioning;
subsize = get_subsize(bsize, partition);
......@@ -5665,7 +5690,7 @@ static int check_supertx_sb(BLOCK_SIZE bsize, TX_SIZE supertx_size,
case PARTITION_HORZ:
return check_supertx_b(supertx_size, &pc_tree->horizontal[0]);
case PARTITION_SPLIT:
if (bsize == BLOCK_8X8)
if (bsize == BLOCK_8X8 && !unify_bsize)
return check_supertx_b(supertx_size, pc_tree->leaf_split[0]);
else
return check_supertx_sb(subsize, supertx_size, pc_tree->split[0]);
......@@ -5790,7 +5815,12 @@ static void extend_dir(const AV1_COMP *const cpi, ThreadData *td,
const int mi_height = mi_size_high[bsize];
int xss = xd->plane[1].subsampling_x;
int yss = xd->plane[1].subsampling_y;
int b_sub8x8 = (bsize < BLOCK_8X8) ? 1 : 0;
#if CONFIG_CB4X4
const int unify_bsize = 1;
#else
const int unify_bsize = 0;
#endif
int b_sub8x8 = (bsize < BLOCK_8X8) && !unify_bsize ? 1 : 0;
BLOCK_SIZE extend_bsize;
int unit, mi_row_pred, mi_col_pred;
......@@ -5895,8 +5925,10 @@ static void predict_sb_complex(const AV1_COMP *const cpi, ThreadData *td,
const AV1_COMMON *const cm = &cpi->common;
MACROBLOCK *const x = &td->mb;
MACROBLOCKD *const xd = &x->e_mbd;
const int ctx = partition_plane_context(xd, mi_row, mi_col, bsize);
const int is_partition_root = bsize >= BLOCK_8X8;
const int ctx = is_partition_root
? partition_plane_context(xd, mi_row, mi_col, bsize)
: 0;
const int hbs = mi_size_wide[bsize] / 2;
const PARTITION_TYPE partition = pc_tree->partitioning;
const BLOCK_SIZE subsize = get_subsize(bsize, partition);
......@@ -5912,8 +5944,12 @@ static void predict_sb_complex(const AV1_COMP *const cpi, ThreadData *td,
int dst_stride1[3] = { MAX_TX_SIZE, MAX_TX_SIZE, MAX_TX_SIZE };
int dst_stride2[3] = { MAX_TX_SIZE, MAX_TX_SIZE, MAX_TX_SIZE };
int dst_stride3[3] = { MAX_TX_SIZE, MAX_TX_SIZE, MAX_TX_SIZE };
#if CONFIG_CB4X4
const int unify_bsize = 1;
#else
const int unify_bsize = 0;
assert(bsize >= BLOCK_8X8);
#endif
if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols) return;
......@@ -5944,7 +5980,7 @@ static void predict_sb_complex(const AV1_COMP *const cpi, ThreadData *td,
}
#endif // CONFIG_AOM_HIGHBITDEPTH
if (!dry_run && bsize < top_bsize) {
if (!dry_run && is_partition_root && bsize < top_bsize) {
// Explicitly cast away const.
FRAME_COUNTS *const frame_counts = (FRAME_COUNTS *)&cm->counts;
frame_counts->partition[ctx][partition]++;
......@@ -5965,7 +6001,7 @@ static void predict_sb_complex(const AV1_COMP *const cpi, ThreadData *td,
mi_col_top, dry_run, dst_buf, dst_stride);
break;
case PARTITION_HORZ:
if (bsize == BLOCK_8X8) {
if (bsize == BLOCK_8X8 && !unify_bsize) {
// Fisrt half
predict_b_extend(cpi, td, tile, 0, mi_row, mi_col, mi_row, mi_col,
mi_row_top, mi_col_top, dst_buf, dst_stride, top_bsize,
......@@ -6028,7 +6064,7 @@ static void predict_sb_complex(const AV1_COMP *const cpi, ThreadData *td,
}
break;
case PARTITION_VERT:
if (bsize == BLOCK_8X8) {
if (bsize == BLOCK_8X8 && !unify_bsize) {
// First half
predict_b_extend(cpi, td, tile, 0, mi_row, mi_col, mi_row, mi_col,
mi_row_top, mi_col_top, dst_buf, dst_stride, top_bsize,
......@@ -6089,7 +6125,7 @@ static void predict_sb_complex(const AV1_COMP *const cpi, ThreadData *td,
}
break;
case PARTITION_SPLIT:
if (bsize == BLOCK_8X8) {
if (bsize == BLOCK_8X8 && !unify_bsize) {
predict_b_extend(cpi, td, tile, 0, mi_row, mi_col, mi_row, mi_col,
mi_row_top, mi_col_top, dst_buf, dst_stride, top_bsize,
BLOCK_8X8, dry_run, 1, 0);
......@@ -6132,7 +6168,7 @@ static void predict_sb_complex(const AV1_COMP *const cpi, ThreadData *td,
pc_tree->split[3]);
}
for (i = 0; i < MAX_MB_PLANE; i++) {
if (bsize == BLOCK_8X8 && i != 0)
if (bsize == BLOCK_8X8 && i != 0 && !unify_bsize)
continue; // Skip <4x4 chroma smoothing
if (mi_row < cm->mi_rows && mi_col + hbs < cm->mi_cols) {
av1_build_masked_inter_predictor_complex(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment