Commit 81dde35b authored Sep 05, 2023 by advasila

correct switch name for 694

parent 00fc2046

lib_com/bits_alloc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -476,7 +476,7 @@ static ivas_error acelp_FCB_allocator(
		}

		/* try to increase the FCB of the first subframe in cases when the next step is lower than the current step */
		#ifdef CR_FIX_694_OMASA_ACELP
		#ifdef NONBE_FIX_694_OMASA_ACELP
		if ( fixed_cdk_index[sfr] < ACELP_FIXED_CDK_NB - 1 )
		{
		#endif
		@@ -493,7 +493,7 @@ static ivas_error acelp_FCB_allocator(
		*nBits -= step;
		}
		}
		#ifdef CR_FIX_694_OMASA_ACELP
		#ifdef NONBE_FIX_694_OMASA_ACELP
		}
		#endif
		}

lib_com/ivas_stereo_td_bit_alloc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,7 @@ void tdm_bit_alloc(
		{
		total_brate_sec = min( total_brate_sec, element_brate_wo_meta - ( 5900 + BWE_brate ) );

		#ifdef CR_FIX_694_OMASA_ACELP
		#ifdef NONBE_FIX_694_OMASA_ACELP
		if ( coder_type == INACTIVE )
		{
		total_brate_sec = max( total_brate_sec, tdm_bit_allc_tbl[0][0] ); /* sanity check to ensure the secondary channel always gets the minimal bitrate it needs */

lib_com/options.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -167,7 +167,7 @@

		#define NONBE_FIX_736_FOA_BR_SWITCH /* FhG/Dlb : Issue 736: FOA bitrate switching decoding crashes in in ivas_spar_to_dirac */
		#define NONBE_FIX_746_NONDIEGETIC_MD /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/
		#define CR_FIX_694_OMASA_ACELP /* Nokia: Issue #694: OMASA crash in ACELP with extreme item */
		#define NONBE_FIX_694_OMASA_ACELP /* Nokia: Issue #694: OMASA crash in ACELP with extreme item */

		/* ##################### End NON-BE switches ############################# */