Commit be2cc54a authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2480 Removing some redundant parts based on psychParamsCurrent == NULL... 

issue: 2480 Removing some redundant parts based on psychParamsCurrent == NULL when st->element_mode == EVS_MONO
parent 39687313

lib_dec/tonalMDCTconcealment_fx.c

+3 −24
Original line number Diff line number Diff line
@@ -1071,15 +1071,8 @@ void TonalMDCTConceal_Detect_fx( 
#endif // !FIX_2480_HARM_TONALMDCT

{

    Word32 secondLastMDST[L_FRAME_MAX];



#ifndef FIX_2480_HARM_TONALMDCT

    set32_fx( secondLastMDST, 0, L_FRAME_MAX );

#else

    IF( NE_16( element_mode, EVS_MONO ) )

    {

        set32_fx( secondLastMDST, 0, L_FRAME_MAX );

    }

#endif // !FIX_2480_HARM_TONALMDCT





    Word32 secondLastMDCT[L_FRAME_MAX];

    Word16 secondLastMDCT_exp;
@@ -1102,19 +1095,16 @@ void TonalMDCTConceal_Detect_fx( 
    IF( EQ_16( element_mode, EVS_MONO ) )

    {

        secondLastMDST_exp = 16; /*time signal Q-1*/

        move16();

        secondLastMDCT_exp = 16; /*time signal Q-1*/

        move16();

    }

    ELSE

    {

        secondLastMDST_exp = sub( 16, hTonalMDCTConc->q_lastPcmOut ); /*time signal Q-1 - hTonalMDCTConc->q_lastPcmOut*/

        move16();

        secondLastMDCT_exp = sub( 16, hTonalMDCTConc->q_lastPcmOut ); /*time signal Q-1 - hTonalMDCTConc->q_lastPcmOut*/

        move16();

    }

#endif // !FIX_2480_HARM_TONALMDCT



    move16();

    move16();

    test();

    test();

    test();
@@ -1180,18 +1170,7 @@ void TonalMDCTConceal_Detect_fx( 
                }

                secondLastMDCT_exp = sub( secondLastMDCT_exp, s );

                move16();

#ifndef FIX_2480_HARM_TONALMDCT

                CalcPowerSpecAndDetectTonalComponents_fx( hTonalMDCTConc, secondLastMDST, secondLastMDST_exp, secondLastMDCT, secondLastMDCT_exp, pitchLag, psychParamsCurrent, element_mode );

#else

                IF( EQ_16( element_mode, EVS_MONO ) )

                {

                    CalcPowerSpecAndDetectTonalComponents_fx( hTonalMDCTConc, secondLastMDST, secondLastMDST_exp, secondLastMDCT, secondLastMDCT_exp, pitchLag, NULL, element_mode );

                }

                ELSE

                {

                    CalcPowerSpecAndDetectTonalComponents_fx( hTonalMDCTConc, secondLastMDST, secondLastMDST_exp, secondLastMDCT, secondLastMDCT_exp, pitchLag, psychParamsCurrent, element_mode );

                }

#endif // !FIX_2480_HARM_TONALMDCT

            }

            ELSE

            {