Merge branch 'main' into 2186_change_object_editing_gain_limitation (c6ad3409) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci/rules-basis.yml

+3 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,9 @@
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'peaq-enc-passthrough'
		variables:
		IVAS_PIPELINE_NAME: 'PEAQ encoder pass-through test: $CI_COMMIT_BRANCH'
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'
		variables:
		IVAS_PIPELINE_NAME: 'IVAS conformance: $CI_COMMIT_BRANCH'
		- if: $CI_PIPELINE_SOURCE == 'schedule' # Scheduled in any branch
		variables:
		IVAS_PIPELINE_NAME: 'Scheduled pipeline: $CI_COMMIT_BRANCH'

.gitlab-ci/variables.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -105,3 +105,4 @@ variables:
		- 'long-term-logs'
		- 'backup-long-term-logs'
		- 'test-long-self-test'
		- 'ivas-conformance-linux'

apps/decoder.c

+29 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,9 @@ typedef struct
		uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];
		bool objEditEnabled;
		char *objEditFileName;
		#ifdef FIX_1419_MONO_STEREO_UMX
		bool evsMode;
		#endif

		} DecArguments;

		@@ -834,6 +837,9 @@ static bool parseCmdlIVAS_dec(
		arg->output_Fs = IVAS_MAX_SAMPLING_RATE;
		arg->outputConfig = IVAS_AUDIO_CONFIG_MONO;
		arg->decMode = IVAS_DEC_MODE_IVAS;
		#ifdef FIX_1419_MONO_STEREO_UMX
		arg->evsMode = false;
		#endif
		arg->quietModeEnabled = false;
		arg->delayCompensationEnabled = true;
		arg->voipMode = false;
		@@ -1360,6 +1366,14 @@ static bool parseCmdlIVAS_dec(
		}
		i++;
		}
		#ifdef FIX_1419_MONO_STEREO_UMX
		else if ( strcmp( argv_to_upper, "-EVS" ) == 0 )
		{
		arg->evsMode = true;
		arg->decMode = IVAS_DEC_MODE_EVS;
		i++;
		}
		#endif

		/-----------------------------------------------------------------
		* Option not recognized
		@@ -1410,6 +1424,15 @@ static bool parseCmdlIVAS_dec(
		usage_dec();
		return false;
		}
		#ifdef FIX_1419_MONO_STEREO_UMX
		else if ( arg->non_diegetic_pan_enabled && arg->outputConfig == IVAS_AUDIO_CONFIG_STEREO && arg->evsMode )
		{
		fprintf( stderr, "Error: Both non-diegetic panning and stereo output specified!\n\n" );
		usage_dec();
		return false;
		}

		#endif
		if ( arg->outputMdFilename != NULL && arg->outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		fprintf( stderr, "Error: Output split rendering metadata file is supported for BINAURAL_SPLIT_PCM output config. only\n\n" );
		@@ -1501,6 +1524,9 @@ static bool parseCmdlIVAS_dec(
		static void usage_dec( void )
		{
		fprintf( stdout, "Usage for EVS: IVAS_dec.exe [Options] Fs bitstream_file output_file\n" );
		#ifdef FIX_1419_MONO_STEREO_UMX
		fprintf( stdout, " OR usage for IVAS (below) with -evs option and OutputConf\n" );
		#endif
		fprintf( stdout, "Usage for IVAS: IVAS_dec.exe [Options] OutputConf Fs bitstream_file output_file\n\n" );

		fprintf( stdout, "Mandatory parameters:\n" );
		@@ -1517,6 +1543,9 @@ static void usage_dec( void )

		fprintf( stdout, "Options:\n" );
		fprintf( stdout, "--------\n" );
		#ifdef FIX_1419_MONO_STEREO_UMX
		fprintf( stdout, "-evs : Specify that the supplied bitstream is an EVS bitstream\n" );
		#endif
		fprintf( stdout, "-VOIP : VoIP mode: RTP in G192\n" );
		fprintf( stdout, "-VOIP_hf_only=0 : VoIP mode: EVS RTP Payload Format hf_only=0 in rtpdump\n" );
		fprintf( stdout, "-VOIP_hf_only=1 : VoIP mode: EVS RTP Payload Format hf_only=1 in rtpdump\n" );

lib_com/ivas_cnst.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -1304,7 +1304,11 @@ typedef enum
		----------------------------------------------------------------------------------/

		#define MC_LS_SETUP_BITS 3 /* number of bits for writing the MC LS configuration */
		#ifdef FIX_1419_MONO_STEREO_UMX
		#define LS_SETUP_CONVERSION_NUM_MAPPINGS 41 /* number of mappings for LS setup conversion */
		#else
		#define LS_SETUP_CONVERSION_NUM_MAPPINGS 35 /* number of mappings for LS setup conversion */
		#endif

		typedef enum
		{

lib_com/options.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,8 @@

		#define FIX_2184_EVS_STEREO_DMX_CHANNEL_DISAPPEARING /* Orange: Fix for issue 2184 - to prevent one channel from becoming inaudible in the mono downmix output */
		#define FIX_2148_OBJ_EDIT_ISSUE_WITH_OSBA /* Nokia: Add missing code to solve issue */
		#define FIX_2200_ISAR_PLC_CRASH /* Dolby: Fix for ISAR PLC crash observed with newly added BASOP tests */

		/* ################### End FIXES switches ########################### */

		/* #################### Start BASOP porting switches ############################ */
		@@ -140,6 +142,7 @@
		#define FIX_1330_JBM_MEMORY /* VA: issue 1330: memory savings in the JBM decoder */
		#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 NONBE_1412_AVOID_ROUNDING_AZ_ELEV /* FhG: Avoid rounding when passing azimuth and elevation to efap_determine_gains() */