Commit bc49baff authored by vaclav's avatar vaclav
Browse files

revert some changes

parent 31fd7cef

lib_rend/ivas_crend.c

+10 −10
Original line number Diff line number Diff line
@@ -753,8 +753,8 @@ static ivas_error ivas_rend_initCrend( 
                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_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];

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

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

                    }

                }

                else if ( output_Fs == 16000 )
@@ -797,8 +797,8 @@ static ivas_error ivas_rend_initCrend( 
                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_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];

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

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

                    }

                }

                else
@@ -985,8 +985,8 @@ static ivas_error ivas_rend_initCrend( 
                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_FOA_HRIR_num_iterations_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];

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

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

                    }

                }

                else if ( output_Fs == 32000 )
@@ -1029,8 +1029,8 @@ static ivas_error ivas_rend_initCrend( 
                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_FOA_HRIR_num_iterations_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];

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

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

                    }

                }

                else if ( output_Fs == 16000 )
@@ -1073,8 +1073,8 @@ static ivas_error ivas_rend_initCrend( 
                    {

                        hHrtf->num_iterations_diffuse[j] = CRendBin_FOA_HRIR_num_iterations_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];

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

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

                    }

                }

                else

lib_rend/ivas_hrtf.c

+9 −9
Original line number Diff line number Diff line
@@ -282,19 +282,19 @@ ivas_error ivas_HRTF_statistics_init( 
    switch ( sampleRate )

    {

        case 48000:

            HrtfStatistics->average_energy_l = (float *) defaultHRIR_left_avg_power_48kHz;

            HrtfStatistics->average_energy_r = (float *) defaultHRIR_right_avg_power_48kHz;

            HrtfStatistics->inter_aural_coherence = (float *) defaultHRIR_coherence_48kHz;

            HrtfStatistics->average_energy_l = defaultHRIR_left_avg_power_48kHz;

            HrtfStatistics->average_energy_r = defaultHRIR_right_avg_power_48kHz;

            HrtfStatistics->inter_aural_coherence = defaultHRIR_coherence_48kHz;

            break;

        case 32000:

            HrtfStatistics->average_energy_l = (float *) defaultHRIR_left_avg_power_32kHz;

            HrtfStatistics->average_energy_r = (float *) defaultHRIR_right_avg_power_32kHz;

            HrtfStatistics->inter_aural_coherence = (float *) defaultHRIR_coherence_32kHz;

            HrtfStatistics->average_energy_l = defaultHRIR_left_avg_power_32kHz;

            HrtfStatistics->average_energy_r = defaultHRIR_right_avg_power_32kHz;

            HrtfStatistics->inter_aural_coherence = defaultHRIR_coherence_32kHz;

            break;

        case 16000:

            HrtfStatistics->average_energy_l = (float *) defaultHRIR_left_avg_power_16kHz;

            HrtfStatistics->average_energy_r = (float *) defaultHRIR_right_avg_power_16kHz;

            HrtfStatistics->inter_aural_coherence = (float *) defaultHRIR_coherence_16kHz;

            HrtfStatistics->average_energy_l = defaultHRIR_left_avg_power_16kHz;

            HrtfStatistics->average_energy_r = defaultHRIR_right_avg_power_16kHz;

            HrtfStatistics->inter_aural_coherence = defaultHRIR_coherence_16kHz;

            break;

    }

    HrtfStatistics->fromROM = TRUE;