From 4f7da8628591be317fcb98fb62796500786d3b44 Mon Sep 17 00:00:00 2001 From: Marko Viitanen Date: Fri, 17 Aug 2018 09:38:11 +0300 Subject: [PATCH] Commented out sign hiding code, which is not used in VVC --- src/rdo.c | 4 ++-- src/strategies/avx2/quant-avx2.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/rdo.c b/src/rdo.c index fbf1ecb2..da567310 100644 --- a/src/rdo.c +++ b/src/rdo.c @@ -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; } } - + /* if (encoder->cfg.signhide_enable) { sh_rates.quant_delta[blkpos] = (level_double - level * (1 << q_bits)) >> (q_bits - 8); 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 sh_rates.inc[blkpos] = CTX_ENTROPY_BITS(&base_one_ctx[one_ctx], 0); } - } + }*/ dest_coeff[blkpos] = (coeff_t)level; base_cost += cost_coeff[scanpos]; diff --git a/src/strategies/avx2/quant-avx2.c b/src/strategies/avx2/quant-avx2.c index 651fbeee..51135abb 100644 --- a/src/strategies/avx2/quant-avx2.c +++ b/src/strategies/avx2/quant-avx2.c @@ -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(0, 1, 0, 1))); ac_sum += _mm_cvtsi128_si32(temp); - + /* + // Signhiding disabled in VVC if (!encoder->cfg.signhide_enable || ac_sum < 2) return; 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 LOG2_SCAN_SET_SIZE } + */ } static INLINE __m128i get_residual_4x1_avx2(const kvz_pixel *a_in, const kvz_pixel *b_in){