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

[isp] Modify existing scan table calls to use new getter. Add safety assert to getter.

Browse source
This commit is contained in:
siivonek 2022-08-10 19:35:15 +03:00
parent 35f1ecbe9d
commit 1fe45f719e
6 changed files with 72 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/encode_coding_tree.c
View file

@ -283,10 +283,14 @@ void uvg_encode_ts_residual(encoder_state_t* const state,
// CONSTANTS // CONSTANTS
const uint32_t log2_block_size = uvg_g_convert_to_bit[width] + 2; const uint32_t log2_block_width = uvg_g_convert_to_bit[width] + 2;
const uint32_t log2_cg_size = uvg_g_log2_sbb_size[log2_block_size][log2_block_size][0] + uvg_g_log2_sbb_size[log2_block_size][log2_block_size][1]; const uint32_t log2_block_height = log2_block_width; // ISP_TODO: height
const uint32_t* scan = uvg_g_sig_last_scan[scan_mode][log2_block_size - 1]; const uint32_t log2_cg_size = uvg_g_log2_sbb_size[log2_block_width][log2_block_width][0] + uvg_g_log2_sbb_size[log2_block_width][log2_block_width][1];
const uint32_t* scan_cg = g_sig_last_scan_cg[log2_block_size - 1][scan_mode]; //const uint32_t* scan = uvg_g_sig_last_scan[scan_mode][log2_block_size - 1];
//const uint32_t* scan_cg = g_sig_last_scan_cg[log2_block_size - 1][scan_mode];
const uint32_t* scan = uvg_get_scan_order_table(SCAN_GROUP_NORM, scan_mode, log2_block_width, log2_block_height);
const uint32_t* scan_cg = uvg_get_scan_order_table(SCAN_GROUP_COEF, scan_mode, log2_block_width, log2_block_height);
double bits = 0; double bits = 0;
@ -295,6 +299,7 @@ void uvg_encode_ts_residual(encoder_state_t* const state,
cabac->cur_ctx = base_coeff_group_ctx; cabac->cur_ctx = base_coeff_group_ctx;
// ISP_TODO: height
int maxCtxBins = (width * width * 7) >> 2; int maxCtxBins = (width * width * 7) >> 2;
unsigned scan_cg_last = (unsigned )-1; unsigned scan_cg_last = (unsigned )-1;
//unsigned scan_pos_last = (unsigned )-1; //unsigned scan_pos_last = (unsigned )-1;

33
src/rdo.c
View file

@ -1141,7 +1141,8 @@ int uvg_ts_rdoq(encoder_state_t* const state, coeff_t* src_coeff, coeff_t* dest_
const int max_log2_tr_dynamic_range = 15; const int max_log2_tr_dynamic_range = 15;
uint32_t log2_tr_width = uvg_math_floor_log2(width); uint32_t log2_tr_width = uvg_math_floor_log2(width);
uint32_t log2_tr_height = uvg_math_floor_log2(height); uint32_t log2_tr_height = uvg_math_floor_log2(height);
const uint32_t log2_block_size = uvg_g_convert_to_bit[width] + 2; const uint32_t log2_block_width = uvg_g_convert_to_bit[width] + 2;
const uint32_t log2_block_height = uvg_g_convert_to_bit[height] + 2;
const uint32_t log2_cg_width = g_log2_sbb_size[log2_tr_width][log2_tr_height][0]; const uint32_t log2_cg_width = g_log2_sbb_size[log2_tr_width][log2_tr_height][0];
const uint32_t log2_cg_height = g_log2_sbb_size[log2_tr_width][log2_tr_height][1]; const uint32_t log2_cg_height = g_log2_sbb_size[log2_tr_width][log2_tr_height][1];
@ -1182,8 +1183,10 @@ int uvg_ts_rdoq(encoder_state_t* const state, coeff_t* src_coeff, coeff_t* dest_
const coeff_t entropy_coding_maximum = (1 << max_log2_tr_dynamic_range) - 1; const coeff_t entropy_coding_maximum = (1 << max_log2_tr_dynamic_range) - 1;
const uint32_t* scan = uvg_g_sig_last_scan[scan_mode][log2_block_size - 1]; //const uint32_t* scan = uvg_g_sig_last_scan[scan_mode][log2_block_size - 1];
const uint32_t* scan_cg = g_sig_last_scan_cg[log2_block_size - 1][scan_mode]; //const uint32_t* scan_cg = g_sig_last_scan_cg[log2_block_size - 1][scan_mode];
const uint32_t* scan = uvg_get_scan_order_table(SCAN_GROUP_NORM, scan_mode, log2_block_width, log2_block_height);
const uint32_t* scan_cg = uvg_get_scan_order_table(SCAN_GROUP_COEF, scan_mode, log2_block_width, log2_block_height);
uint32_t coeff_levels[3]; uint32_t coeff_levels[3];
double coeff_level_error[4]; double coeff_level_error[4];
@ -1221,8 +1224,8 @@ int uvg_ts_rdoq(encoder_state_t* const state, coeff_t* src_coeff, coeff_t* dest_
scan_pos = (sbId << log2_cg_size) + scan_pos_in_sb; scan_pos = (sbId << log2_cg_size) + scan_pos_in_sb;
int last_pos_coded = sbSizeM1; int last_pos_coded = sbSizeM1;
uint32_t blkpos = scan[scan_pos]; uint32_t blkpos = scan[scan_pos];
uint32_t pos_y = blkpos >> log2_block_size; uint32_t pos_y = blkpos >> log2_block_width;
uint32_t pos_x = blkpos - (pos_y << log2_block_size); uint32_t pos_x = blkpos - (pos_y << log2_block_width); // TODO: height
//===== quantization ===== //===== quantization =====
// set coeff // set coeff
@ -1391,7 +1394,8 @@ void uvg_rdoq(
int32_t transform_shift = MAX_TR_DYNAMIC_RANGE - encoder->bitdepth - ((log2_tr_height + log2_tr_width) >> 1); // Represents scaling through forward transform int32_t transform_shift = MAX_TR_DYNAMIC_RANGE - encoder->bitdepth - ((log2_tr_height + log2_tr_width) >> 1); // Represents scaling through forward transform
uint16_t go_rice_param = 0; uint16_t go_rice_param = 0;
uint32_t reg_bins = (width * height * 28) >> 4; uint32_t reg_bins = (width * height * 28) >> 4;
const uint32_t log2_block_size = uvg_g_convert_to_bit[ width ] + 2; const uint32_t log2_block_width = uvg_g_convert_to_bit[width] + 2;
const uint32_t log2_block_height = uvg_g_convert_to_bit[height] + 2;
int32_t scalinglist_type= (block_type == CU_INTRA ? 0 : 3) + type; int32_t scalinglist_type= (block_type == CU_INTRA ? 0 : 3) + type;
int32_t qp_scaled = uvg_get_scaled_qp(type, state->qp, (encoder->bitdepth - 8) * 6, encoder->qp_map[0]); int32_t qp_scaled = uvg_get_scaled_qp(type, state->qp, (encoder->bitdepth - 8) * 6, encoder->qp_map[0]);
@ -1415,11 +1419,13 @@ void uvg_rdoq(
memset(dest_coeff, 0, sizeof(coeff_t) * width * height); memset(dest_coeff, 0, sizeof(coeff_t) * width * height);
const uint32_t log2_cg_size = uvg_g_log2_sbb_size[log2_block_size][log2_block_size][0] + uvg_g_log2_sbb_size[log2_block_size][log2_block_size][1]; // ISP_TODO: height
const uint32_t log2_cg_size = uvg_g_log2_sbb_size[log2_block_width][log2_block_width][0] + uvg_g_log2_sbb_size[log2_block_width][log2_block_width][1];
const uint32_t cg_width = (MIN((uint8_t)32, width) >> (log2_cg_size / 2)); const uint32_t cg_width = (MIN((uint8_t)32, width) >> (log2_cg_size / 2));
const uint32_t *scan_cg = g_sig_last_scan_cg[log2_block_size - 1][scan_mode]; //const uint32_t *scan_cg = g_sig_last_scan_cg[log2_block_size - 1][scan_mode];
const uint32_t *scan_cg = uvg_get_scan_order_table(SCAN_GROUP_COEF, scan_mode, log2_block_width, log2_block_height);
const uint32_t cg_size = 16; const uint32_t cg_size = 16;
const int32_t shift = 4 >> 1; const int32_t shift = 4 >> 1;
const uint32_t num_blk_side = width >> shift; const uint32_t num_blk_side = width >> shift;
@ -1431,7 +1437,8 @@ void uvg_rdoq(
int32_t temp_diag = -1; int32_t temp_diag = -1;
int32_t temp_sum = -1; int32_t temp_sum = -1;
const uint32_t *scan = uvg_g_sig_last_scan[ scan_mode ][ log2_block_size - 1 ]; //const uint32_t *scan = uvg_g_sig_last_scan[ scan_mode ][ log2_block_size - 1 ];
const uint32_t *scan = uvg_get_scan_order_table(SCAN_GROUP_NORM, scan_mode, log2_block_width, log2_block_height);
int32_t cg_last_scanpos = -1; int32_t cg_last_scanpos = -1;
int32_t last_scanpos = -1; int32_t last_scanpos = -1;
@ -1527,8 +1534,8 @@ void uvg_rdoq(
if (last_scanpos >= 0) { if (last_scanpos >= 0) {
uint32_t pos_y = blkpos >> log2_block_size; uint32_t pos_y = blkpos >> log2_block_width;
uint32_t pos_x = blkpos - (pos_y << log2_block_size); uint32_t pos_x = blkpos - (pos_y << log2_block_width); // ISP_TODO: height
//===== coefficient level estimation ===== //===== coefficient level estimation =====
int32_t level; int32_t level;
@ -1715,8 +1722,8 @@ void uvg_rdoq(
uint32_t blkpos = scan[scanpos]; uint32_t blkpos = scan[scanpos];
if( dest_coeff[ blkpos ] ) { if( dest_coeff[ blkpos ] ) {
uint32_t pos_y = blkpos >> log2_block_size; uint32_t pos_y = blkpos >> log2_block_width;
uint32_t pos_x = blkpos - ( pos_y << log2_block_size ); uint32_t pos_x = blkpos - ( pos_y << log2_block_width ); // ISP_TODO: height
double cost_last = get_rate_last(lambda, pos_x, pos_y, last_x_bits,last_y_bits ); double cost_last = get_rate_last(lambda, pos_x, pos_y, last_x_bits,last_y_bits );
double totalCost = base_cost + cost_last - cost_sig[ scanpos ]; double totalCost = base_cost + cost_last - cost_sig[ scanpos ];

16
src/search_intra.c
View file

@ -194,21 +194,27 @@ static void derive_mts_constraints(cu_info_t *const pred_cu,
const vector2d_t lcu_px) const vector2d_t lcu_px)
{ {
const int width = LCU_WIDTH >> depth; const int width = LCU_WIDTH >> depth;
const int height = width; // ISP_TODO: height
int8_t scan_idx = uvg_get_scan_order(pred_cu->type, pred_cu->intra.mode, depth); int8_t scan_idx = uvg_get_scan_order(pred_cu->type, pred_cu->intra.mode, depth);
int32_t i; int32_t i;
// ToDo: large block support in VVC? // ToDo: large block support in VVC?
uint32_t sig_coeffgroup_flag[32 * 32] = { 0 }; uint32_t sig_coeffgroup_flag[32 * 32] = { 0 };
const uint32_t log2_block_size = uvg_g_convert_to_bit[width] + 2; const uint32_t log2_block_width = uvg_g_convert_to_bit[width] + 2;
const uint32_t log2_cg_size = uvg_g_log2_sbb_size[log2_block_size][log2_block_size][0] const uint32_t log2_block_height = uvg_g_convert_to_bit[height] + 2;
+ uvg_g_log2_sbb_size[log2_block_size][log2_block_size][1]; const uint32_t log2_cg_size = uvg_g_log2_sbb_size[log2_block_width][log2_block_width][0]
const uint32_t *scan = uvg_g_sig_last_scan[scan_idx][log2_block_size - 1]; + uvg_g_log2_sbb_size[log2_block_width][log2_block_width][1]; // ISP_TODO: height
const uint32_t *scan_cg = g_sig_last_scan_cg[log2_block_size - 1][scan_idx]; //const uint32_t *scan = uvg_g_sig_last_scan[scan_idx][log2_block_size - 1];
//const uint32_t *scan_cg = g_sig_last_scan_cg[log2_block_size - 1][scan_idx];
const uint32_t *scan = uvg_get_scan_order_table(SCAN_GROUP_NORM, scan_idx, log2_block_width, log2_block_height);
const uint32_t *scan_cg = uvg_get_scan_order_table(SCAN_GROUP_COEF, scan_idx, log2_block_width, log2_block_height);
const coeff_t* coeff = &lcu->coeff.y[xy_to_zorder(LCU_WIDTH, lcu_px.x, lcu_px.y)]; const coeff_t* coeff = &lcu->coeff.y[xy_to_zorder(LCU_WIDTH, lcu_px.x, lcu_px.y)];
signed scan_cg_last = -1; signed scan_cg_last = -1;
signed scan_pos_last = -1; signed scan_pos_last = -1;
// ISP_TODO: height
for (int i = 0; i < width * width; i++) { for (int i = 0; i < width * width; i++) {
if (coeff[scan[i]]) { if (coeff[scan[i]]) {
scan_pos_last = i; scan_pos_last = i;

12
src/strategies/generic/encode_coding_tree-generic.c
View file

@ -76,11 +76,13 @@ void uvg_encode_coeff_nxn_generic(encoder_state_t * const state,
// CONSTANTS // CONSTANTS
const int height = width; // TODO: height for non-square blocks. const int height = width; // TODO: height for non-square blocks.
const uint32_t log2_block_size = uvg_g_convert_to_bit[width]+2; const uint32_t log2_block_width = uvg_g_convert_to_bit[width]+2;
const uint32_t log2_cg_size = uvg_g_log2_sbb_size[log2_block_size][log2_block_size][0] + uvg_g_log2_sbb_size[log2_block_size][log2_block_size][1]; const uint32_t log2_block_height = uvg_g_convert_to_bit[width] + 2; // ISP_TODO: height
const uint32_t *scan = const uint32_t log2_cg_size = uvg_g_log2_sbb_size[log2_block_width][log2_block_width][0] + uvg_g_log2_sbb_size[log2_block_width][log2_block_width][1];
uvg_g_sig_last_scan[scan_mode][log2_block_size - 1]; //const uint32_t *scan = uvg_g_sig_last_scan[scan_mode][log2_block_size - 1];
const uint32_t *scan_cg = g_sig_last_scan_cg[log2_block_size - 1][scan_mode]; //const uint32_t *scan_cg = g_sig_last_scan_cg[log2_block_size - 1][scan_mode];
const uint32_t* scan = uvg_get_scan_order_table(SCAN_GROUP_NORM, scan_mode, log2_block_width, log2_block_height);
const uint32_t* scan_cg = uvg_get_scan_order_table(SCAN_GROUP_COEF, scan_mode, log2_block_width, log2_block_height);
// Init base contexts according to block type // Init base contexts according to block type

23
src/tables.c
View file

@ -2593,8 +2593,27 @@ static const uint32_t* g_scan_order[SCAN_GROUP_TYPES][MAX_LOG2_INDEX][MAX_LOG2_I
} }
}; };
uint32_t* uvg_get_scan_order(int scan_group, int log2_w, int log2_h)
/**
* \brief Return array of scan order indices.
*
* \param scan_group Scan group type, normal or coefficient.
* \param scan_type Scan type, diagonal, horizontal or vertical
* \param log2_w Log2 of block width.
* \param log2_h Log2 of block height.
*
* \return Returns pointer to scan order table based on given dimensions.
*/
uint32_t* uvg_get_scan_order_table(int scan_group, int scan_type, int log2_w, int log2_h)
{ {
// ISP_TODO: returning coef group type does not work yet. It will break for non-square blocks // ISP_TODO: horizontal and vertical scan types
assert(scan_type == SCAN_DIAG && "Horizontal and vertical scan not implemented.");
if (scan_group == SCAN_GROUP_NORM) {
return g_scan_order[scan_group][log2_w][log2_h]; return g_scan_order[scan_group][log2_w][log2_h];
} }
else {
// ISP_TODO: returning coef group type does not work yet. It will break for non-square blocks
return g_scan_order[scan_group][log2_w >> 2][log2_h >> 2];
}
}

4
src/tables.h
View file

@ -139,9 +139,9 @@ extern const uint32_t uvg_g_log2_sbb_size[7 + 1][7 + 1][2];
#define SCAN_GROUP_TYPES 2 #define SCAN_GROUP_TYPES 2
#define MAX_LOG2_INDEX 7 #define MAX_LOG2_INDEX 7
#define SCAN_GROUP_DIAG 0 #define SCAN_GROUP_NORM 0
#define SCAN_GROUP_COEF 1 #define SCAN_GROUP_COEF 1
uint32_t* uvg_get_scan_order(int scan_group, int log2_w, int log2_h); uint32_t* uvg_get_scan_order_table(int scan_group, int scan_type, int log2_w, int log2_h);
#endif //TABLES_H_ #endif //TABLES_H_