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

Commented out sign hiding code, which is not used in VVC

Browse source
This commit is contained in:
Marko Viitanen 2018-08-17 09:38:11 +03:00
parent c9cbdd5dc3
commit 4f7da86285
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/rdo.c
View file

@ -695,7 +695,7 @@ void kvz_rdoq(encoder_state_t * const state, coeff_t *coef, coeff_t *dest_coeff,
sh_rates.sig_coeff_inc[blkpos] = greater_than_zero - zero; sh_rates.sig_coeff_inc[blkpos] = greater_than_zero - zero;
} }
} }
/*
if (encoder->cfg.signhide_enable) { if (encoder->cfg.signhide_enable) {
sh_rates.quant_delta[blkpos] = (level_double - level * (1 << q_bits)) >> (q_bits - 8); sh_rates.quant_delta[blkpos] = (level_double - level * (1 << q_bits)) >> (q_bits - 8);
if (level > 0) { if (level > 0) {
@ -707,7 +707,7 @@ void kvz_rdoq(encoder_state_t * const state, coeff_t *coef, coeff_t *dest_coeff,
} else { // level == 0 } else { // level == 0
sh_rates.inc[blkpos] = CTX_ENTROPY_BITS(&base_one_ctx[one_ctx], 0); sh_rates.inc[blkpos] = CTX_ENTROPY_BITS(&base_one_ctx[one_ctx], 0);
} }
} }*/
dest_coeff[blkpos] = (coeff_t)level; dest_coeff[blkpos] = (coeff_t)level;
base_cost += cost_coeff[scanpos]; base_cost += cost_coeff[scanpos];

4
src/strategies/avx2/quant-avx2.c
View file

@ -103,7 +103,8 @@ void kvz_quant_flat_avx2(const encoder_state_t * const state, coeff_t *coef, coe
temp = _mm_add_epi32(temp, _mm_shuffle_epi32(temp, _MM_SHUFFLE(1, 0, 3, 2))); temp = _mm_add_epi32(temp, _mm_shuffle_epi32(temp, _MM_SHUFFLE(1, 0, 3, 2)));
temp = _mm_add_epi32(temp, _mm_shuffle_epi32(temp, _MM_SHUFFLE(0, 1, 0, 1))); temp = _mm_add_epi32(temp, _mm_shuffle_epi32(temp, _MM_SHUFFLE(0, 1, 0, 1)));
ac_sum += _mm_cvtsi128_si32(temp); ac_sum += _mm_cvtsi128_si32(temp);
/*
// Signhiding disabled in VVC
if (!encoder->cfg.signhide_enable || ac_sum < 2) return; if (!encoder->cfg.signhide_enable || ac_sum < 2) return;
int32_t delta_u[LCU_WIDTH*LCU_WIDTH >> 2]; int32_t delta_u[LCU_WIDTH*LCU_WIDTH >> 2];
@ -231,6 +232,7 @@ void kvz_quant_flat_avx2(const encoder_state_t * const state, coeff_t *coef, coe
#undef SCAN_SET_SIZE #undef SCAN_SET_SIZE
#undef LOG2_SCAN_SET_SIZE #undef LOG2_SCAN_SET_SIZE
} }
*/
} }
static INLINE __m128i get_residual_4x1_avx2(const kvz_pixel *a_in, const kvz_pixel *b_in){ static INLINE __m128i get_residual_4x1_avx2(const kvz_pixel *a_in, const kvz_pixel *b_in){