Commit 8c93d871 authored Jun 15, 2023 by vaclav

Merge branch '532-md-coding-in-ism-inactive-frames-fix' into 'main'

[non-BE] Resolve "MD coding in ISM inactive frames"

See merge request !747

parents 471ba30b 856f1872

lib_com/options.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@
		#endif

		#define FIX_383_CLEAN_UP /* Dlb : Clean up of unused functions */
		// #define FIX_532_ISM_MD_INACTIVE /* VA: issue 532: improve MD coding in ISM inactive frames */
		#define FIX_532_ISM_MD_INACTIVE /* VA: issue 532: improve MD coding in ISM inactive frames */
		#define FIX_547_NAN_IGF_DEC /* FhG: issue 547: fix possible nan in IGF decoder */

		#define FIX_529_BWD_ISSUE /* VA: issue 529: fix Bandwidth Detector not working reliably for Music and Generic Audio */

lib_dec/ivas_ism_metadata_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -542,7 +542,7 @@ ivas_error ivas_ism_metadata_dec(
		if ( ism_mode == ISM_MODE_DISC )
		{
		#ifdef FIX_532_ISM_MD_INACTIVE
		if ( ism_imp[ch] == ISM_NO_META )
		if ( ism_imp[ch] == ISM_NO_META && total_brate[ch] < ACELP_8k00 )
		#else
		if ( hIsmMeta[ch]->ism_metadata_flag == 0 && localVAD[ch] == 0 && ism_metadata_flag_global )
		#endif

lib_enc/ivas_ism_metadata_enc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -636,7 +636,7 @@ ivas_error ivas_ism_metadata_enc(
		if ( ism_mode == ISM_MODE_DISC )
		{
		#ifdef FIX_532_ISM_MD_INACTIVE
		if ( ism_imp[ch] == ISM_NO_META )
		if ( ism_imp[ch] == ISM_NO_META && total_brate[ch] < ACELP_8k00 )
		#else
		if ( hIsmMeta[ch]->ism_metadata_flag == 0 && vad_flag[ch] == 0 && ism_metadata_flag_global )
		#endif