Merge branch 'main' into ci/test-activated-testcases-main (43ee72a7) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1800,10 +1800,8 @@ static void usage_dec( void )
		fprintf( stdout, " output configuration. ID1, ID2, ID3, ID4 specify the directivity pattern IDs used for\n" );
		fprintf( stdout, " ISMs 1,2,3 and 4 respectively. This options needs to be accompanied by a render_config file,\n" );
		fprintf( stdout, " otherwise a default directivity pattern is used.\n" );
		fprintf( stdout, "-aeid ID : Acoustic environment ID (number > 0) or\n" );
		fprintf( stdout, " a sequence thereof in the format [ID1:duration1,ID2:duration2...]\n" );
		fprintf( stdout, " without braces and spaces, with ':' character separating ID from duration and ',' separating\n" );
		fprintf( stdout, " ID and duration pairs, where duration is specified in frames\n" );
		fprintf( stdout, "-aeid ID \| File : Acoustic environment ID (number > 0)\n" );
		fprintf( stdout, " alternatively, it can be a text file where each line contains \"ID duration\"\n" );
		fprintf( stdout, " for BINAURAL_ROOM_REVERB output configuration.\n" );
		fprintf( stdout, "-obj_edit File : Object editing instructions file or NULL for built-in example\n" );
		fprintf( stdout, "-level level : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );

apps/renderer.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -1354,15 +1354,12 @@ int main(
		{
		masaIds[i] = 0u;
		}
		#ifdef FIX_1377_HANDLE_ERROR_CODE

		if ( ( error = IVAS_REND_SetObjectIDs( hIvasRend ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_SetObjectIDs: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		#else
		IVAS_REND_SetObjectIDs( hIvasRend );
		#endif

		for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )
		{

lib_com/ivas_cnst.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -258,9 +258,7 @@ typedef enum
		/* format signaling in SID frames */
		#define SID_FORMAT_NBITS 3 /* Bit 0 \| Bit 1 \| Bit 2 */
		/-------\|-------\|------ /
		#ifdef FIX_1384_MSAN_ivas_spar_dec_open
		#define SID_FORMAT_NONE (-0x1) /* n/a\| n/a\| n/a*/
		#endif
		#define SID_DFT_STEREO 0x0 /* 0\| 0\| 0 */
		#define SID_MDCT_STEREO 0x1 /* 1\| 0\| 0 */
		#define SID_ISM 0x2 /* 0\| 1\| 0 */

lib_com/options.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -122,25 +122,15 @@
		/* #################### Start BASOP porting switches ############################ */

		#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_1328_FIX_NON_LINEARITY /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0, float issue 1328 */
		#define FIX_1377_HANDLE_ERROR_CODE /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */
		#define FIX_1053_REVERB_RECONFIGURATION
		#define FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add split rendering support to decoder in VoIP mode */
		#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_1385_INIT_IGF_STOP_FREQ /* FhG: Initialize infoIGFStopFreq in init_igf_dec() */
		#define FIX_1387_INIT_PRM_SQQ /* FhG: initialize pointer prm_sqQ, which might be uninitialized in case of bfi == 1 */
		#define FIX_1349_TNS_CRASH /* FhG: Fix crash in TNS entropy coding, in case order of joint TNS coding is reduced to 0 */
		#define FIX_1384_MSAN_stereo_tcx_core_enc /* VA: issue 1384: fix use-of-uninitialized value in stereo_tcx_core_enc() */
		#define FIX_1384_MSAN_ivas_spar_dec_open /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */
		#define FIX_1388_MSAN_ivas_init_decoder /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */
		#define FIX_1413_IGF_INIT_PRINTOUT /* FhG: use correct variable for IGF initiliazation */
		#define FIX_1383_HEAD_TRACK_SANITIZER /* Nok: issue 1383: Fix head tracking struc values reading in renderer */
		#define FIX_1330_JBM_MEMORY_FIX /* VA: basop issue: 2179 fix non-BE difference in FIX_1330_JBM_MEMORY */
		#define FIX_1411_IGF_CRASH_BW_SWITCHING /* FhG: Fix for issue 1411: fixes crash that can happen for IGF with BW switching and DTX*/
		#define FIX_1419_MONO_STEREO_UMX /* FhG: fix for issue 1419 : support upmix to all output formats for mono and stereo */
		#define NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG /* FhG: Fix MDCT-Stereo comfort noise for certain noise types */
		#define NONBE_1344_REND_MASA_LOW_FS /* Nokia: Issue 1344: Fix sanitizer errors when using IVAS_rend to render MASA with lower sampling rates */
		#define FIX_1437_LC3PLUS_EXTREND_HIRES /* FhG: fix external renderer split bitstream header writing causing a crash for LC3plus High-res mode */
		#define NONBE_1412_AVOID_ROUNDING_AZ_ELEV /* FhG: Avoid rounding when passing azimuth and elevation to efap_determine_gains() */
		#define FIX_1318_ROOM_SIZE_CMD_LINE /* Philips/Nokia/FhG: Default room sizes support */

lib_com/swb_tbe_com_fx.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -5901,9 +5901,7 @@ void non_linearity_ivas_fx(
		Word16 nframes;
		Word32 prev_scale;
		Word16 length_half;
		#ifdef NONBE_1328_FIX_NON_LINEARITY
		Word16 sc_factor;
		#endif

		IF( EQ_16( L_frame, L_FRAME16k ) )
		{
		@@ -5964,15 +5962,10 @@ void non_linearity_ivas_fx(
		move32(); /* Q31; 0.67 in Q31 */
		}

		#ifdef NONBE_1328_FIX_NON_LINEARITY
		sc_factor = s_max( sub( 13, norm_s( add( j, 1 ) ) ), 0 ); /* Adapt the scaling factor allowed depending of max position */
		sc_factor = s_max( sc_factor, 1 ); /* Note: The sc_factor is the log2 of the sc_factor in the float code to simplify condition below */
		test();
		IF( prev_scale <= 0 \|\| GT_32( L_shr( prev_scale, sub( sc_factor, 1 ) /Q30 -> Q31/ ), scale /Q31/ ) ) /* Since the sc_factor is the log2 of sc_factor in float, we apply it using L_shr */
		#else
		test();
		IF( prev_scale <= 0 \|\| GT_32( Mult_32_16( prev_scale, 64 ) /Q30 -> Q31/, scale /Q31/ ) )
		#endif
		{
		scale_step = 16384;
		move16(); /* Q14 */
		@@ -6045,16 +6038,12 @@ void non_linearity_ivas_fx(
		move32(); /* Q31; 0.67 in Q31 */
		}

		#ifdef NONBE_1328_FIX_NON_LINEARITY
		/* if ( element_mode > EVS_MONO ) / / element mode is not needed because the function is duplicated for IVAS */
		sc_factor = s_max( sub( 12, norm_s( add( sub( j, length_half ), 1 ) ) ), 0 ); /* allowed intra frame jump is smaller */
		sc_factor = s_max( sc_factor, 1 ); /* Note: The sc_factor is the log2 of the sc_factor in the float code to simplify condition below */

		test();
		IF( prev_scale <= 0 \|\| GT_32( L_shr( prev_scale, sub( sc_factor, 1 ) /Q30 -> Q31/ ), scale /Q31/ ) ) /* Since the sc_factor is the log2 of sc_factor in float, we apply it using L_shr */
		#else
		IF( prev_scale <= 0 \|\| GT_32( Mult_32_16( prev_scale, 64 ), scale ) )
		#endif
		{
		scale_step = 16384;
		move16(); /Q14 /