Commit 31fd7cef authored by vaclav's avatar vaclav
Browse files

revert some changes

parent f8ed5724

lib_rend/ivas_crend.c

+38 −38
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static ivas_error ivas_rend_initCrend( 
                    if ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_48kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_48kHz[j];

#ifdef FIX_1123_CREND_16BIT_ROM

                        sizeRom = sizeof( CRendBin_Combined_BRIR_coeff_diffuse_re_48kHz_fx ) / sizeof( int16_t ) / 2;

                        if ( ( hHrtf->pOut_to_bin_diffuse_re[j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -314,7 +314,7 @@ static ivas_error ivas_rend_initCrend( 
                    else

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_48kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_48kHz[j];

#ifdef FIX_1123_CREND_16BIT_ROM

                        hHrtf->pOut_to_bin_diffuse_re[j] = (float *) CRendBin_Combined_HRIR_coeff_diffuse_re_48kHz_fx[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = (float *) CRendBin_Combined_HRIR_coeff_diffuse_re_48kHz_fx[j];
@@ -353,7 +353,7 @@ static ivas_error ivas_rend_initCrend( 
                    if ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[j];

#ifdef FIX_1123_CREND_16BIT_ROM

                        sizeRom = sizeof( CRendBin_Combined_BRIR_coeff_diffuse_re_32kHz_fx ) / sizeof( int16_t ) / 2;

                        if ( ( hHrtf->pOut_to_bin_diffuse_re[j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -378,7 +378,7 @@ static ivas_error ivas_rend_initCrend( 
                    else

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_32kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_32kHz[j];

#ifdef FIX_1123_CREND_16BIT_ROM

                        hHrtf->pOut_to_bin_diffuse_re[j] = (float *) CRendBin_Combined_HRIR_coeff_diffuse_re_32kHz_fx[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = (float *) CRendBin_Combined_HRIR_coeff_diffuse_re_32kHz_fx[j];
@@ -418,7 +418,7 @@ static ivas_error ivas_rend_initCrend( 
                    if ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[j];

#ifdef FIX_1123_CREND_16BIT_ROM

                        sizeRom = sizeof( CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz_fx ) / sizeof( int16_t ) / 2;

                        if ( ( hHrtf->pOut_to_bin_diffuse_re[j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -443,7 +443,7 @@ static ivas_error ivas_rend_initCrend( 
                    else

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_16kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_16kHz[j];

#ifdef FIX_1123_CREND_16BIT_ROM

                        hHrtf->pOut_to_bin_diffuse_re[j] = (float *) CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz_fx[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = (float *) CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz_fx[j];
@@ -494,7 +494,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_Combined_BRIR_inv_diffuse_weight_48kHz[j][tmp];

                            hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_48kHz[tmp][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_Combined_BRIR_pIndex_frequency_max_48kHz[tmp][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_48kHz[tmp][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_Combined_BRIR_coeff_re_48kHz_fx ) / HRTF_LS_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -520,7 +520,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_Combined_HRIR_inv_diffuse_weight_48kHz[j][tmp];

                            hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_48kHz[tmp][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_Combined_HRIR_pIndex_frequency_max_48kHz[tmp][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_48kHz[tmp][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_Combined_HRIR_coeff_re_48kHz_fx ) / HRTF_LS_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -552,7 +552,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_Combined_BRIR_inv_diffuse_weight_32kHz[j][tmp];

                            hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_32kHz[tmp][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz[tmp][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz[tmp][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_Combined_BRIR_coeff_re_32kHz_fx ) / HRTF_LS_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -578,7 +578,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_Combined_HRIR_inv_diffuse_weight_32kHz[j][tmp];

                            hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_32kHz[tmp][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_Combined_HRIR_pIndex_frequency_max_32kHz[tmp][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_32kHz[tmp][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_Combined_HRIR_coeff_re_32kHz_fx ) / HRTF_LS_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -610,7 +610,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_Combined_BRIR_inv_diffuse_weight_16kHz[j][tmp];

                            hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_16kHz[tmp][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz[tmp][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz[tmp][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_Combined_BRIR_coeff_re_16kHz_fx ) / HRTF_LS_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -636,7 +636,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_Combined_HRIR_inv_diffuse_weight_16kHz[j][tmp];

                            hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_16kHz[tmp][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz[tmp][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz[tmp][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_Combined_HRIR_coeff_re_16kHz_fx ) / HRTF_LS_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -682,7 +682,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_48kHz[j][i];

                            hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_48kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_HOA3_HRIR_pIndex_frequency_max_48kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_48kHz[i][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_HOA3_HRIR_coeff_re_48kHz_fx ) / HOA3_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -708,9 +708,9 @@ static ivas_error ivas_rend_initCrend( 
                    for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_48kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_48kHz[j];

                        hHrtf->pOut_to_bin_diffuse_re[j] = (float *) CRendBin_HOA3_HRIR_coeff_diffuse_re_48kHz[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = (float *) CRendBin_HOA3_HRIR_coeff_diffuse_im_48kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_48kHz[j];

                        hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA3_HRIR_coeff_diffuse_re_48kHz[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_48kHz[j];

                    }

                }

                else if ( output_Fs == 32000 )
@@ -725,7 +725,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_32kHz[j][i];

                            hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_32kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_HOA3_HRIR_pIndex_frequency_max_32kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_32kHz[i][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_HOA3_HRIR_coeff_re_32kHz_fx ) / HOA3_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -752,7 +752,7 @@ static ivas_error ivas_rend_initCrend( 
                    for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_32kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_32kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_32kHz[j];

                        hHrtf->pOut_to_bin_diffuse_re[j] = (float *) CRendBin_HOA3_HRIR_coeff_diffuse_re_32kHz[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = (float *) CRendBin_HOA3_HRIR_coeff_diffuse_im_32kHz[j];

                    }
@@ -769,7 +769,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_16kHz[j][i];

                            hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_16kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_HOA3_HRIR_pIndex_frequency_max_16kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_16kHz[i][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_HOA3_HRIR_coeff_re_16kHz_fx ) / HOA3_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -796,7 +796,7 @@ static ivas_error ivas_rend_initCrend( 
                    for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_16kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_16kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_16kHz[j];

                        hHrtf->pOut_to_bin_diffuse_re[j] = (float *) CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = (float *) CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[j];

                    }
@@ -820,7 +820,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_HOA2_HRIR_inv_diffuse_weight_48kHz[j][i];

                            hHrtf->num_iterations[i][j] = CRendBin_HOA2_HRIR_num_iterations_48kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_HOA2_HRIR_pIndex_frequency_max_48kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA2_HRIR_pIndex_frequency_max_48kHz[i][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_HOA2_HRIR_coeff_re_48kHz_fx ) / HOA2_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -846,9 +846,9 @@ static ivas_error ivas_rend_initCrend( 
                    for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_HOA2_HRIR_num_iterations_diffuse_48kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_48kHz[j];

                        hHrtf->pOut_to_bin_diffuse_re[j] = (float *) CRendBin_HOA2_HRIR_coeff_diffuse_re_48kHz[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = (float *) CRendBin_HOA2_HRIR_coeff_diffuse_im_48kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_48kHz[j];

                        hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA2_HRIR_coeff_diffuse_re_48kHz[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA2_HRIR_coeff_diffuse_im_48kHz[j];

                    }

                }

                else if ( output_Fs == 32000 )
@@ -863,7 +863,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_HOA2_HRIR_inv_diffuse_weight_32kHz[j][i];

                            hHrtf->num_iterations[i][j] = CRendBin_HOA2_HRIR_num_iterations_32kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_HOA2_HRIR_pIndex_frequency_max_32kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA2_HRIR_pIndex_frequency_max_32kHz[i][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_HOA2_HRIR_coeff_re_32kHz_fx ) / HOA2_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -890,9 +890,9 @@ static ivas_error ivas_rend_initCrend( 
                    for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_HOA2_HRIR_num_iterations_diffuse_32kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_32kHz[j];

                        hHrtf->pOut_to_bin_diffuse_re[j] = (float *) CRendBin_HOA2_HRIR_coeff_diffuse_re_32kHz[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = (float *) CRendBin_HOA2_HRIR_coeff_diffuse_im_32kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_32kHz[j];

                        hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA2_HRIR_coeff_diffuse_re_32kHz[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA2_HRIR_coeff_diffuse_im_32kHz[j];

                    }

                }

                else if ( output_Fs == 16000 )
@@ -907,7 +907,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_HOA2_HRIR_inv_diffuse_weight_16kHz[j][i];

                            hHrtf->num_iterations[i][j] = CRendBin_HOA2_HRIR_num_iterations_16kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_HOA2_HRIR_pIndex_frequency_max_16kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA2_HRIR_pIndex_frequency_max_16kHz[i][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_HOA2_HRIR_coeff_re_16kHz_fx ) / HOA2_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -934,9 +934,9 @@ static ivas_error ivas_rend_initCrend( 
                    for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_HOA2_HRIR_num_iterations_diffuse_16kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_16kHz[j];

                        hHrtf->pOut_to_bin_diffuse_re[j] = (float *) CRendBin_HOA2_HRIR_coeff_diffuse_re_16kHz[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = (float *) CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA2_HRIR_pIndex_frequency_max_diffuse_16kHz[j];

                        hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA2_HRIR_coeff_diffuse_re_16kHz[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz[j];

                    }

                }

                else
@@ -958,7 +958,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_FOA_HRIR_inv_diffuse_weight_48kHz[j][i];

                            hHrtf->num_iterations[i][j] = CRendBin_FOA_HRIR_num_iterations_48kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_FOA_HRIR_pIndex_frequency_max_48kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_FOA_HRIR_pIndex_frequency_max_48kHz[i][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_FOA_HRIR_coeff_re_48kHz_fx ) / FOA_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -984,7 +984,7 @@ static ivas_error ivas_rend_initCrend( 
                    for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_FOA_HRIR_num_iterations_diffuse_48kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_48kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_48kHz[j];

                        hHrtf->pOut_to_bin_diffuse_re[j] = (float *) CRendBin_FOA_HRIR_coeff_diffuse_re_48kHz[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = (float *) CRendBin_FOA_HRIR_coeff_diffuse_im_48kHz[j];

                    }
@@ -1001,7 +1001,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_FOA_HRIR_inv_diffuse_weight_32kHz[j][i];

                            hHrtf->num_iterations[i][j] = CRendBin_FOA_HRIR_num_iterations_32kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_FOA_HRIR_pIndex_frequency_max_32kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_FOA_HRIR_pIndex_frequency_max_32kHz[i][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_FOA_HRIR_coeff_re_32kHz_fx ) / FOA_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -1028,7 +1028,7 @@ static ivas_error ivas_rend_initCrend( 
                    for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_FOA_HRIR_num_iterations_diffuse_32kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_32kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_32kHz[j];

                        hHrtf->pOut_to_bin_diffuse_re[j] = (float *) CRendBin_FOA_HRIR_coeff_diffuse_re_32kHz[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = (float *) CRendBin_FOA_HRIR_coeff_diffuse_im_32kHz[j];

                    }
@@ -1045,7 +1045,7 @@ static ivas_error ivas_rend_initCrend( 
                        {

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_FOA_HRIR_inv_diffuse_weight_16kHz[j][i];

                            hHrtf->num_iterations[i][j] = CRendBin_FOA_HRIR_num_iterations_16kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = (uint16_t *) CRendBin_FOA_HRIR_pIndex_frequency_max_16kHz[i][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_FOA_HRIR_pIndex_frequency_max_16kHz[i][j];

#ifdef FIX_1123_CREND_16BIT_ROM

                            sizeRom = sizeof( CRendBin_FOA_HRIR_coeff_re_16kHz_fx ) / FOA_CHANNELS / sizeof( int16_t ) / 2;

                            if ( ( hHrtf->pOut_to_bin_re[i][j] = (float *) malloc( sizeof( float ) * sizeRom ) ) == NULL )
@@ -1072,7 +1072,7 @@ static ivas_error ivas_rend_initCrend( 
                    for ( j = 0; j < BINAURAL_CHANNELS; j++ )

                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_FOA_HRIR_num_iterations_diffuse_16kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = (uint16_t *) CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_16kHz[j];

                        hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_FOA_HRIR_pIndex_frequency_max_diffuse_16kHz[j];

                        hHrtf->pOut_to_bin_diffuse_re[j] = (float *) CRendBin_FOA_HRIR_coeff_diffuse_re_16kHz[j];

                        hHrtf->pOut_to_bin_diffuse_im[j] = (float *) CRendBin_FOA_HRIR_coeff_diffuse_im_16kHz[j];

                    }

lib_rend/ivas_rom_binaural_crend_head.c

+67 −63

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_rom_binaural_crend_head.h

+114 −70

File changed.

Preview size limit exceeded, changes collapsed.