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

Fixed significant coefficient group context calculation

Browse source
This commit is contained in:
Sami Ahovainio 2019-06-20 15:47:13 +03:00
parent 5e0bea962c
commit b51254cafd
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/encode_coding_tree.c
View file

@ -140,6 +140,7 @@ void kvz_encode_coeff_nxn(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 *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];
@ -246,8 +247,8 @@ void kvz_encode_coeff_nxn(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 / clipped_log2_size; int32_t cg_pos_y = cg_blk_pos / (MIN((uint8_t)32, width) >> (clipped_log2_size/2));
int32_t cg_pos_x = cg_blk_pos - (cg_pos_y * clipped_log2_size); int32_t cg_pos_x = cg_blk_pos - (cg_pos_y * (MIN((uint8_t)32, width) >> (clipped_log2_size / 2)));
int32_t min_sub_pos = i << clipped_log2_size; // LOG2_SCAN_SET_SIZE; int32_t min_sub_pos = i << clipped_log2_size; // LOG2_SCAN_SET_SIZE;
/*if (type == 0 && width <= 32) { /*if (type == 0 && width <= 32) {
@ -273,7 +274,7 @@ void kvz_encode_coeff_nxn(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, clipped_log2_size); cg_pos_y, (MIN((uint8_t)32, width) >> (clipped_log2_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");
} }