Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into... (658b7026) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1589,7 +1589,6 @@ static bool parseCmdlIVAS_dec(
		* Mandatory input arguments
		-----------------------------------------------------------------/

		#ifdef FIX_956_DECODER_COMMAND_LINE_FIX
		if ( i < argc - 4 )
		{
		for ( i = 1; i < argc; i++ )
		@@ -1607,9 +1606,6 @@ static bool parseCmdlIVAS_dec(
		return false;
		}
		else if ( i < argc - 3 )
		#else
		if ( i < argc - 3 )
		#endif
		{
		arg->outputConfig = cmdline2config( argv[i] );
		if ( arg->outputConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )

lib_com/ivas_cnst.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -328,9 +328,7 @@ typedef enum
		#define ISM_Q_STEP 2.5f
		#define ISM_Q_STEP_BORDER 5.0f

		#ifdef NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA
		#define ISM_FEC_MAX 10
		#endif

		#define ISM_RADIUS_NBITS 6
		#define ISM_RADIUS_MIN 0.0f

lib_com/options.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -150,16 +150,11 @@

		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		/#define SPLIT_REND_WITH_HEAD_ROT / /* Dlb,FhG: Split Rendering contributions 21 and 35 */
		#define FIX_954_OTR_REF_VEC /* FhG: Fix forward vector direction for OTR REF VEC mode */

		#define FIX_638_ENERGIE_IAC_ROM_TABLES /* Orange : Missing left/right and coherence late reverb tables in binary format*/
		#define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */
		#define FIX_WARNING_SPLIT_RENDER /* Orange: fix warning on windows build vscode */
		#define FIX_INV_DIFFUSE_WEIGHT /* Orange : Fix error in energy compensation in late binaural reverb*/
		#define FIX_20_MS_FRAME_LEN_TABLES_CONVERTER /* Orange : generate_tables_converter tools can generate rom for 5 and 20 ms frame length */
		#define FIX_958_667_DISABLE_INITIAL_PLC_SUPPRESSION /* Ericsson: Fix related to issue 667 in IVAS BASOP. Handling of initial lost frame in IVAS causes non-BE on EVS BASOP 26.444 */
		#define FIX_957_REMOVE_PANNING_DEAD_CODE /* VA: Remove obsolete non-diegetic panning related code. */
		#define FIX_956_DECODER_COMMAND_LINE_FIX /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */
		#define FIX_955_FASTCONV_REND_IN_ISM /* VA: put FastConv rendering call under DEBUGGING */

		/* #################### End BE switches ################################## */
		@@ -170,11 +165,8 @@

		#define NONBE_FIX_BINARY_BINAURAL_READING /* Orange: Add support for reading binaural binary file */
		#define NONBE_FIX_AVG_IAC_CLDFB_REVERB /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */
		#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/
		#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA /* Nokia: issue 944: fix FEC error in OMASA */
		#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER /* Qualcomm: issue 953: fix order or ER channels in LC mode*/
		#define NONBE_FIX_935_SBA_REVERB /* FhG: issue 935: fix MSAN error for SBA related to BINAURAL_ROOM_REVERB */
		#define NONBE_FIX_949_MC_5MS_FRAMING /* Dlb: issue 949: fix for issue 949, distorted output in MC mode with 5ms framing*/
		#define NONBE_FIX_952_MC_PARAMUPMIX_5MS /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/
		#define NONBE_FIX_967_ISM_MONO_DMX /* FhG: issue 967: accumulating energies in ISM mono DMX */
		#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

lib_com/tcx_ltp.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -740,11 +740,7 @@ static void tcx_ltp_synth_filter_11_unequal_pitch(
		gain = prev_gain;
		gain_step = -prev_gain / length;

		#ifdef NONBE_FIX_856_TCX_LTP_SYNTH_FILTER
		for ( j = 0; j < length; j++ )
		#else
		for ( j = 0; j < length + L; j++ )
		#endif
		{
		s = 0;
		s2 = 0;
		@@ -765,14 +761,9 @@ static void tcx_ltp_synth_filter_11_unequal_pitch(
		gain += gain_step;
		}

		#ifdef NONBE_FIX_856_TCX_LTP_SYNTH_FILTER
		mvr2r( out - L, temp_buf, length + L );
		mvr2r( in + length, temp_buf + length + L, L );
		temp_ptr = &temp_buf[0] + L;
		#else
		mvr2r( out - MAX_TCX_LTP_FILTER_LEN, temp_buf, MAX_TRANSITION_LEN + 2 * MAX_TCX_LTP_FILTER_LEN );
		temp_ptr = &temp_buf[0] + MAX_TCX_LTP_FILTER_LEN;
		#endif

		m0 = temp_ptr;
		m1 = temp_ptr - 1;

lib_dec/ivas_jbm_dec.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -1042,13 +1042,6 @@ ivas_error ivas_jbm_dec_render(
		{
		ivas_dirac_dec_binaural_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, st_ivas->nchan_transport, p_output );
		}
		#ifndef FIX_957_REMOVE_PANNING_DEAD_CODE
		else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX )
		{
		*nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );
		ivas_apply_non_diegetic_panning( p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );
		}
		#endif
		else if ( st_ivas->renderer_type == RENDERER_PARAM_ISM \|\| st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )
		{
		ivas_param_ism_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output );
		@@ -1286,12 +1279,10 @@ ivas_error ivas_jbm_dec_render(
		}
		else if ( st_ivas->ivas_format == MC_FORMAT )
		{
		#ifdef NONBE_FIX_949_MC_5MS_FRAMING
		for ( n = 0; n < st_ivas->hTcBuffer->nchan_buffer_full; n++ )
		{
		p_tc[n] = &st_ivas->hTcBuffer->tc[n][st_ivas->hTcBuffer->n_samples_rendered];
		}
		#endif
		if ( st_ivas->mc_mode == MC_MODE_MCT )
		{
		int16_t crendInPlaceRotation = FALSE;

Admin message