Loading lib_dec/dec_LPD_fx.c +3 −3 Original line number Diff line number Diff line Loading @@ -635,7 +635,7 @@ void decoder_LPD_fx( /* PLC: [TCX: Tonal Concealment] */ /* Signal that this frame is not TCX */ TonalMDCTConceal_UpdateState_fx( st->hTonalMDCTConc, 0, 0, 0, 0 ); TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, 0, 0, 0, 0 ); IF( bfi == 0 ) { Loading Loading @@ -772,7 +772,7 @@ void decoder_LPD_fx( IF( !bfi ) { TonalMDCTConceal_SaveTimeSignal_fx( st->hTonalMDCTConc, synthFB, L_frameTCX ); TonalMDCTConceal_SaveTimeSignal( st->hTonalMDCTConc, synthFB, L_frameTCX ); } decoder_tcx_post_fx( st, synth, synthFB, Aq, bfi ); IF( EQ_16( st->core, TCX_20_CORE ) ) Loading lib_dec/ivas_mdct_core_dec_fx.c +4 −5 Original line number Diff line number Diff line Loading @@ -1319,7 +1319,6 @@ void ivas_mdct_core_reconstruct_fx( con_tcx_ivas_fx( st, &synthFB_fx[0], hCPE->hStereoMdct->lastCoh_fx, &sts[0]->seed_acelp, 0, &st->hFdCngDec->hFdCngCom->A_cng[0] ); #else con_tcx_ivas_fx( st, &synthFB_fx[0], hCPE->hStereoMdct->lastCoh_fx, &sts[0]->seed_acelp, 0, &st->hFdCngDec->hFdCngCom->A_cng[0], EQ_16(st->element_mode, EVS_MONO)); #endif // !HARMONIZE_2446_CON_TCX_FX } } Loading Loading @@ -1358,7 +1357,7 @@ void ivas_mdct_core_reconstruct_fx( /* Signal that this frame is not TCX */ IF( st->hTonalMDCTConc != NULL ) { TonalMDCTConceal_UpdateState_fx( st->hTonalMDCTConc, 0, 0, 0, 0 ); TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, 0, 0, 0, 0 ); } Scale_sig( st->mem_syn2_fx, M, st->Q_syn ); Scale_sig( st->mem_syn_r, M, st->Q_syn ); Loading Loading @@ -1569,7 +1568,7 @@ void ivas_mdct_core_tns_ns_fx( { IF( st->hTonalMDCTConc != NULL ) { TonalMDCTConceal_UpdateState_fx( st->hTonalMDCTConc, st->hTcxDec->L_frameTCX, 0, bfi, 0 ); TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, st->hTcxDec->L_frameTCX, 0, bfi, 0 ); } /* nothing to do for missing LFE */ Loading Loading @@ -1738,11 +1737,11 @@ void ivas_mdct_core_tns_ns_fx( { IF( st->hTcxDec->tcxltp_last_gain_unmodified > 0 ) { TonalMDCTConceal_UpdateState_fx( st->hTonalMDCTConc, L_frameTCX[ch], st->old_fpitch, bfi, (Word8) s_and( bfi, st->tonal_mdct_plc_active ) ); TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, L_frameTCX[ch], st->old_fpitch, bfi, (Word8) s_and( bfi, st->tonal_mdct_plc_active ) ); } ELSE { TonalMDCTConceal_UpdateState_fx( st->hTonalMDCTConc, L_frameTCX[ch], 0, bfi, (Word8) s_and( bfi, st->tonal_mdct_plc_active ) ); TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, L_frameTCX[ch], 0, bfi, (Word8) s_and( bfi, st->tonal_mdct_plc_active ) ); } } } Loading Loading
lib_dec/dec_LPD_fx.c +3 −3 Original line number Diff line number Diff line Loading @@ -635,7 +635,7 @@ void decoder_LPD_fx( /* PLC: [TCX: Tonal Concealment] */ /* Signal that this frame is not TCX */ TonalMDCTConceal_UpdateState_fx( st->hTonalMDCTConc, 0, 0, 0, 0 ); TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, 0, 0, 0, 0 ); IF( bfi == 0 ) { Loading Loading @@ -772,7 +772,7 @@ void decoder_LPD_fx( IF( !bfi ) { TonalMDCTConceal_SaveTimeSignal_fx( st->hTonalMDCTConc, synthFB, L_frameTCX ); TonalMDCTConceal_SaveTimeSignal( st->hTonalMDCTConc, synthFB, L_frameTCX ); } decoder_tcx_post_fx( st, synth, synthFB, Aq, bfi ); IF( EQ_16( st->core, TCX_20_CORE ) ) Loading
lib_dec/ivas_mdct_core_dec_fx.c +4 −5 Original line number Diff line number Diff line Loading @@ -1319,7 +1319,6 @@ void ivas_mdct_core_reconstruct_fx( con_tcx_ivas_fx( st, &synthFB_fx[0], hCPE->hStereoMdct->lastCoh_fx, &sts[0]->seed_acelp, 0, &st->hFdCngDec->hFdCngCom->A_cng[0] ); #else con_tcx_ivas_fx( st, &synthFB_fx[0], hCPE->hStereoMdct->lastCoh_fx, &sts[0]->seed_acelp, 0, &st->hFdCngDec->hFdCngCom->A_cng[0], EQ_16(st->element_mode, EVS_MONO)); #endif // !HARMONIZE_2446_CON_TCX_FX } } Loading Loading @@ -1358,7 +1357,7 @@ void ivas_mdct_core_reconstruct_fx( /* Signal that this frame is not TCX */ IF( st->hTonalMDCTConc != NULL ) { TonalMDCTConceal_UpdateState_fx( st->hTonalMDCTConc, 0, 0, 0, 0 ); TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, 0, 0, 0, 0 ); } Scale_sig( st->mem_syn2_fx, M, st->Q_syn ); Scale_sig( st->mem_syn_r, M, st->Q_syn ); Loading Loading @@ -1569,7 +1568,7 @@ void ivas_mdct_core_tns_ns_fx( { IF( st->hTonalMDCTConc != NULL ) { TonalMDCTConceal_UpdateState_fx( st->hTonalMDCTConc, st->hTcxDec->L_frameTCX, 0, bfi, 0 ); TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, st->hTcxDec->L_frameTCX, 0, bfi, 0 ); } /* nothing to do for missing LFE */ Loading Loading @@ -1738,11 +1737,11 @@ void ivas_mdct_core_tns_ns_fx( { IF( st->hTcxDec->tcxltp_last_gain_unmodified > 0 ) { TonalMDCTConceal_UpdateState_fx( st->hTonalMDCTConc, L_frameTCX[ch], st->old_fpitch, bfi, (Word8) s_and( bfi, st->tonal_mdct_plc_active ) ); TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, L_frameTCX[ch], st->old_fpitch, bfi, (Word8) s_and( bfi, st->tonal_mdct_plc_active ) ); } ELSE { TonalMDCTConceal_UpdateState_fx( st->hTonalMDCTConc, L_frameTCX[ch], 0, bfi, (Word8) s_and( bfi, st->tonal_mdct_plc_active ) ); TonalMDCTConceal_UpdateState( st->hTonalMDCTConc, L_frameTCX[ch], 0, bfi, (Word8) s_and( bfi, st->tonal_mdct_plc_active ) ); } } } Loading