port fixes from float MR !2534 (bc23b6ff) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+1 −1

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

		#define NONBE_MR2809
		#define FIX_2432_ISM_SPIKES_16KHZ /* VA: basop issue 2432: fix spikes in ISM decoding at 16kHz output sampling rate */

		#define FIX_1518

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -494,6 +494,10 @@ ivas_error ivas_dec_fx(
		{
		Word16 nchan_ism, sba_ch_idx;

		#ifdef FIX_1518
		int16_t sba_mono_flag = ( st_ivas->hDecoderConfig->nchan_out == 1 ) ? 1 : 0;
		#endif

		set16_fx( nb_bits_metadata, 0, MAX_SCE + 1 );
		nchan_ism = st_ivas->nchan_ism;
		move16();
		@@ -574,6 +578,12 @@ ivas_error ivas_dec_fx(

		ivas_sba_dirac_stereo_dec_fx( st_ivas, &p_output_fx[sba_ch_idx], output_frame );
		}
		#ifdef FIX_1518
		ELSE IF ( sba_mono_flag && st_ivas->ism_mode == ISM_MODE_NONE )
		{
		v_shr( p_output_fx[0], -1, p_output_fx[0], output_frame );
		}
		#endif

		/* HP filtering */
		FOR( n = 0; n < getNumChanSynthesis( st_ivas ); n++ )

+11 −3

Original line number	Diff line number	Diff line
		@@ -1502,11 +1502,19 @@ void ivas_sba_dirac_stereo_dec_fx(
		synchro_synthesis_fx( st_ivas->hDecoderConfig->ivas_total_brate, hCPE, output, output_frame, 1 /st_ivas->sba_dirac_stereo_flag/, q_dft[0] );

		/* output scaling */
		#ifdef FIX_1518
		test();
		if ( !( EQ_16(st_ivas->ivas_format, SBA_ISM_FORMAT) && EQ_16(st_ivas->ism_mode, ISM_MODE_NONE ) ) )
		{
		#endif
		IF( !sba_mono_flag )
		{
		v_shr( output[0], 1, output[0], output_frame ); /0.5f/
		v_shr( output[1], 1, output[1], output_frame ); /0.5f/
		}
		#ifdef FIX_1518
		}
		#endif

		/* delay HB synth */
		IF( EQ_16( st_ivas->nchan_transport, 1 ) )