Commit 54139ab5 authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2480 Further reducing code in the function using verification from commit 2f83c802

parent 6c39c7da

lib_dec/tonalMDCTconcealment_fx.c

+18 −43
Original line number Diff line number Diff line
@@ -1259,29 +1259,6 @@ void TonalMDCTConceal_Detect_ivas_fx( 
                                          hTonalMDCTConc->nSamplesCore,

                                          extract_l( Mpy_32_16_1( L_mult0( hTonalMDCTConc->nSamples, hTonalMDCTConc->nSamples ), 82 ) ), element_mode, psychParamsCurrent ); /* floorPowerSpectrum */

#else

                IF( EQ_16( element_mode, EVS_MONO ) )

                {

                    RefineTonalComponents_fx( (Word16 *) hTonalMDCTConc->pTCI->indexOfTonalPeak,

                                              (Word16 *) hTonalMDCTConc->pTCI->lowerIndex,

                                              (Word16 *) hTonalMDCTConc->pTCI->upperIndex,

                                              hTonalMDCTConc->pTCI->phaseDiff,

                                              hTonalMDCTConc->pTCI->phase_currentFramePredicted,

                                              (Word16 *) &hTonalMDCTConc->pTCI->numIndexes,

                                              hTonalMDCTConc->lastPitchLag,

                                              pitchLag,

                                              hTonalMDCTConc->lastBlockData.spectralData,

                                              add( hTonalMDCTConc->lastBlockData.spectralData_exp, hTonalMDCTConc->lastBlockData.gain_tcx_exp ),

                                              hTonalMDCTConc->lastBlockData.scaleFactors,

                                              hTonalMDCTConc->lastBlockData.scaleFactors_exp,

                                              hTonalMDCTConc->lastBlockData.scaleFactors_max_e,

                                              powerSpectrum,

                                              -1,

                                              nSamples,

                                              hTonalMDCTConc->nSamplesCore,

                                              extract_l( Mpy_32_16_1( L_mult0( hTonalMDCTConc->nSamples, hTonalMDCTConc->nSamples ), 82 ) ), element_mode, NULL );

                }

                ELSE

                {

                    RefineTonalComponents_fx((Word16*)hTonalMDCTConc->pTCI->indexOfTonalPeak,

                        (Word16*)hTonalMDCTConc->pTCI->lowerIndex,

                        (Word16*)hTonalMDCTConc->pTCI->upperIndex,
@@ -1300,8 +1277,6 @@ void TonalMDCTConceal_Detect_ivas_fx( 
                        nSamples,

                        hTonalMDCTConc->nSamplesCore,

                        extract_l(Mpy_32_16_1(L_mult0(hTonalMDCTConc->nSamples, hTonalMDCTConc->nSamples), 82)), element_mode, psychParamsCurrent); /* floorPowerSpectrum */

                }



#endif // !FIX_2480_HARM_TONALMDCT

            }

        }