Commit d331117d authored by Fabian Bauer's avatar Fabian Bauer
Browse files

make really sure we dont use EVS in IVAS case

parent bca9f984

lib_enc/cod_tcx_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -3044,7 +3044,7 @@ void QuantizeTCXSpectrum_fx( 


            /* Quantize original spectrum */

#ifdef HARMONIZE_2543_SQ_gain

            sqGain_fx = SQ_gain_fx( spectrum_fx, *spectrum_e, ( mult( hTcxEnc->tcx_target_bits_fac, shl( sqTargetBits, 1 ) ) ), L_spec, &sqGain_e, st->element_mode );

            sqGain_fx = SQ_gain_fx( spectrum_fx, *spectrum_e, ( mult( hTcxEnc->tcx_target_bits_fac, shl( sqTargetBits, 1 ) ) ), L_spec, &sqGain_e, 1 /*signal non-EVS*/ );

#else

            sqGain_fx = SQ_gain_ivas_fx( spectrum_fx, *spectrum_e, ( mult( hTcxEnc->tcx_target_bits_fac, shl( sqTargetBits, 1 ) ) ), L_spec, &sqGain_e );

#endif
@@ -3139,7 +3139,7 @@ void QuantizeTCXSpectrum_fx( 
            ELSE

            {

#ifdef HARMONIZE_2543_SQ_gain

                sqGain_fx = SQ_gain_fx( spectrum_fx, *spectrum_e, shl( mult( hTcxEnc->tcx_target_bits_fac, sqTargetBits ), 1 ), L_spec, &sqGain_e, st->element_mode );

                sqGain_fx = SQ_gain_fx( spectrum_fx, *spectrum_e, shl( mult( hTcxEnc->tcx_target_bits_fac, sqTargetBits ), 1 ), L_spec, &sqGain_e, 1 /*signal non-EVS*/ );

#else

                sqGain_fx = SQ_gain_ivas_fx( spectrum_fx, *spectrum_e, shl( mult( hTcxEnc->tcx_target_bits_fac, sqTargetBits ), 1 ), L_spec, &sqGain_e );

#endif

lib_enc/tcx_utils_enc_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -1022,6 +1022,7 @@ Word16 SQ_gain_ivas_fx( 


        /* log */

#ifdef HARMONIZE_2543_SQ_gain

        test();

        IF( EQ_32( ener, 1 ) && GT_16( element_mode, EVS_MONO ) )

#else

        IF( EQ_32( ener, 1 ) )