Merge branch 'main' into 1019-socket-interface-for-pose-and-audio (ac0d0546) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/encoder.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		the software. This notice grants no license of any kind, including but not limited to patent
		license, nor is any license granted by implication, estoppel or otherwise.

		Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
		Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
		contributions.

+3 −2

Original line number	Diff line number	Diff line
		@@ -1081,18 +1081,19 @@ int main(
		fprintf( stderr, "\nFailed to read renderer configuration from file %s\n", args.renderConfigFilePath );
		goto cleanup;
		}
		#ifdef NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND

		if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, args.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", args.directivityPatternId[0], args.directivityPatternId[1], args.directivityPatternId[2], args.directivityPatternId[3] );
		goto cleanup;
		}

		if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to get Distance Attenuation \n\n" );
		goto cleanup;
		}
		#endif

		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		aeID = args.aeSequence.count > 0 ? args.aeSequence.pID[0] : 65535;

+1 −5

Original line number	Diff line number	Diff line
		@@ -166,8 +166,6 @@
		#endif

		#define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
		#define FIX_938_COMPILER_WARNING /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */
		#define FIX_1288_SPLIT_REND_XSAN /* Dlb: Fix asan, msan and usan issues in split rendering mode*/

		/* #################### End BE switches ################################## */

		@@ -178,8 +176,6 @@

		#define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */
		#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 NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND /* Eri: issue 1337: Missing directivity setting and distance attenuation in external renderer IVAS_rend */
		#define NONBE_1329_FIX_OSBA_CRASH /* FhG: issue 1329: prevent assert when bit budget is low*/
		#define NONBE_FIX_TCX5_INTERLEAVING_FOR_FS_IN_UNEQUAL_FS_OUT /* FhG: apply correct TCX5 grouping/interleaving when input_fs != output_fs */
		#define NONBE_1339_FIXOSBA_EXT_LOUDNESS /* FhG: issue 1339: apply scaling with EXT output in OSBA high-BR mode */

+1 −4

Original line number	Diff line number	Diff line
		@@ -2782,11 +2782,8 @@ void ivas_destroy_dec(
		ivas_dirac_dec_close_binaural_data( st_ivas->hDiracDecBin );

		/* Crend handle */
		#ifndef FIX_1288_SPLIT_REND_XSAN
		ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ), ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses );
		#else
		ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );
		#endif

		/* Reverb handle */
		ivas_reverb_close( &st_ivas->hReverb );

+0 −4

Original line number	Diff line number	Diff line
		@@ -253,11 +253,7 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		}

		/* close the crend binaural renderer */
		#ifndef FIX_1288_SPLIT_REND_XSAN
		ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ), ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses );
		#else
		ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );
		#endif
		}
		}