Merge branch '1119-split-rendering-crashes-in-jbm' into 1119-split-rendering-crashes-in-jbm-tests (f63d1a55) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_error.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -134,9 +134,7 @@ typedef enum
		IVAS_ERR_BITSTREAM_READER_INVALID_FORMAT,
		IVAS_ERR_NO_FILE_OPEN,
		IVAS_ERR_SAMPLING_RATE_UNKNOWN,
		#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK
		IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT,
		#endif

		/----------------------------------------
		* renderer (lib_rend only) *
		@@ -274,10 +272,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code )
		return "Invalid input format";
		case IVAS_ERR_INVALID_INDEX:
		return "Invalid index";
		#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK
		case IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT:
		return "Euler angles were detected in the input but only Quaternions are supported";
		#endif
		default:
		break;
		}

lib_com/ivas_prot.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -308,14 +308,9 @@ ivas_error ivas_init_decoder(

		ivas_error ivas_output_buff_dec(
		float p_output_f[], / i/o: output audio buffers */
		#ifdef FIX_1330_JBM_MEMORY
		const int16_t nchan_out_buff, /* i : number of output channels */
		const int16_t Opt_tsm, /* i : TSM option flag */
		DECODER_TC_BUFFER_HANDLE hTcBuffer /* i : TSM buffer handle */
		#else
		const int16_t nchan_out_buff_old, /* i : previous frame number of output channels*/
		const int16_t nchan_out_buff /* i : number of output channels */
		#endif
		);

		ivas_error stereo_dmx_evs_init_encoder(
		@@ -5829,12 +5824,7 @@ void ivas_omasa_separate_object_render_jbm(
		const uint16_t nSamplesRendered, /* i : number of samples rendered */
		float input_f[][L_FRAME48k], /* i : separated object signal */
		float output_f[], / o : rendered time signal */
		#ifdef FIX_1330_JBM_MEMORY
		const int16_t subframes_rendered /* i : number of subframes rendered */
		#else
		const int16_t subframes_rendered, /* i : number of subframes rendered */
		const int16_t slots_rendered /* i : number of CLDFB slots rendered */
		#endif
		);

		void ivas_omasa_encode_masa_to_total(

lib_com/ivas_tools.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -198,24 +198,18 @@ void ivas_buffer_deinterleaved_to_interleaved(
		)
		{
		int16_t ch, m;
		#ifdef FIX_1330_JBM_MEMORY
		float buffer[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][L_FRAME48k]; /* temp buffer needed when "audio[]" and "audio_out[]" are the same */

		for ( ch = 0; ch < n_channels; ch++ )
		{
		mvr2r( audio[ch], buffer[ch], frame_length );
		}
		#endif

		for ( ch = 0; ch < n_channels; ch++ )
		{
		for ( m = 0; m < frame_length; m++ )
		{
		#ifdef FIX_1330_JBM_MEMORY
		audio_out[m * n_channels + ch] = buffer[ch][m];
		#else
		audio_out[m * n_channels + ch] = audio[ch][m];
		#endif
		}
		}

lib_com/options.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -164,9 +164,7 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#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 FIX_1330_JBM_MEMORY /* VA: issue 1330: memory savings in the JBM decoder */
		#define FIX_1370_EXTERNAL_ORIENTATION_CHECK /* Nokia: add sanity check for Euler angles for external orientations */
		#define FIX_1371_EARLY_PART_INIT_FASTCONV /* Nokia: fix uninitialized variable in FASTCONV path of binaural reverb init */
		#define FIX_1995_REVERB_INIT /* issue 1995: Fix use-of-uninitialized-value in ivas_binaural_reverb_init() */

		/* #################### End BE switches ################################## */

		@@ -178,6 +176,7 @@
		#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_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 NONBE_1328_FIX_NON_LINEARITY /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0 */
		#define NONBE_1321_JBM_ASSERT_BITRATE_SWITCHING /* FhG: Fix assert being hit in JBM code during rate switching */

		/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_binRenderer_internal.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -999,6 +999,7 @@ ivas_error ivas_binRenderer_open(
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM \|\| ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
		{
		pRoomAcoustics = ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ? &( st_ivas->hRenderConfig->roomAcoustics ) : NULL;

		if ( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ),
		st_ivas->hHrtfStatistics,
		hBinRenderer->conv_band,
		@@ -1007,12 +1008,7 @@ ivas_error ivas_binRenderer_open(
		st_ivas->hDecoderConfig->output_Fs,
		st_ivas->hHrtfFastConv->fastconvReverberationTimes,
		st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections,
		#ifdef FIX_1371_EARLY_PART_INIT_FASTCONV
		NULL
		#else
		hBinRenderer->earlyPartEneCorrection
		#endif
		) ) != IVAS_ERR_OK )
		NULL ) ) != IVAS_ERR_OK )

		{
		return error;