Merge branch '20260609_cleanup' into 'main' (b8acad1a) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -163,9 +163,7 @@ static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS
		static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtf, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ObjectEditFileReader objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA splitRendBits, IVAS_DEC_HANDLE phIvasDec, int16_t *pcmBuf );
		static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );
		static void do_object_editing_fx( IVAS_EDITABLE_PARAMETERS editableParameters, ObjectEditFileReader objectEditFileReader );
		#ifdef FIX_FMSW_DEC_EXT
		static ivas_error updateOnFormatSwitching( IVAS_DEC_HANDLE hIvasDec, IVAS_DEC_BS_FORMAT pBsFormat, const char outputWavFilename, MasaFileWriter *ppMasaWriter, IsmFileWriter ismWriters[IVAS_MAX_NUM_OBJECTS], int16_t pNumOutChannels, uint16_t pNumObj, const bool delayCompensationEnabled );
		#endif


		/------------------------------------------------------------------------------------------
		@@ -2027,11 +2025,7 @@ static ivas_error decodeG192(
		int16_t isSplitRend, isSplitCoded;
		IVAS_RENDER_CONFIG_DATA renderConfig;
		RenderConfigReader *renderConfigReader = NULL;
		#ifdef FIX_FMSW_DEC_EXT
		bool restartNeeded = false;
		#else
		bool restartNeeded;
		#endif

		#ifdef VARIABLE_SPEED_DECODING
		if ( arg.tsmEnabled )
		@@ -2418,7 +2412,6 @@ static ivas_error decodeG192(
		}
		}

		#ifdef FIX_FMSW_DEC_EXT
		/* Output writing update in case of format switching and EXTERNAL output */
		if ( restartNeeded && arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		@@ -2428,7 +2421,6 @@ static ivas_error decodeG192(
		goto cleanup;
		}
		}
		#endif

		/* Write current frame */
		if ( decodedGoodFrame )
		@@ -2823,11 +2815,7 @@ static ivas_error decodeVoIP(
		int16_t i;
		IVAS_DEC_HANDLE hIvasDec = *phIvasDec;

		#ifdef FIX_FMSW_DEC_EXT
		bool restartNeeded = false;
		#else
		bool restartNeeded;
		#endif
		IVAS_RTP ivasRtp = { 0 };
		IVAS_RTP srRtp = { 0 };
		IVAS_RTP_SR_INFO srInfo = { true, false, 0, 20, IVAS_SR_TRANSPORT_LCLD };
		@@ -3314,7 +3302,6 @@ static ivas_error decodeVoIP(
		}
		}

		#ifdef FIX_FMSW_DEC_EXT
		/* Output writing update in case of format switching and EXTERNAL output */
		if ( restartNeeded && arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		@@ -3324,7 +3311,6 @@ static ivas_error decodeVoIP(
		goto cleanup;
		}
		}
		#endif

		/* Write current frame */
		if ( !srRtp.hPack && decodedGoodFrame )
		@@ -3934,7 +3920,6 @@ static ivas_error load_hrtf_from_file(
		return IVAS_ERR_OK;
		}

		#ifdef FIX_FMSW_DEC_EXT

		/---------------------------------------------------------------------
		* updateOnFormatSwitching()
		@@ -4008,6 +3993,5 @@ static ivas_error updateOnFormatSwitching(

		return IVAS_ERR_OK;
		}
		#endif

		#undef WMC_TOOL_SKIP

lib_com/ivas_stereo_td_bit_alloc_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -716,11 +716,7 @@ void tdm_SCh_LSF_intra_pred_fx(
		fixed_beta = 30801; // 0.94f in Q15
		move16();
		}
		#ifndef FIX_ISSUE_2613_WRONG_COMP_MACRO
		ELSE IF( element_brate <= IVAS_24k4 )
		#else
		ELSE IF( LE_32( element_brate, IVAS_24k4 ) )
		#endif // !FIX_ISSUE_2613_WRONG_COMP_MACRO
		{
		fixed_beta = 29818; // 0.91f in Q15
		move16();

lib_com/options.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -86,10 +86,6 @@
		#define FIX_1990_SANITIZER_IN_REVERB_LOAD /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */
		#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */
		#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */
		#define FIX_ISSUE_2616_BOUNDARY_CONDITION /* FhG: basop issue 2616: Inconsistent boundary conditions in function stereo_dft_dequantize_res_gains*/
		#define FIX_ISSUE_2613_WRONG_COMP_MACRO /* FhG: basop issue 2613: Inconsistent comparison macros in function tdm_SCh_LSF_intra_pred_fx*/
		#define FIX_ISSUE_2611_WRONG_COMMENT /* FhG: basop issue 2611: Wrong Q value comment in fucntion stereo_dft_sg_recovery_fx()*/
		#define FIX_BASOP_2550_TCX_ENC_MEM_UPDATE /* FhG: fix condition in tcx_encoder_memory_update__fx(), bring inline with float /
		#define FIX_BASOP_2620_ICBWE_GSMAPPING_DEAD_CLAMP /* FhG: remove dead (always-overwritten) gsMapping clamp in ic_bwe_enc_gsMapping_fx; float ref has no clamp */

		/* #################### End BE switches ################################## */
		@@ -98,8 +94,6 @@
		/* any switch which is non-be wrt. TS 26.251 V3.0 */

		#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */
		#define FIX_BASOP_2442_MASA2TC_TO_MONO_AND_AMBI /* Nokia: BASOP issue 2442: Increase accuracy of computations and add additional gain clamp for low energy decorrelated signal rendering. */
		#define FIX_FMSW_DEC_EXT /* float issue 1566: fix EXT output in format switching */
		#define FIX_BASOP_2612_RESET_DECIM_MEM /* FhG: BASOP #2612: reset (zero) the 16k resampler memory of the secondary channel on DFT->TD stereo switch (otherwise -> fx overshoot) */
		#define FIX_BASOP_2621_STEREO_CNG_NOISY_SPEECH_QSHIFT /* FhG: BASOP #2621: stereo_dft_generate_comfort_noise_fx flag_noisy_speech: compare (lp_speech-lp_noise) Q23 diff against 28.0 in Q23 (was vs integer 28 with q_lp_noise=0) */
		#define FIX_ISSUE_2618_PLC_RES_ATT_SCALING /* FhG: BASOP #2618: residual PLC burst attenuation, apply divide/Sqrt32 exponent so fac tracks exponent correctly */

lib_dec/ivas_stereo_dft_dec_fx.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -445,11 +445,7 @@ static void stereo_dft_dequantize_res_gains_fx(
		move16();
		ind2[i] = check_bounds_s_fx( ind2[i], 0, 7 ); /* Q0 */
		move16();
		#ifndef FIX_ISSUE_2616_BOUNDARY_CONDITION
		IF( LE_16( ind1[i], 15 ) )
		#else
		IF( LT_16( ind1[i], 15 ) )
		#endif // !FIX_ISSUE_2616_BOUNDARY_CONDITION
		{
		tmp = sub( 15, ind1[i] );
		}
		@@ -460,11 +456,7 @@ static void stereo_dft_dequantize_res_gains_fx(
		// index = add( shl( LE_16( ind1[i], 15 ) ? sub( 15, ind1[i] ) : sub( ind1[i], 15 ), 3 ), ind2[i] );
		index = add( shl( tmp, 3 ), ind2[i] );
		// gout[i] = LE_16( ind1[i], 15 ) ? L_negate( dft_res_gains_q_fx[index][0] ) : dft_res_gains_q_fx[index][0];
		#ifndef FIX_ISSUE_2616_BOUNDARY_CONDITION
		IF( LE_16( ind1[i], 15 ) )
		#else
		IF( LT_16( ind1[i], 15 ) )
		#endif // !FIX_ISSUE_2616_BOUNDARY_CONDITION
		{
		gout[i] = L_negate( dft_res_gains_q_fx[index][0] ); /* Q31 */
		move16();

lib_dec/ivas_stereo_dft_plc_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -859,11 +859,7 @@ Word16 stereo_dft_sg_recovery_fx(
		test();
		IF( LT_32( sg_m, (Word32) 0x4CCCCCCD ) && GT_32( sg_m, (Word32) ( 0xB3333333 ) ) )
		{
		#ifndef FIX_ISSUE_2611_WRONG_COMMENT
		hStereoDft->sg_mean_fx = 0; /* Q13 */
		#else
		hStereoDft->sg_mean_fx = 0; /* Q31 */
		#endif // !FIX_ISSUE_2611_WRONG_COMMENT
		move32();
		}
		ELSE