formatting (acf9be80) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_cpe_dec.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -405,8 +405,7 @@ ivas_error ivas_cpe_dec(
		}
		else
		{
		stereo_dft_dec( hCPE->hStereoDft, sts[0], DFT, hCPE->input_mem[1], hCPE->hStereoCng, 0, 0, 0, 0, 0, 0,
		MAX_PARAM_SPATIAL_SUBFRAMES );
		stereo_dft_dec( hCPE->hStereoDft, sts[0], DFT, hCPE->input_mem[1], hCPE->hStereoCng, 0, 0, 0, 0, 0, 0, MAX_PARAM_SPATIAL_SUBFRAMES );
		}

		/* synthesis iFFT */
		@@ -829,7 +828,6 @@ void destroy_cpe_dec(
		int16_t n;
		Decoder_State *st;


		for ( n = 0; n < CPE_CHANNELS; n++ )
		{
		st = hCPE->hCoreCoder[n];
		@@ -930,7 +928,6 @@ static void read_stereo_mode_and_bwidth(

		if ( st_ivas->bfi \|\| st_ivas->hDecoderConfig->ivas_total_brate < IVAS_SID_5k2 )
		{

		hCPE->element_mode = hCPE->last_element_mode;
		}

lib_dec/ivas_dec.c

+4 −13

Original line number	Diff line number	Diff line
		@@ -261,15 +261,8 @@ ivas_error ivas_dec(
		}
		else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )
		{
		if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper,
		AUDIO_CONFIG_7_1_4,
		AUDIO_CONFIG_BINAURAL_ROOM_IR,
		NULL,
		NULL,
		NULL,
		NULL,
		p_output,
		output_Fs ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper, AUDIO_CONFIG_7_1_4, AUDIO_CONFIG_BINAURAL_ROOM_IR, NULL,
		NULL, NULL, NULL, p_output, output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -481,8 +474,7 @@ ivas_error ivas_dec(
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )
		{
		if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig,
		st_ivas->hCombinedOrientationData,
		&st_ivas->hIntSetup, st_ivas->hEFAPdata, p_output, output_Fs ) ) != IVAS_ERR_OK )
		st_ivas->hCombinedOrientationData, &st_ivas->hIntSetup, st_ivas->hEFAPdata, p_output, output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		@@ -540,8 +532,7 @@ ivas_error ivas_dec(
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )
		{
		if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig,
		st_ivas->hCombinedOrientationData,
		&st_ivas->hIntSetup, st_ivas->hEFAPdata, p_output, output_Fs ) ) != IVAS_ERR_OK )
		st_ivas->hCombinedOrientationData, &st_ivas->hIntSetup, st_ivas->hEFAPdata, p_output, output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		}

lib_dec/ivas_jbm_dec.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -811,8 +811,7 @@ ivas_error ivas_jbm_dec_render(
		/* Rendering */
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )
		{
		if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig,
		st_ivas->hCombinedOrientationData,
		if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hCombinedOrientationData,
		&st_ivas->hIntSetup, st_ivas->hEFAPdata, st_ivas->hTcBuffer, p_tc, p_output, *nSamplesRendered, output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -1033,8 +1032,7 @@ ivas_error ivas_jbm_dec_flush_renderer(
		{
		if ( renderer_type_old == RENDERER_BINAURAL_MIXER_CONV \|\| renderer_type_old == RENDERER_BINAURAL_MIXER_CONV_ROOM )
		{
		if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, intern_config_old, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig,
		st_ivas->hCombinedOrientationData,
		if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, intern_config_old, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hCombinedOrientationData,
		hIntSetupOld, st_ivas->hEFAPdata, st_ivas->hTcBuffer, hTcBuffer->tc, p_output, hTcBuffer->n_samples_granularity, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;

lib_enc/ivas_cpe_enc.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -278,6 +278,7 @@ ivas_error ivas_cpe_enc(
		stereo_dft_config( hCPE->hStereoDft == NULL ? NULL : hCPE->hStereoDft->hConfig, hCPE->element_brate, &sts[0]->bits_frame_nominal, &sts[1]->bits_frame_nominal );
		}
		}

		if ( hCPE->element_mode == IVAS_CPE_TD )
		{
		if ( hCPE->hStereoTD->tdm_LRTD_flag )
		@@ -837,6 +838,7 @@ ivas_error create_cpe_enc(
		copy_encoder_config( st_ivas, st, 1 );
		st->total_brate = hCPE->element_brate / ( st_ivas->nCPE > 1 ? 1 : CPE_CHANNELS ); /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */
		st->mct_chan_mode = MCT_CHAN_MODE_REGULAR;

		if ( ( error = init_encoder( st,
		#ifdef IND_LIST_DYN
		st_ivas,