hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 19:24:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix use of log2_cg_size in coeff coding -> smaller blocks also decoded correctly

Browse source
This commit is contained in:
Marko Viitanen 2020-08-27 18:26:16 +03:00
parent b3f3a9eae6
commit 574c4d06ee
3 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,13 +60,13 @@ void kvz_encode_coeff_nxn_generic(encoder_state_t * const state,
// CONSTANTS // CONSTANTS
const uint32_t log2_block_size = kvz_g_convert_to_bit[width]+2;
const uint32_t log2_block_size = kvz_g_convert_to_bit[width] + 2; const uint32_t log2_cg_size = kvz_g_log2_sbb_size[log2_block_size][log2_block_size][0] + kvz_g_log2_sbb_size[log2_block_size][log2_block_size][1];
const uint32_t *scan = const uint32_t *scan =
kvz_g_sig_last_scan[scan_mode][log2_block_size - 1]; kvz_g_sig_last_scan[scan_mode][log2_block_size - 1];
const uint32_t *scan_cg = g_sig_last_scan_cg[log2_block_size - 2][scan_mode]; const uint32_t *scan_cg = g_sig_last_scan_cg[log2_block_size - 2][scan_mode];
const uint32_t clipped_log2_size = log2_block_size > 4 ? 4 : log2_block_size; const uint32_t clipped_log2_size = log2_block_size > 4 ? 4 : log2_block_size;
const uint32_t num_blk_side = width >> clipped_log2_size; const uint32_t num_blk_side = width >> log2_cg_size;
// Init base contexts according to block type // Init base contexts according to block type
@ -79,10 +79,10 @@ void kvz_encode_coeff_nxn_generic(encoder_state_t * const state,
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;
sig_coeffgroup_flag[scan_cg[i >> clipped_log2_size]] = 1; sig_coeffgroup_flag[scan_cg[i >> log2_cg_size]] = 1;
} }
} }
scan_cg_last = scan_pos_last >> clipped_log2_size; scan_cg_last = scan_pos_last >> log2_cg_size;
int pos_last = scan[scan_pos_last]; int pos_last = scan[scan_pos_last];
@ -114,8 +114,8 @@ void kvz_encode_coeff_nxn_generic(encoder_state_t * const state,
//int32_t abs_coeff[64*64]; //int32_t abs_coeff[64*64];
int32_t cg_blk_pos = scan_cg[i]; int32_t cg_blk_pos = scan_cg[i];
int32_t cg_pos_y = cg_blk_pos / (MIN((uint8_t)32, width) >> (clipped_log2_size / 2)); int32_t cg_pos_y = cg_blk_pos / (MIN((uint8_t)32, width) >> (log2_cg_size / 2));
int32_t cg_pos_x = cg_blk_pos - (cg_pos_y * (MIN((uint8_t)32, width) >> (clipped_log2_size / 2))); int32_t cg_pos_x = cg_blk_pos - (cg_pos_y * (MIN((uint8_t)32, width) >> (log2_cg_size / 2)));
/*if (type == 0 && width <= 32) { /*if (type == 0 && width <= 32) {
@ -137,7 +137,7 @@ void kvz_encode_coeff_nxn_generic(encoder_state_t * const state,
} else { } else {
uint32_t sig_coeff_group = (sig_coeffgroup_flag[cg_blk_pos] != 0); uint32_t sig_coeff_group = (sig_coeffgroup_flag[cg_blk_pos] != 0);
uint32_t ctx_sig = kvz_context_get_sig_coeff_group(sig_coeffgroup_flag, cg_pos_x, uint32_t ctx_sig = kvz_context_get_sig_coeff_group(sig_coeffgroup_flag, cg_pos_x,
cg_pos_y, (MIN((uint8_t)32, width) >> (clipped_log2_size / 2))); cg_pos_y, (MIN((uint8_t)32, width) >> (log2_cg_size / 2)));
cabac->cur_ctx = &base_coeff_group_ctx[ctx_sig]; cabac->cur_ctx = &base_coeff_group_ctx[ctx_sig];
CABAC_BIN(cabac, sig_coeff_group, "significant_coeffgroup_flag"); CABAC_BIN(cabac, sig_coeff_group, "significant_coeffgroup_flag");
} }
@ -146,8 +146,8 @@ void kvz_encode_coeff_nxn_generic(encoder_state_t * const state,
if (sig_coeffgroup_flag[cg_blk_pos]) { if (sig_coeffgroup_flag[cg_blk_pos]) {
uint32_t next_pass = 0; uint32_t next_pass = 0;
int32_t min_sub_pos = i << clipped_log2_size; // LOG2_SCAN_SET_SIZE; int32_t min_sub_pos = i << log2_cg_size; // LOG2_SCAN_SET_SIZE;
int32_t first_sig_pos = (i == scan_cg_last) ? scan_pos_last : (min_sub_pos + (1 << clipped_log2_size) - 1); int32_t first_sig_pos = (i == scan_cg_last) ? scan_pos_last : (min_sub_pos + (1 << log2_cg_size) - 1);
int32_t next_sig_pos = first_sig_pos; int32_t next_sig_pos = first_sig_pos;
int32_t infer_sig_pos = (next_sig_pos != scan_pos_last) ? ((i != 0) ? min_sub_pos : -1) : next_sig_pos; int32_t infer_sig_pos = (next_sig_pos != scan_pos_last) ? ((i != 0) ? min_sub_pos : -1) : next_sig_pos;

13
src/tables.c
View file

@ -8,6 +8,19 @@
const int8_t kvz_g_convert_to_bit[LCU_WIDTH + 1] = {-1, -1, -1, -1, 0, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4}; const int8_t kvz_g_convert_to_bit[LCU_WIDTH + 1] = {-1, -1, -1, -1, 0, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4};
const uint32_t kvz_g_log2_sbb_size[7 + 1][7 + 1][2] =
//===== luma/chroma =====
{
{ { 0,0 },{ 0,1 },{ 0,2 },{ 0,3 },{ 0,4 },{ 0,4 },{ 0,4 },{ 0,4 } },
{ { 1,0 },{ 1,1 },{ 1,1 },{ 1,3 },{ 1,3 },{ 1,3 },{ 1,3 },{ 1,3 } },
{ { 2,0 },{ 1,1 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 } },
{ { 3,0 },{ 3,1 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 } },
{ { 4,0 },{ 3,1 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 } },
{ { 4,0 },{ 3,1 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 } },
{ { 4,0 },{ 3,1 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 } },
{ { 4,0 },{ 3,1 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 },{ 2,2 } }
};
static const uint32_t g_sig_last_scan_0_0[4] = {0, 2, 1, 3}; static const uint32_t g_sig_last_scan_0_0[4] = {0, 2, 1, 3};
static const uint32_t g_sig_last_scan_1_0[4] = {0, 1, 2, 3}; static const uint32_t g_sig_last_scan_1_0[4] = {0, 1, 2, 3};
static const uint32_t g_sig_last_scan_2_0[4] = {0, 2, 1, 3}; static const uint32_t g_sig_last_scan_2_0[4] = {0, 2, 1, 3};

1
src/tables.h
View file

@ -107,5 +107,6 @@ typedef enum
*/ */
extern const uint32_t* const kvz_g_sig_last_scan[3][5]; extern const uint32_t* const kvz_g_sig_last_scan[3][5];
extern const int8_t kvz_g_convert_to_bit[LCU_WIDTH + 1]; extern const int8_t kvz_g_convert_to_bit[LCU_WIDTH + 1];
extern const uint32_t kvz_g_log2_sbb_size[7 + 1][7 + 1][2];
#endif //TABLES_H_ #endif //TABLES_H_