Loading lib_enc/cod_tcx_fx.c +34 −35 Original line number Diff line number Diff line Loading @@ -1640,7 +1640,6 @@ void QuantizeSpectrum_fx( #endif // !FIX_BASOP_2546_HARMONIZE_TCX_SCALAR IF( ctxHmBits > 0 ) /* Mapping tool is enabled */ { /* Truncate spectrum */ Loading lib_enc/tcx_utils_enc_fx.c +82 −74 Original line number Diff line number Diff line Loading @@ -1819,7 +1819,8 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx( } move16(); #else IF(NE_16(element_mode, EVS_MONO)) { IF( NE_16( element_mode, EVS_MONO ) ) { SWITCH( L_frame ) { case 80: Loading Loading @@ -1943,7 +1944,8 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx( saturated = 0; move16(); #else IF(NE_16(element_mode, EVS_MONO)) { IF( NE_16( element_mode, EVS_MONO ) ) { saturated = 0; move16(); } Loading Loading @@ -2022,7 +2024,8 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx( move16(); } #else IF(NE_16(element_mode, EVS_MONO )) { IF( NE_16( element_mode, EVS_MONO ) ) { Word16 shift_tmp = s_max( sqGain_e, 1 ); move16(); test(); Loading @@ -2044,7 +2047,8 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx( BREAK; /* we cannot go any lower anyway*/ } #else ELSE IF(NE_16(element_mode, EVS_MONO)){ ELSE IF( NE_16( element_mode, EVS_MONO ) ) { BREAK; /* we cannot go any lower anyway*/ } #endif // FIX_BASOP_2546_HARMONIZE_TCX_SCALAR Loading Loading @@ -2108,10 +2112,12 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx( #ifndef FIX_BASOP_2546_HARMONIZE_TCX_SCALAR tcx_scalar_quantization_ivas_fx( x, x_e, xq, L_frame, sqGain, sqGain_e, offset, memQuantZeros_fx, tcxonly ); #else IF(EQ_16(element_mode, EVS_MONO)) { IF( EQ_16( element_mode, EVS_MONO ) ) { tcx_scalar_quantization_fx( x, x_e, xq, L_frame, sqGain, sqGain_e, offset, memQuantZeros_fx, tcxonly ); } ELSE{ ELSE { tcx_scalar_quantization_ivas_fx( x, x_e, xq, L_frame, sqGain, sqGain_e, offset, memQuantZeros_fx, tcxonly ); } #endif // !FIX_BASOP_2546_HARMONIZE_TCX_SCALAR Loading Loading @@ -2173,10 +2179,12 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx( /* Quantize spectrum */ tcx_scalar_quantization_ivas_fx( x, x_e, xq, L_frame, *gain, *gain_e, offset, memQuantZeros_fx, tcxonly ); #else IF(EQ_16(element_mode, EVS_MONO)) { IF( EQ_16( element_mode, EVS_MONO ) ) { tcx_scalar_quantization_fx( x, x_e, xq, L_frame, *gain, *gain_e, offset, memQuantZeros_fx, tcxonly ); } ELSE{ ELSE { tcx_scalar_quantization_ivas_fx( x, x_e, xq, L_frame, *gain, *gain_e, offset, memQuantZeros_fx, tcxonly ); } #endif // !FIX_BASOP_2546_HARMONIZE_TCX_SCALAR Loading Loading
lib_enc/cod_tcx_fx.c +34 −35 Original line number Diff line number Diff line Loading @@ -1640,7 +1640,6 @@ void QuantizeSpectrum_fx( #endif // !FIX_BASOP_2546_HARMONIZE_TCX_SCALAR IF( ctxHmBits > 0 ) /* Mapping tool is enabled */ { /* Truncate spectrum */ Loading
lib_enc/tcx_utils_enc_fx.c +82 −74 Original line number Diff line number Diff line Loading @@ -1819,7 +1819,8 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx( } move16(); #else IF(NE_16(element_mode, EVS_MONO)) { IF( NE_16( element_mode, EVS_MONO ) ) { SWITCH( L_frame ) { case 80: Loading Loading @@ -1943,7 +1944,8 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx( saturated = 0; move16(); #else IF(NE_16(element_mode, EVS_MONO)) { IF( NE_16( element_mode, EVS_MONO ) ) { saturated = 0; move16(); } Loading Loading @@ -2022,7 +2024,8 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx( move16(); } #else IF(NE_16(element_mode, EVS_MONO )) { IF( NE_16( element_mode, EVS_MONO ) ) { Word16 shift_tmp = s_max( sqGain_e, 1 ); move16(); test(); Loading @@ -2044,7 +2047,8 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx( BREAK; /* we cannot go any lower anyway*/ } #else ELSE IF(NE_16(element_mode, EVS_MONO)){ ELSE IF( NE_16( element_mode, EVS_MONO ) ) { BREAK; /* we cannot go any lower anyway*/ } #endif // FIX_BASOP_2546_HARMONIZE_TCX_SCALAR Loading Loading @@ -2108,10 +2112,12 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx( #ifndef FIX_BASOP_2546_HARMONIZE_TCX_SCALAR tcx_scalar_quantization_ivas_fx( x, x_e, xq, L_frame, sqGain, sqGain_e, offset, memQuantZeros_fx, tcxonly ); #else IF(EQ_16(element_mode, EVS_MONO)) { IF( EQ_16( element_mode, EVS_MONO ) ) { tcx_scalar_quantization_fx( x, x_e, xq, L_frame, sqGain, sqGain_e, offset, memQuantZeros_fx, tcxonly ); } ELSE{ ELSE { tcx_scalar_quantization_ivas_fx( x, x_e, xq, L_frame, sqGain, sqGain_e, offset, memQuantZeros_fx, tcxonly ); } #endif // !FIX_BASOP_2546_HARMONIZE_TCX_SCALAR Loading Loading @@ -2173,10 +2179,12 @@ Word16 tcx_scalar_quantization_rateloop_ivas_fx( /* Quantize spectrum */ tcx_scalar_quantization_ivas_fx( x, x_e, xq, L_frame, *gain, *gain_e, offset, memQuantZeros_fx, tcxonly ); #else IF(EQ_16(element_mode, EVS_MONO)) { IF( EQ_16( element_mode, EVS_MONO ) ) { tcx_scalar_quantization_fx( x, x_e, xq, L_frame, *gain, *gain_e, offset, memQuantZeros_fx, tcxonly ); } ELSE{ ELSE { tcx_scalar_quantization_ivas_fx( x, x_e, xq, L_frame, *gain, *gain_e, offset, memQuantZeros_fx, tcxonly ); } #endif // !FIX_BASOP_2546_HARMONIZE_TCX_SCALAR Loading