Fix for 3GPP issue 1720: Memory allocation in ivas_dirac_dec_output_synthesis_process_slot_fx() (41ab0d52) · Commits · SA4 / Audio / IVAS BASOP

lib_rend/ivas_dirac_output_synthesis_dec_fx.c

+29 −22

Original line number	Diff line number	Diff line
		@@ -200,6 +200,12 @@ ivas_error ivas_dirac_dec_output_synthesis_open_fx(
		}
		dirac_output_synthesis_state->cy_cross_dir_smooth_prev_len = size;
		move16();

		IF( ( dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx = (Word16 ) malloc( hSpatParamRendCom->num_freq_bands hDirACRend->num_outputs_dir * sizeof( Word32 ) ) ) == NULL )
		{
		return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
		}

		IF( EQ_32( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
		{
		dirac_output_synthesis_state->cy_auto_dir_smooth_prev_fx = NULL;
		@@ -609,6 +615,11 @@ void ivas_dirac_dec_output_synthesis_close_fx(
		free( ( dirac_output_synthesis_state )->cy_cross_dir_smooth_prev_fx );
		( dirac_output_synthesis_state )->cy_cross_dir_smooth_prev_fx = NULL;
		}
		IF( ( dirac_output_synthesis_state )->Q_temp_cy_cross_dir_smooth_fx != NULL )
		{
		free( ( dirac_output_synthesis_state )->Q_temp_cy_cross_dir_smooth_fx );
		( dirac_output_synthesis_state )->Q_temp_cy_cross_dir_smooth_fx = NULL;
		}
		IF( ( dirac_output_synthesis_state )->cy_auto_diff_smooth_prev_fx != NULL )
		{
		free( ( dirac_output_synthesis_state )->cy_auto_diff_smooth_prev_fx );
		@@ -818,13 +829,10 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		num_freq_bands ); /h_dirac_output_synthesis_state->diffuse_power_factor_q+Q31-Q31->h_dirac_output_synthesis_state->diffuse_power_factor_q/

		/Direct gain/

		Word16 Q_temp_cy_cross_dir_smooth_fx = (Word16 ) malloc( num_freq_bands * num_channels_dir * sizeof( Word16 ) );

		tmp16 = imult1616( num_freq_bands, num_channels_dir );
		FOR( Word16 kk = 0; kk < tmp16; kk++ )
		{
		Q_temp_cy_cross_dir_smooth_fx[kk] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[kk] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
		move16();
		}

		@@ -901,13 +909,13 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		{
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, sub( 31, sqr_exp ) ) ); /h_dirac_output_synthesis_state->q_cy_cross_dir_smooth-> (31-sqr_exp) /
		move32();
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		move16();
		}
		ELSE
		{
		sqr = L_shr( sqr, sub( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) ); /( 31- sqr_exp )-> h_dirac_output_synthesis_state->q_cy_cross_dir_smooth/
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
		move16();
		}
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q_temp_cy_cross_dir_smooth_fx/
		@@ -917,7 +925,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		{
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /31-sqr_exp/
		move32();
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		move16();
		}
		}
		@@ -969,13 +977,13 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		{
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, sub( 31, sqr_exp ) ) ); /h_dirac_output_synthesis_state->q_cy_cross_dir_smooth->Q( 31- sqr_exp )/
		move32();
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		move16();
		}
		ELSE
		{
		sqr = L_shr( sqr, sub( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) ); /Q(31- sqr_exp)->h_dirac_output_synthesis_state->q_cy_cross_dir_smooth/
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
		move16();
		}
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q_temp_cy_cross_dir_smooth_fx[ch_idx num_freq_bands + k]*/
		@@ -985,7 +993,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		{
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q(31- sqr_exp)/
		move32();
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		move16();
		}
		}
		@@ -1051,13 +1059,13 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		{
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, sub( 31, sqr_exp ) ) ); /h_dirac_output_synthesis_state->q_cy_cross_dir_smooth->Q( 31- sqr_exp )/
		move32();
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		move16();
		}
		ELSE
		{
		sqr = L_shr( sqr, sub( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) ); /Q(31- sqr_exp)->h_dirac_output_synthesis_state->q_cy_cross_dir_smooth/
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
		move16();
		}
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q_temp_cy_cross_dir_smooth_fx[ch_idx num_freq_bands + k]*/
		@@ -1067,7 +1075,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		{
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q(31- sqr_exp)/
		move32();
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		move16();
		}
		}
		@@ -1092,13 +1100,13 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		{
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, sub( 31, sqr_exp ) ) ); /h_dirac_output_synthesis_state->q_cy_cross_dir_smooth->Q(31- sqr_exp)/
		move32();
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		move16();
		}
		ELSE
		{
		sqr = L_shr( sqr, sub( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) ); /Q(31-sqr_exp)->h_dirac_output_synthesis_state->q_cy_cross_dir_smooth/
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
		move16();
		}
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q_temp_cy_cross_dir_smooth_fx[ch_idx num_freq_bands + k]*/
		@@ -1108,7 +1116,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		{
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q(31-sqr_exp)/
		move32();
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		move16();
		}
		}
		@@ -1125,13 +1133,13 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		{
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_shr( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sub( h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, sub( 31, sqr_exp ) ) ); /h_dirac_output_synthesis_state->q_cy_cross_dir_smooth, Q( 31- sqr_exp )/
		move32();
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		move16();
		}
		ELSE
		{
		sqr = L_shr( sqr, sub( sub( 31, sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) ); /Q( 31- sqr_exp ), h_dirac_output_synthesis_state->q_cy_cross_dir_smooth/
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = h_dirac_output_synthesis_state->q_cy_cross_dir_smooth;
		move16();
		}
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q_temp_cy_cross_dir_smooth_fx[ch_idx num_freq_bands + k]*/
		@@ -1141,7 +1149,7 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		{
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = L_add( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k], sqr ); /Q(31-sqr_exp)/
		move32();
		Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + k] = sub( 31, sqr_exp );
		move16();
		}
		}
		@@ -1152,16 +1160,15 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
		tmp16 = imult1616( num_freq_bands, num_channels_dir );
		FOR( Word16 kk = 0; kk < tmp16; kk++ )
		{
		temp = s_min( Q_temp_cy_cross_dir_smooth_fx[kk], temp );
		temp = s_min( h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[kk], temp );
		}
		h_dirac_output_synthesis_state->q_cy_cross_dir_smooth = temp;
		move16();
		FOR( Word16 kk = 0; kk < tmp16; kk++ )
		{
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk] = L_shl( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk], sub( temp, Q_temp_cy_cross_dir_smooth_fx[kk] ) ); /Q_temp_cy_cross_dir_smooth_fx[kk]->temp/
		h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk] = L_shl( h_dirac_output_synthesis_state->cy_cross_dir_smooth_fx[kk], sub( temp, h_dirac_output_synthesis_state->Q_temp_cy_cross_dir_smooth_fx[kk] ) ); /Q_temp_cy_cross_dir_smooth_fx[kk]->temp/
		move32();
		}
		free( Q_temp_cy_cross_dir_smooth_fx );
		/Directional gain (panning)/
		Word16 temp_q = sub( add( h_dirac_output_synthesis_state->direct_power_factor_q, h_dirac_output_synthesis_state->direct_responses_q ), 31 );
		IF( LT_16( temp_q, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth ) )

lib_rend/ivas_stat_rend.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -352,6 +352,8 @@ typedef struct dirac_output_synthesis_state_structure
		Word16 q_cy_cross_dir_smooth; /* Target cross PSD of direct sound. Size: num_freq_bandsnum_channels. /
		Word16 q_cy_auto_diff_smooth; /* Target auto PSD of diffuse sound. Size: num_freq_bandsnum_channels. /

		Word16 *Q_temp_cy_cross_dir_smooth_fx;

		Word16 cy_auto_dir_smooth_len; /* Target auto PSD of direct sound. Size: num_freq_bandsnum_channels. /
		Word16 cy_cross_dir_smooth_len; /* Target cross PSD of direct sound. Size: num_freq_bandsnum_channels. /
		Word16 cy_auto_diff_smooth_len; /* Target auto PSD of diffuse sound. Size: num_freq_bandsnum_channels. /