Fix non-BE issues by removing cng_paramISM_flag from ApplyFdCng(). (3a833e96) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/fd_cng_dec.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -414,7 +414,6 @@ void ApplyFdCng(
		hFdCngCom->sid_frame_counter = 0;
		/* set noise estimation inactive during concealment, as no update with noise generated by concealment should be performed. */
		/* set noise estimation inactive when we have bit errors, as no update with noise generated by corrupt frame (biterror) should be performed. */
		#ifndef DISC_CNG
		if ( concealWholeFrame == 0 &&
		( timeDomainInput == NULL \|\|
		( timeDomainInput<FLT_MAX && timeDomainInput>( -FLT_MAX ) &&
		@@ -424,17 +423,6 @@ void ApplyFdCng(
		!( st->cng_type == LP_CNG && hFdCngDec->flag_dtx_mode ) && ( is_music == 0 ) ) \|\|
		( st->element_mode == IVAS_CPE_TD ) ) &&
		( !st->BER_detect ) )
		#else /* ensure that the noise estimation is always performed outside of a CNG part (ISM only) */
		if ( concealWholeFrame == 0 &&
		( timeDomainInput == NULL \|\|
		( timeDomainInput<FLT_MAX && timeDomainInput>( -FLT_MAX ) &&
		*( timeDomainInput + hFdCngCom->frameSize - 1 ) < FLT_MAX &&
		*( timeDomainInput + hFdCngCom->frameSize - 1 ) > ( -FLT_MAX ) ) ) &&
		( ( ( ( st->element_mode != IVAS_CPE_TD && st->element_mode != IVAS_CPE_DFT && hFdCngDec->flag_dtx_mode ) \|\| !st->VAD \|\| !st->cng_paramISM_flag ) &&
		!( st->cng_type == LP_CNG && hFdCngDec->flag_dtx_mode ) && ( is_music == 0 ) ) \|\|
		( st->element_mode == IVAS_CPE_TD ) ) &&
		( !st->BER_detect ) )
		#endif
		{
		/* Perform noise estimation at the decoder */
		perform_noise_estimation_dec( timeDomainInput, powerSpectrum, hFdCngDec, st->element_mode, st->bwidth, L_frame, last_L_frame, st->last_core_brate, st->VAD );