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

[dep_quant] Remove dead code and fix small issue

Browse source
This commit is contained in:
Joose Sainio 2023-09-26 09:42:30 +03:00
parent 284724398e
commit 64d222d17c
2 changed files with 5 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/dep_quant.c
View file

@ -686,7 +686,7 @@ void uvg_dep_quant_update_state_eos(
} }
} }
uint8_t* temp = &state->m_absLevels[ctxs->m_curr_state_offset / 4][(scan_pos & 15) * 4 + decision_id]; uint8_t* temp = &state->m_absLevels[ctxs->m_curr_state_offset / 4][(scan_pos & 15) * 4 + decision_id];
*temp = (uint8_t)MIN(51, decisions->absLevel[decision_id]); *temp = (uint8_t)MIN(255, decisions->absLevel[decision_id]);
update_common_context(ctxs, state->m_commonCtx, scan_pos, cg_pos, width_in_sbb, height_in_sbb, next_sbb_right, update_common_context(ctxs, state->m_commonCtx, scan_pos, cg_pos, width_in_sbb, height_in_sbb, next_sbb_right,
next_sbb_below, prvState, ctxs->m_curr_state_offset + decision_id); next_sbb_below, prvState, ctxs->m_curr_state_offset + decision_id);
@ -1037,14 +1037,6 @@ int uvg_dep_quant(
height, height,
compID != 0); //tu.cu->slice->getReverseLastSigCoeffFlag()); compID != 0); //tu.cu->slice->getReverseLastSigCoeffFlag());
} }
if(0){
printf("%d\n", scanIdx);
for (int i = 0; i < 4; i++) {
printf("%lld %hu %d\n", ctxs->m_trellis[scanIdx].rdCost[i], ctxs->m_trellis[scanIdx].absLevel[i], ctxs->m_trellis[scanIdx].prevId[i]);
}
printf("\n");
}
} }
//===== find best path ===== //===== find best path =====
@ -1061,11 +1053,6 @@ int uvg_dep_quant(
//===== backward scanning ===== //===== backward scanning =====
int scanIdx = 0; int scanIdx = 0;
context_store* ctxs = &dep_quant_context; context_store* ctxs = &dep_quant_context;
// printf("%d\n", scanIdx);
//for (int i = 0; i < 4; i++) {
// printf("%lld %hu %d\n", ctxs->m_trellis[scanIdx].rdCost[i], ctxs->m_trellis[scanIdx].absLevel[i], ctxs->m_trellis[scanIdx].prevId[i]);
//}
//printf("\n");
for (; prev_id >= 0; scanIdx++) { for (; prev_id >= 0; scanIdx++) {
Decision temp = dep_quant_context.m_trellis[scanIdx]; Decision temp = dep_quant_context.m_trellis[scanIdx];
int32_t blkpos = scan[scanIdx]; int32_t blkpos = scan[scanIdx];

22
src/strategies/avx2/depquant-avx2.c
View file

@ -480,10 +480,6 @@ static void xDecide(
PQData pqData; PQData pqData;
preQuantCoeff(qp, absCoeff, &pqData, quanCoeff); preQuantCoeff(qp, absCoeff, &pqData, quanCoeff);
check_rd_costs_avx2(all_states, spt, &pqData, decisions, prev_offset); check_rd_costs_avx2(all_states, spt, &pqData, decisions, prev_offset);
//uvg_dep_quant_check_rd_costs(all_states, spt, &pqData, decisions, 0, 2, prev_offset + 0);
//uvg_dep_quant_check_rd_costs(all_states, spt, &pqData, decisions, 2, 0, prev_offset + 1);
//uvg_dep_quant_check_rd_costs(all_states, spt, &pqData, decisions, 1, 3, prev_offset + 2);
//uvg_dep_quant_check_rd_costs(all_states, spt, &pqData, decisions, 3, 1, prev_offset + 3);
if (spt == SCAN_EOCSBB) { if (spt == SCAN_EOCSBB) {
checkRdCostSkipSbb(all_states, decisions, 0, skip_offset); checkRdCostSkipSbb(all_states, decisions, 0, skip_offset);
checkRdCostSkipSbb(all_states, decisions, 1, skip_offset); checkRdCostSkipSbb(all_states, decisions, 1, skip_offset);
@ -594,7 +590,7 @@ static void update_state_eos_avx2(context_store* ctxs, const uint32_t scan_pos,
prev_state = _mm_loadu_si128((__m128i const*)prev_state_s); prev_state = _mm_loadu_si128((__m128i const*)prev_state_s);
} }
uint32_t level_offset = scan_pos & 15; uint32_t level_offset = scan_pos & 15;
__m128i max_abs = _mm_min_epi32(abs_level, _mm_set1_epi32(51)); __m128i max_abs = _mm_min_epi32(abs_level, _mm_set1_epi32(255));
max_abs = _mm_shuffle_epi8(max_abs, control); max_abs = _mm_shuffle_epi8(max_abs, control);
uint32_t packed_max_abs = _mm_extract_epi32(max_abs, 0); uint32_t packed_max_abs = _mm_extract_epi32(max_abs, 0);
memcpy(&state->m_absLevels[state_offset >> 2][level_offset * 4], &packed_max_abs, 4); memcpy(&state->m_absLevels[state_offset >> 2][level_offset * 4], &packed_max_abs, 4);
@ -1073,7 +1069,6 @@ static INLINE void update_states_avx2(
state->m_numSigSbb[state_id] = 1; state->m_numSigSbb[state_id] = 1;
state->m_refSbbCtxId[state_id] = -1; state->m_refSbbCtxId[state_id] = -1;
int ctxBinSampleRatio = 28; int ctxBinSampleRatio = 28;
//(scanInfo.chType == CHANNEL_TYPE_LUMA) ? MAX_TU_LEVEL_CTX_CODED_BIN_CONSTRAINT_LUMA : MAX_TU_LEVEL_CTX_CODED_BIN_CONSTRAINT_CHROMA;
state->m_remRegBins[state_id] = (state->effWidth * state->effHeight * ctxBinSampleRatio) / 16 - (decisions->absLevel[decision_id] < 2 ? (unsigned)decisions->absLevel[decision_id] : 3); state->m_remRegBins[state_id] = (state->effWidth * state->effHeight * ctxBinSampleRatio) / 16 - (decisions->absLevel[decision_id] < 2 ? (unsigned)decisions->absLevel[decision_id] : 3);
} }
rem_reg_all_gte_4 &= state->m_remRegBins[state_id] >= 4; rem_reg_all_gte_4 &= state->m_remRegBins[state_id] >= 4;
@ -1124,7 +1119,7 @@ static INLINE void update_states_avx2(
} }
} }
uint32_t level_offset = scan_pos & 15; uint32_t level_offset = scan_pos & 15;
__m128i max_abs = _mm_min_epi32(abs_level, _mm_set1_epi32(51)); __m128i max_abs = _mm_min_epi32(abs_level, _mm_set1_epi32(255));
max_abs = _mm_shuffle_epi8(max_abs, control); max_abs = _mm_shuffle_epi8(max_abs, control);
uint32_t packed_max_abs = _mm_extract_epi32(max_abs, 0); uint32_t packed_max_abs = _mm_extract_epi32(max_abs, 0);
memcpy(&state->m_absLevels[state_offset >> 2][level_offset * 4], &packed_max_abs,4); memcpy(&state->m_absLevels[state_offset >> 2][level_offset * 4], &packed_max_abs,4);
@ -1230,7 +1225,7 @@ static INLINE void update_states_avx2(
} }
__m128i sum_abs = _mm_srli_epi32(tinit, 8); __m128i sum_abs = _mm_srli_epi32(tinit, 8);
sum_abs = _mm_min_epi32(sum_abs, _mm_set1_epi32(51)); sum_abs = _mm_min_epi32(sum_abs, _mm_set1_epi32(255));
switch (numIPos) { switch (numIPos) {
case 5: case 5:
{ {
@ -1283,7 +1278,7 @@ static INLINE void update_states_avx2(
__m128i tinit = _mm_loadu_si128((__m128i*)(&state->m_ctxInit[state_offset >> 2][tinit_offset * 4])); __m128i tinit = _mm_loadu_si128((__m128i*)(&state->m_ctxInit[state_offset >> 2][tinit_offset * 4]));
tinit = _mm_cvtepi16_epi32(tinit); tinit = _mm_cvtepi16_epi32(tinit);
__m128i sum_abs = _mm_srli_epi32(tinit, 8); __m128i sum_abs = _mm_srli_epi32(tinit, 8);
sum_abs = _mm_min_epi32(sum_abs, _mm_set1_epi32(51)); sum_abs = _mm_min_epi32(sum_abs, _mm_set1_epi32(255));
switch (numIPos) { switch (numIPos) {
case 5: case 5:
{ {
@ -1465,15 +1460,6 @@ void uvg_dep_quant_decide_and_update_avx2(
} else if (!zeroOut) { } else if (!zeroOut) {
update_states_avx2(ctxs, next_nb_info_ssb.num, scan_pos, decisions, scan_info->sig_ctx_offset[is_chroma], scan_info->gtx_ctx_offset[is_chroma], next_nb_info_ssb, 4, false); update_states_avx2(ctxs, next_nb_info_ssb.num, scan_pos, decisions, scan_info->sig_ctx_offset[is_chroma], scan_info->gtx_ctx_offset[is_chroma], next_nb_info_ssb, 4, false);
} }
//for (int i = 0; i<4; i++) {
// for (int k = 0; k < 16; ++k) {
// printf(
// "%3d ",
// ctxs->m_allStates.m_absLevels[ctxs->m_curr_state_offset / 4][k * 4 + i]);
// }
// printf("\n");
//}
//printf("\n");
if (spt == SCAN_SOCSBB) { if (spt == SCAN_SOCSBB) {
SWAP(ctxs->m_skip_state_offset, ctxs->m_prev_state_offset, int); SWAP(ctxs->m_skip_state_offset, ctxs->m_prev_state_offset, int);