Merge remote-tracking branch 'origin/float-pc' into 1607_ref_port-mr-1401-from-float (59b57f76) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2423,7 +2423,11 @@ static ivas_error decodeG192(
		{
		if ( ( error = TsmScaleFileReader_readScale( tsmScaleFileReader, &scale ) ) != IVAS_ERR_OK )
		{
		#ifdef FIX_699_FILE_READER_JBM_TSM
		fprintf( stderr, "\nError (%s) when reading TSM data from %s \n\n", arg.inputBitstreamFilename, TsmScaleFileReader_getFilePath( tsmScaleFileReader ) );
		#else
		fprintf( stderr, "\nError: input bitstream file couldn't be read: %s \n\n", arg.inputBitstreamFilename );
		#endif
		goto cleanup;
		}
		int16_t maxScaling;

+4 −0

Original line number	Diff line number	Diff line
		@@ -709,7 +709,11 @@ int main(
		{
		if ( ( error = JbmFileReader_readCAconfig( jbmReader, &caConfig ) ) != IVAS_ERR_OK )
		{
		#ifdef FIX_699_FILE_READER_JBM_TSM
		fprintf( stderr, "\nError (%s) while reading Channel-Aware Config. from: %s\n\n", IVAS_ENC_GetErrorMessage( error ), JbmFileReader_getFilePath( jbmReader ) );
		#else
		fprintf( stderr, "JbmFileReader_readCAconfig() failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		#endif
		goto cleanup;
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -4381,7 +4381,7 @@ void ivas_spar_dec_upmixer_sf(
		float output[], / o : output audio channels */
		const int16_t nchan_internal /* i : number of internal channels */
		);

		#ifndef FIX_997_REMOVE_SPAR_DEC_UPMIXER
		void ivas_spar_dec_upmixer(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		float output[], / i/o: input/output audio channels */
		@@ -4389,6 +4389,7 @@ void ivas_spar_dec_upmixer(
		const int16_t output_frame /* i : output frame length */
		);

		#endif
		/* MD module */
		ivas_error ivas_spar_md_enc_open(
		ivas_spar_md_enc_state_t *hMdEnc, / i/o: SPAR MD encoder handle */

+5 −0

Original line number	Diff line number	Diff line
		@@ -216,9 +216,14 @@
		#define NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN /* FhG : issue #974: usan in mono and stereo output in OSBA JBM RS */
		#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS /* FhG : issue #982 : 5ms and 20ms output different for OMASA */
		#define NONBE_FIX_975_JBM_USAN /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */
		#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */

		#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING /* FhG: fix usan error in MCT with bw swicthing */
		#define NONBE_FIX_986_MC_BW_SWITCHING /* FhG: fix crash in bw and br switching with MC */
		#define NONBE_FIX_1000_G1_G2_SWB_TBE /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */
		#define FIX_699_FILE_READER_JBM_TSM /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */
		#define FIX_997_REMOVE_SPAR_DEC_UPMIXER /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */
		#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig */
		#define FIX_1001_ARI_HM_OVERFLOW /* FhG: fix for undef behaviour in in the harmonic TCX model arithmetic coder */

		/* #################### End BASOP porting switches ############################ */

+18 −0

Original line number	Diff line number	Diff line
		@@ -938,6 +938,14 @@ void GenShapedSHBExcitation(
		}

		den = 4.0f * c0 * c2 - c4 * c4;

		#ifdef NONBE_FIX_1000_G1_G2_SWB_TBE
		if ( den == 0.0f )
		{
		den = 1e-7f;
		}
		#endif

		g1 = ( c3 * c4 - 2 * c1 * c2 ) / den;
		g2 = ( c1 * c4 - 2 * c0 * c3 ) / den;

		@@ -964,7 +972,17 @@ void GenShapedSHBExcitation(
		else
		{
		/* normalize gain */
		#ifdef NONBE_FIX_1000_G1_G2_SWB_TBE
		temp = 0.0f;
		if ( g1 + g2 == 0.0f )
		{
		temp = 1e-7f;
		}

		g = g2 / ( g1 + g2 + temp );
		#else
		g = g2 / ( g1 + g2 );
		#endif

		/* quantization of the mixing factor */
		cbsize = 1 << NUM_BITS_SHB_VF;