Commit f4e468fa authored Sep 19, 2023 by advasila

797 leave one switch

parent c10c063d

lib_com/ivas_cnst.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -1236,9 +1236,6 @@ enum
		#define MASA_MAXIMUM_TWO_DIR_BANDS 24
		#define NBITS_HR_COH 4

		#ifdef NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ
		#define MINIMUM_MASA_BITS_OMASA_INACTIVE 32
		#endif
		typedef enum
		{
		MASA_STEREO_NOT_DEFINED,

lib_com/options.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -200,8 +200,7 @@
		#define NONBE_FIX_738_SBA_BR_SW_ASAN /* FhG: issue 738: fixes bug when switching to an MCT bitrate and previous frame was ACELP */
		#define NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING /* VA: Issue 735: Resolve "HP20 filtering bug in SBA/OSBA bitrate switching" */
		#define NONBE_FIX_588_UPDATE_FASTCONV_SD /* FhG: issue 588: update FastConv SD HRTFs in CLDFB domain with new conversion method */
		/#define NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ/ /* Nokia: issue 797: fix crash when the separated object is inactive and the MASA metadata is using very few bits */
		#define NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ_ALT /* VA: issue 797: alternative fix of crash when the separated object is inactive and the MASA metadata is using very few bits */
		#define NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ /* VA: issue 797: fix of crash when the separated object is inactive and the MASA metadata is using very few bits */

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

lib_dec/acelp_core_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -803,7 +803,7 @@ ivas_error acelp_core_dec(
		{
		decod_tran( st, st->L_frame, tc_subfr, Aq, Es_pred, pitch_buf, voice_factors, exc, exc2, bwe_exc, unbits, sharpFlag, gain_buf );
		}
		#ifdef NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ_ALT
		#ifdef NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ
		else if ( st->coder_type == AUDIO \|\| ( st->coder_type == INACTIVE && ( st->core_brate + st->extl_brate <= MAX_GSC_INACTIVE_BRATE ) ) )
		#else
		else if ( st->coder_type == AUDIO \|\| ( st->coder_type == INACTIVE && st->total_brate <= MAX_GSC_INACTIVE_BRATE ) )

lib_dec/ivas_masa_dec.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -363,16 +363,6 @@ ivas_error ivas_masa_decode(
		else
		{
		*nb_bits_read += ivas_qmetadata_dec_decode( hQMetaData, st->bit_stream, &st->next_bit_pos, 0 );
		#ifdef NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ
		if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ && st_ivas->hIsmMetaData[0]->ism_imp == ISM_INACTIVE_IMP )
		{
		while ( *nb_bits_read < MINIMUM_MASA_BITS_OMASA_INACTIVE )
		{
		byteBuffer = st->bit_stream[( st->next_bit_pos )--];
		( *nb_bits_read )++;
		}
		}
		#endif
		}

		if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->ism_mode != ISM_MASA_MODE_MASA_ONE_OBJ )

lib_enc/acelp_core_enc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -563,7 +563,7 @@ ivas_error acelp_core_enc(
		encod_gen_voic( st, inp, Aw, Aq, Es_pred, res, syn, exc, exc2, pitch_buf, voice_factors, bwe_exc, unbits, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf );
		}
		}
		#ifdef NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ_ALT
		#ifdef NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ
		else if ( st->coder_type == AUDIO \|\| ( st->coder_type == INACTIVE && ( st->core_brate + st->extl_brate <= MAX_GSC_INACTIVE_BRATE ) ) )
		#else
		else if ( st->coder_type == AUDIO \|\| ( st->coder_type == INACTIVE && st->total_brate <= MAX_GSC_INACTIVE_BRATE ) )