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

[DepQuant] Fix

Browse source
This commit is contained in:
Joose Sainio 2023-01-17 11:03:14 +02:00 committed by Marko Viitanen
parent 5abe9e57c6
commit c6087230a8
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/dep_quant.c
View file

@ -1257,7 +1257,7 @@ int uvg_dep_quant(
uint32_t blkpos_next = scan[scanIdx ? scanIdx - 1 : 0]; uint32_t blkpos_next = scan[scanIdx ? scanIdx - 1 : 0];
uint32_t pos_y_next = blkpos_next >> log2_tr_width; uint32_t pos_y_next = blkpos_next >> log2_tr_width;
uint32_t pos_x_next = blkpos_next - (pos_y << log2_tr_width); uint32_t pos_x_next = blkpos_next - (pos_y_next << log2_tr_width);
uint32_t cg_blockpos_next = scanIdx ? cg_scan[(scanIdx -1) >> 4] : 0; uint32_t cg_blockpos_next = scanIdx ? cg_scan[(scanIdx -1) >> 4] : 0;
uint32_t cg_pos_y_next = cg_blockpos_next / height_in_sbb; uint32_t cg_pos_y_next = cg_blockpos_next / height_in_sbb;
uint32_t cg_pos_x_next = cg_blockpos_next - (cg_pos_y_next * height_in_sbb); uint32_t cg_pos_x_next = cg_blockpos_next - (cg_pos_y_next * height_in_sbb);
@ -1269,12 +1269,13 @@ int uvg_dep_quant(
uint32_t nextSbbRight = (cg_pos_x_next < width_in_sbb - 1 ? cg_blockpos_next + 1 : 0); uint32_t nextSbbRight = (cg_pos_x_next < width_in_sbb - 1 ? cg_blockpos_next + 1 : 0);
uint32_t nextSbbBelow = (cg_pos_y_next < height_in_sbb - 1 ? cg_blockpos_next + width_in_sbb : 0); uint32_t nextSbbBelow = (cg_pos_y_next < height_in_sbb - 1 ? cg_blockpos_next + width_in_sbb : 0);
context_store* ctxs = &dep_quant_context;
if (enableScalingLists) { if (enableScalingLists) {
init_quant_block(state, &dep_quant_context.m_quant, cur_tu, log2_tr_width, log2_tr_height, compID, needs_block_size_trafo_scale, q_coeff[blkpos]); init_quant_block(state, &dep_quant_context.m_quant, cur_tu, log2_tr_width, log2_tr_height, compID, needs_block_size_trafo_scale, q_coeff[blkpos]);
xDecideAndUpdate( xDecideAndUpdate(
&rate_estimator, &rate_estimator,
&dep_quant_context, ctxs,
abs(srcCoeff[blkpos]), abs(srcCoeff[blkpos]),
scanIdx, scanIdx,
cg_pos, cg_pos,
@ -1296,7 +1297,7 @@ int uvg_dep_quant(
else { else {
xDecideAndUpdate( xDecideAndUpdate(
&rate_estimator, &rate_estimator,
&dep_quant_context, ctxs,
abs(srcCoeff[blkpos]), abs(srcCoeff[blkpos]),
scanIdx, scanIdx,
cg_pos, cg_pos,
@ -1314,10 +1315,6 @@ int uvg_dep_quant(
effectWidth, effectWidth,
effectHeight); //tu.cu->slice->getReverseLastSigCoeffFlag()); effectHeight); //tu.cu->slice->getReverseLastSigCoeffFlag());
} }
Decision* d = dep_quant_context.m_trellis[scanIdx];
Decision temp[8];
memcpy(temp, d, sizeof(Decision) * 8);
d++;
} }
//===== find best path ===== //===== find best path =====

2
src/strategies/generic/quant-generic.c
View file

@ -519,7 +519,7 @@ int uvg_quantize_residual_generic(encoder_state_t *const state,
height, height,
coeff, coeff,
coeff_out, coeff_out,
COLOR_U, color,
tree_type, tree_type,
&abs_sum, &abs_sum,
state->encoder_control->cfg.scaling_list); state->encoder_control->cfg.scaling_list);