Merge branch 'main' into 1808-asserts-for-binaural_room_reverb-output (a12ef305) · Commits · SA4 / Audio / IVAS BASOP

apps/encoder.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -1486,6 +1486,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: Too low number of ISM channels specified!\n\n" );
		usage_enc();
		return false;
		}
		else
		{
		@@ -1497,6 +1498,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: Too high number of ISM channels!\n\n" );
		usage_enc();
		return false;
		}
		}
		}
		@@ -1504,6 +1506,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: Number of ISM channels not specified!\n\n" );
		usage_enc();
		return false;
		}
		if ( i < argc - 4 )
		{
		@@ -1523,7 +1526,7 @@ static bool parseCmdlIVAS_enc(
		default:
		fprintf( stderr, "Error: MASA channels must be 1 or 2.\n\n" );
		usage_enc();
		break;
		return false;
		}
		}

		@@ -1548,6 +1551,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: not enough arguments\n\n" );
		usage_enc();
		return false;
		}
		}

		@@ -1560,6 +1564,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: not enough MASA arguments\n\n" );
		usage_enc();
		return false;
		}
		}
		else if ( strcmp( to_upper( argv[i] ), "-ISM_SBA" ) == 0 )
		@@ -1578,6 +1583,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: Too low number of ISM channels specified!\n\n" );
		usage_enc();
		return false;
		}
		else
		{
		@@ -1589,6 +1595,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: Too high number of ISM channels!\n\n" );
		usage_enc();
		return false;
		}
		}
		}
		@@ -1596,6 +1603,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: Number of ISM channels not specified!\n\n" );
		usage_enc();
		return false;
		}

		if ( i < argc - 4 )
		@@ -1647,6 +1655,7 @@ static bool parseCmdlIVAS_enc(
		{
		fprintf( stderr, "Error: not enough arguments\n\n" );
		usage_enc();
		return false;
		}
		}
		}

apps/renderer.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -1167,7 +1167,18 @@ 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_fx ) ) != 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_fx ) ) != 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 )
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION

lib_com/cnst.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@
		#define NUM_SAMPLES_320 (320)
		#define NUM_SAMPLES_160 (160)
		#define L_SUBFRAME_48k (240)
		#define L_SUBFRAME_32k (180)
		#define L_SUBFRAME_32k (160)
		#define L_SUBFRAME_16k (80)
		#define L_SUBFRAME_8k (40)
		#define Q31_BY_NUM_SAMPLES_960 ( 2239294 ) /* 1/959 in Q31 */

lib_com/common_api_types.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -317,11 +317,6 @@ typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG
		{
		Word16 override;
		Word16 nBands; /* Number of frequency bands for which reverb properties are provided, integer, range [2..256] */
		float pFc_input[IVAS_CLDFB_NO_CHANNELS_MAX]; /* Center frequencies for which following values are provided: */
		float pAcoustic_rt60[IVAS_CLDFB_NO_CHANNELS_MAX]; /* - The room's T60 per center frequency */
		float pAcoustic_dsr[IVAS_CLDFB_NO_CHANNELS_MAX]; /* - The room's Diffuse to Source Ratio per center frequency */
		float acousticPreDelay; /* Time elapsed between input signal and late reverberation start, float, range [0.001..10] */
		float inputPreDelay; /* Offset in seconds from where DSR is computed in the RIR (0 = at source), float, range [0.001..10] */
		Word32 pFc_input_fx[IVAS_CLDFB_NO_CHANNELS_MAX]; /Q16 Center frequencies for which following values are provided: /
		Word32 pAcoustic_rt60_fx[IVAS_CLDFB_NO_CHANNELS_MAX]; /Q26 - The room's T60 per center frequency /
		Word32 pAcoustic_dsr_fx[IVAS_CLDFB_NO_CHANNELS_MAX]; /Q30 - The room's Diffuse to Source Ratio per center frequency /

lib_com/ivas_cnst.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ typedef enum
		#else
		RENDERER_OSBA_LS
		#endif

		} RENDERER_TYPE;

		#define MAX_FREQUENCY_BANDS 64
		@@ -215,7 +216,9 @@ typedef enum

		typedef enum
		{
		#ifndef FIX_1101_CLEANING_JBM_CALL
		TC_BUFFER_MODE_NONE = 0,
		#endif
		TC_BUFFER_MODE_RENDERER,
		TC_BUFFER_MODE_BUFFER
		} TC_BUFFER_MODE;
		@@ -270,7 +273,11 @@ typedef enum
		#define SID_MDCT_STEREO 0x1 /* 1\| 0\| 0 */
		#define SID_ISM 0x2 /* 0\| 1\| 0 */
		#define SID_MASA_1TC 0x3 /* 1\| 1\| 0 */
		#ifdef FIX_1209_SID_SIGNALING
		/reserved/ /0x4/ /* 0\| 0\| 1 */
		#else
		#define SID_MULTICHANNEL 0x4 /* 0\| 0\| 1 */
		#endif
		#define SID_SBA_1TC 0x5 /* 1\| 0\| 1 */
		#define SID_SBA_2TC 0x6 /* 0\| 1\| 1 */
		#define SID_MASA_2TC 0x7 /* 1\| 1\| 1 */