Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... (6e27e053) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+16 −3

Original line number	Diff line number	Diff line
		@@ -1468,6 +1468,18 @@ static bool parseCmdlIVAS_dec(
		return false;
		}

		#ifdef SUPPORT_JBM_TRACEFILE
		/* Validate options that depend on other options */
		if ( arg->jbmTraceFilename != NULL && arg->delayCompensationEnabled
		/* This decMode check should be removed once timestamp sync issues between JBM trace and audio are fixed in EVS */
		&& arg->decMode != IVAS_DEC_MODE_EVS )
		{
		fprintf( stderr, "Error: Writing to a JBM trace file requires delay compensation to be disabled with -no_delay_cmp\n\n" );
		usage_dec();
		return false;
		}
		#endif

		return true;
		}

		@@ -1504,7 +1516,8 @@ static void usage_dec( void )
		fprintf( stdout, " EVS RTP Payload Format. The SDP parameter hf_only is required.\n" );
		fprintf( stdout, " Reading RFC4867 AMR/AMR-WB RTP payload format is not supported.\n" );
		#ifdef SUPPORT_JBM_TRACEFILE
		fprintf( stdout, "-Tracefile TF : VoIP mode: Generate trace file named TF\n" );
		fprintf( stdout, "-Tracefile TF : VoIP mode: Generate trace file named TF. Requires -no_delay_cmp to\n" );
		fprintf( stdout, " be enabled so that trace contents remain in sync with audio output.\n" );
		#endif
		fprintf( stdout, "-fr L : render frame size in ms L=(5,10,20), default is 20)\n" );
		fprintf( stdout, "-fec_cfg_file : Optimal channel aware configuration computed by the JBM \n" );
		@@ -1678,13 +1691,13 @@ static ivas_error initOnFirstGoodFrame(
		return error;
		}

		int16_t zeroBuf = malloc( pcmFrameSize sizeof( int16_t ) );
		/* Write zeros to the output audio buffer */
		int16_t *zeroBuf = calloc( pcmFrameSize, sizeof( int16_t ) );
		if ( zeroBuf == NULL )
		{
		fprintf( stdout, "Error: Unable to allocate memory for output buffer.\n" );
		return IVAS_ERR_FAILED_ALLOC;
		}
		memset( zeroBuf, 0, pcmFrameSize * sizeof( int16_t ) );

		for ( int16_t i = 0; i < numInitialBadFrames; ++i )
		{

lib_com/options.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@
		#endif

		/#define DISABLE_LIMITER/
		/#define DEBUG_APA_SILENCE_NON_SCALED/ /* Switch APA into mode that replaces contents of non-scaled frames with silence. Useful for identifying scaled regions in the audio output of the decoder */

		/* #################### End DEBUGGING switches ############################ */

		@@ -111,7 +112,7 @@
		#define FIX_RENDERER_STACK /* VA: issue 1322: reduction of renderers' buffers size */
		#define FIX_1370_EXTERNAL_ORIENTATION_CHECK /* Nokia: add sanity check for Euler angles for external orientations */
		#define FIX_1413_IGF_INIT_PRINTOUT /* FhG: use correct variable for IGF initiliazation */

		#define CODE_IMPROVEMENTS

		// object-editing feature porting
		#define TMP_FIX_SPLIT_REND // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

lib_debug/debug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -836,7 +836,7 @@ int16_t make_dirs( const char *const pathname )

		if ( sep != 0 )
		{
		temp = calloc( 1, strlen( pathname ) + 1 );
		temp = calloc( strlen( pathname ) + 1, sizeof( char ) );
		p = pathname;
		while ( ( p = strchr( p, sep ) ) != NULL )
		{

lib_dec/jbm_pcmdsp_apa_fx.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -882,6 +882,17 @@ UWord8 apa_exec_fx(
		move32();
		}

		#ifdef DEBUG_APA_SILENCE_NON_SCALED
		IF( l_in == *l_out )
		{
		set_s( a_out, 0, *l_out );
		}
		ELSE
		{
		set_s( a_out, INT16_MAX, *l_out );
		}
		#endif

		return 0;
		}

lib_rend/ivas_rom_rend_fx.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -81,9 +81,15 @@ const Word32 ap_lattice_coeffs_2_fx[132] /* Q31 */ = { 1360843264, 1462880896,
		const Word32 ap_lattice_coeffs_3_fx[66] /* Q31 */ = { 1360843264, 1462880896, -106124344, 615715776, 313579872, 290773568, -880779712, -444026592, -1410828032, -218497872, 936944960, 729753600, -282142848, -1661606912, -647739072, 703431872, 713452032, 442076704, 1541038592, -1186205568, -322414592, 117158120, 514363136, -1392593792, -1550156800, 406684000, 146426176, 13348758, 165409920, 83060376, 909276800, -233341280, 927820288, -890434752, 596656832, 898691840, 167097856, -607873152, -766668864, 9951439, -950562176, -799540352, 866157440, 521887904, 675097984, 954584384, 746287104, 1065244224, 232804400, 1007990144, -365686400, 700745408, 369704352, 945610048, 125449552, 729442240, -418684160, 1054884800, -604078592, -92599496, -1036132928, -719417728, -721895936, 421913952, -353525216, 950242176};
		const Word32 * const ap_lattice_coeffs_fx[DIRAC_DECORR_NUM_SPLIT_BANDS] =
		{
		#ifdef CODE_IMPROVEMENTS
		ap_lattice_coeffs_1_fx,
		ap_lattice_coeffs_2_fx,
		ap_lattice_coeffs_3_fx,
		#else
		&ap_lattice_coeffs_1_fx[0],
		&ap_lattice_coeffs_2_fx[0],
		&ap_lattice_coeffs_3_fx[0],
		#endif
		};

		const Word16 ap_split_frequencies_fx[DIRAC_DECORR_NUM_SPLIT_BANDS + 1]/Q14/ = {