Loading lib_dec/tonalMDCTconcealment_fx.c +96 −88 Original line number Diff line number Diff line Loading @@ -1065,7 +1065,8 @@ void TonalMDCTConceal_Detect_ivas_fx( #ifndef FIX_2480_HARM_TONALMDCT set32_fx( secondLastMDST, 0, L_FRAME_MAX ); #else IF(NE_16(element_mode, EVS_MONO)) { IF( NE_16( element_mode, EVS_MONO ) ) { set32_fx( secondLastMDST, 0, L_FRAME_MAX ); } #endif // !FIX_2480_HARM_TONALMDCT Loading @@ -1088,13 +1089,15 @@ void TonalMDCTConceal_Detect_ivas_fx( secondLastMDCT_exp = sub( 16, hTonalMDCTConc->q_lastPcmOut ); /*time signal Q-1 - hTonalMDCTConc->q_lastPcmOut*/ move16(); #else IF(EQ_16(element_mode, EVS_MONO)) { IF( EQ_16( element_mode, EVS_MONO ) ) { secondLastMDST_exp = 16; /*time signal Q-1*/ move16(); secondLastMDCT_exp = 16; /*time signal Q-1*/ move16(); } ELSE{ 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*/ Loading Loading @@ -1137,7 +1140,8 @@ void TonalMDCTConceal_Detect_ivas_fx( s = sub( getScaleFactor32( secondLastMDST, nSamples ), 1 ); #else s = getScaleFactor32( secondLastMDST, nSamples ); IF(NE_16(element_mode, EVS_MONO)) { IF( NE_16( element_mode, EVS_MONO ) ) { s = sub( s, 1 ); } #endif // !FIX_2480_HARM_TONALMDCT Loading @@ -1153,7 +1157,8 @@ void TonalMDCTConceal_Detect_ivas_fx( s = sub( getScaleFactor32( secondLastMDCT, nSamples ), 1 ); #else s = getScaleFactor32( secondLastMDCT, nSamples ); IF(NE_16(element_mode, EVS_MONO)) { IF( NE_16( element_mode, EVS_MONO ) ) { s = sub( s, 1 ); } #endif // !FIX_2480_HARM_TONALMDCT Loading @@ -1168,10 +1173,12 @@ void TonalMDCTConceal_Detect_ivas_fx( #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)) { IF( EQ_16( element_mode, EVS_MONO ) ) { CalcPowerSpecAndDetectTonalComponents_fx( hTonalMDCTConc, secondLastMDST, secondLastMDST_exp, secondLastMDCT, secondLastMDCT_exp, pitchLag, NULL, element_mode ); } ELSE{ ELSE { CalcPowerSpecAndDetectTonalComponents_fx( hTonalMDCTConc, secondLastMDST, secondLastMDST_exp, secondLastMDCT, secondLastMDCT_exp, pitchLag, psychParamsCurrent, element_mode ); } #endif // !FIX_2480_HARM_TONALMDCT Loading @@ -1187,7 +1194,8 @@ void TonalMDCTConceal_Detect_ivas_fx( Copy_Scale_sig_16_32_DEPREC( hTonalMDCTConc->secondLastPowerSpectrum, powerSpectrum, nSamples, Q15 ); temp_power_spectrum_q = add( Q15, sub( 15, hTonalMDCTConc->secondLastPowerSpectrum_exp ) ); #else IF(NE_16(element_mode, EVS_MONO)) { IF( NE_16( element_mode, EVS_MONO ) ) { Copy_Scale_sig_16_32_DEPREC( hTonalMDCTConc->secondLastPowerSpectrum, powerSpectrum, nSamples, Q15 ); temp_power_spectrum_q = add( Q15, sub( 15, hTonalMDCTConc->secondLastPowerSpectrum_exp ) ); } Loading Loading @@ -1249,7 +1257,8 @@ 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)) { IF( EQ_16( element_mode, EVS_MONO ) ) { RefineTonalComponents_fx( (Word16 *) hTonalMDCTConc->pTCI->indexOfTonalPeak, (Word16 *) hTonalMDCTConc->pTCI->lowerIndex, (Word16 *) hTonalMDCTConc->pTCI->upperIndex, Loading @@ -1269,7 +1278,8 @@ void TonalMDCTConceal_Detect_ivas_fx( hTonalMDCTConc->nSamplesCore, extract_l( Mpy_32_16_1( L_mult0( hTonalMDCTConc->nSamples, hTonalMDCTConc->nSamples ), 82 ) ), element_mode, NULL ); } ELSE{ ELSE { RefineTonalComponents_fx( (Word16 *) hTonalMDCTConc->pTCI->indexOfTonalPeak, (Word16 *) hTonalMDCTConc->pTCI->lowerIndex, (Word16 *) hTonalMDCTConc->pTCI->upperIndex, Loading @@ -1291,8 +1301,6 @@ void TonalMDCTConceal_Detect_ivas_fx( } #endif // !FIX_2480_HARM_TONALMDCT } } } Loading lib_dec/er_util_fx.c +2 −2 File changed.Contains only whitespace changes. Show changes Loading
lib_dec/tonalMDCTconcealment_fx.c +96 −88 Original line number Diff line number Diff line Loading @@ -1065,7 +1065,8 @@ void TonalMDCTConceal_Detect_ivas_fx( #ifndef FIX_2480_HARM_TONALMDCT set32_fx( secondLastMDST, 0, L_FRAME_MAX ); #else IF(NE_16(element_mode, EVS_MONO)) { IF( NE_16( element_mode, EVS_MONO ) ) { set32_fx( secondLastMDST, 0, L_FRAME_MAX ); } #endif // !FIX_2480_HARM_TONALMDCT Loading @@ -1088,13 +1089,15 @@ void TonalMDCTConceal_Detect_ivas_fx( secondLastMDCT_exp = sub( 16, hTonalMDCTConc->q_lastPcmOut ); /*time signal Q-1 - hTonalMDCTConc->q_lastPcmOut*/ move16(); #else IF(EQ_16(element_mode, EVS_MONO)) { IF( EQ_16( element_mode, EVS_MONO ) ) { secondLastMDST_exp = 16; /*time signal Q-1*/ move16(); secondLastMDCT_exp = 16; /*time signal Q-1*/ move16(); } ELSE{ 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*/ Loading Loading @@ -1137,7 +1140,8 @@ void TonalMDCTConceal_Detect_ivas_fx( s = sub( getScaleFactor32( secondLastMDST, nSamples ), 1 ); #else s = getScaleFactor32( secondLastMDST, nSamples ); IF(NE_16(element_mode, EVS_MONO)) { IF( NE_16( element_mode, EVS_MONO ) ) { s = sub( s, 1 ); } #endif // !FIX_2480_HARM_TONALMDCT Loading @@ -1153,7 +1157,8 @@ void TonalMDCTConceal_Detect_ivas_fx( s = sub( getScaleFactor32( secondLastMDCT, nSamples ), 1 ); #else s = getScaleFactor32( secondLastMDCT, nSamples ); IF(NE_16(element_mode, EVS_MONO)) { IF( NE_16( element_mode, EVS_MONO ) ) { s = sub( s, 1 ); } #endif // !FIX_2480_HARM_TONALMDCT Loading @@ -1168,10 +1173,12 @@ void TonalMDCTConceal_Detect_ivas_fx( #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)) { IF( EQ_16( element_mode, EVS_MONO ) ) { CalcPowerSpecAndDetectTonalComponents_fx( hTonalMDCTConc, secondLastMDST, secondLastMDST_exp, secondLastMDCT, secondLastMDCT_exp, pitchLag, NULL, element_mode ); } ELSE{ ELSE { CalcPowerSpecAndDetectTonalComponents_fx( hTonalMDCTConc, secondLastMDST, secondLastMDST_exp, secondLastMDCT, secondLastMDCT_exp, pitchLag, psychParamsCurrent, element_mode ); } #endif // !FIX_2480_HARM_TONALMDCT Loading @@ -1187,7 +1194,8 @@ void TonalMDCTConceal_Detect_ivas_fx( Copy_Scale_sig_16_32_DEPREC( hTonalMDCTConc->secondLastPowerSpectrum, powerSpectrum, nSamples, Q15 ); temp_power_spectrum_q = add( Q15, sub( 15, hTonalMDCTConc->secondLastPowerSpectrum_exp ) ); #else IF(NE_16(element_mode, EVS_MONO)) { IF( NE_16( element_mode, EVS_MONO ) ) { Copy_Scale_sig_16_32_DEPREC( hTonalMDCTConc->secondLastPowerSpectrum, powerSpectrum, nSamples, Q15 ); temp_power_spectrum_q = add( Q15, sub( 15, hTonalMDCTConc->secondLastPowerSpectrum_exp ) ); } Loading Loading @@ -1249,7 +1257,8 @@ 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)) { IF( EQ_16( element_mode, EVS_MONO ) ) { RefineTonalComponents_fx( (Word16 *) hTonalMDCTConc->pTCI->indexOfTonalPeak, (Word16 *) hTonalMDCTConc->pTCI->lowerIndex, (Word16 *) hTonalMDCTConc->pTCI->upperIndex, Loading @@ -1269,7 +1278,8 @@ void TonalMDCTConceal_Detect_ivas_fx( hTonalMDCTConc->nSamplesCore, extract_l( Mpy_32_16_1( L_mult0( hTonalMDCTConc->nSamples, hTonalMDCTConc->nSamples ), 82 ) ), element_mode, NULL ); } ELSE{ ELSE { RefineTonalComponents_fx( (Word16 *) hTonalMDCTConc->pTCI->indexOfTonalPeak, (Word16 *) hTonalMDCTConc->pTCI->lowerIndex, (Word16 *) hTonalMDCTConc->pTCI->upperIndex, Loading @@ -1291,8 +1301,6 @@ void TonalMDCTConceal_Detect_ivas_fx( } #endif // !FIX_2480_HARM_TONALMDCT } } } Loading