Commit 94768b61 authored by multrus's avatar multrus
Browse files

harmonize conditions

parent 17702597

lib_enc/transient_detection_fx.c

+6 −14
Original line number Diff line number Diff line
@@ -799,11 +799,8 @@ void SetTCXModeInfo_ivas_fx( 
#ifdef HARMONIZE_2537_SetTCXModeInfo

    test();

    test();

    test();

    IF( ( GT_16( st->element_mode, EVS_MONO ) ) && ( EQ_16( st->codec_mode, MODE2 ) || ( GT_16( st->element_mode, EVS_MONO ) && NE_16( st->core, HQ_CORE ) ) ) || ( ( EQ_16( st->element_mode, EVS_MONO ) ) && ( EQ_16( st->codec_mode, MODE2 ) ) ) )

#else

    IF( EQ_16( st->codec_mode, MODE2 ) || ( GT_16( st->element_mode, EVS_MONO ) && NE_16( st->core, HQ_CORE ) ) )

#endif

    IF( EQ_16( st->codec_mode, MODE2 ) || ( GT_16( st->element_mode, EVS_MONO ) && NE_16( st->core, HQ_CORE ) ) )

    {

        assert( hTranDet != NULL );
@@ -975,17 +972,12 @@ void SetTCXModeInfo_ivas_fx( 
            /* NO_TCX */

            *tcxModeOverlap = TRANSITION_OVERLAP;

            move16();

#ifdef HARMONIZE_2537_SetTCXModeInfo

            IF( GT_16( st->element_mode, EVS_MONO ) )

#endif

            {

	    if ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) )

	    {

	        hTcxEnc->tfm_mem_fx = 1610612736; /* 0.75f in Q31 */

	        move16();

	    }

        }

        }



        /* for the ACELP -> TCX transition frames use full right window overlap */

        test();