Commit 652bf99c authored by emerit's avatar emerit
Browse files

fix error

parent 89be4d82

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+0 −7
Original line number Diff line number Diff line
@@ -72,11 +72,7 @@ 
const HRTF_READER_RENDERER_TYPE rend_types[IVAS_NB_RENDERER_TYPE] = {

    HRTF_READER_RENDERER_BINAURAL_FASTCONV,

    HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM,

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    HRTF_READER_RENDERER_BINAURAL_PARAMETRIC,

#else

    HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM,

#endif

    HRTF_READER_RENDERER_BINAURAL_MIXER_CONV,

    HRTF_READER_RENDERER_BINAURAL_MIXER_CONV_ROOM,

    HRTF_READER_RENDERER_BINAURAL_OBJECTS_TD,
@@ -391,9 +387,6 @@ int main( int argc, char *argv[] ) 
                        }

                    }

                    break;

#ifndef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

                case HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM:

#endif

                case HRTF_READER_RENDERER_BINAURAL_PARAMETRIC:

                    /* Parametric will always have just one set regardless of input and frequency. */

                    if ( ( input_param_bin_path != NULL ) && ( input_param_bin_file_name != NULL ) )

scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c

+54 −5
Original line number Diff line number Diff line
@@ -1840,8 +1840,9 @@ int generate_reverb_ivas_tables_from_sofa( const char *file_path ) 
#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

        Word16 *p_avg_lr_fx = NULL;

        Word16 *pCoherence_fx = NULL;

#endif

        Word16 factorQ;

#endif



        p_avg_lr = (float *) malloc( sizeof( float * ) * nr_fc_fft_filter * 2 );

        pCoherence = (float *) malloc( sizeof( float * ) * nr_fc_fft_filter );

        memset( p_avg_lr, 0, sizeof( float ) * nr_fc_fft_filter * 2 );
@@ -2607,7 +2608,7 @@ void update_h_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const int 
        fprintf( fp, "\nextern float %s_%s_coeff_diffuse_re_%2dkHz[BINAURAL_CHANNELS][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, maxTotalNumFreqSampPerIterationsDiffuse );

    }



    /*   float *pOut_to_bin_diffuse_im_fx[BINAURAL_CHANNELS];*/

    /*   float *pOut_to_bin_diffuse_im[BINAURAL_CHANNELS];*/

    if ( hrtf->pOut_to_bin_diffuse_im[0] == NULL )

    {

        fprintf( fp, "\nextern float *%s_%s_coeff_diffuse_im_%2dkHz[BINAURAL_CHANNELS];", DECLARATION_NAME, lscfg.name, samplerate / 1000 );
@@ -2718,7 +2719,6 @@ uint32_t compute_binary_size( HRTFS_DATA *hrtf, crend_hrtf_tables_dimensions *hr 
    hrtf_data_size += sizeof( uint16_t );                                     // index_frequency_max_diffuse

    hrtf_data_size += hrtf->max_num_ir * sizeof( float ) * BINAURAL_CHANNELS; // inv_diffuse_weight



    int16_t max_num_iterations_diffuse;

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    hrtf_data_size += sizeof( uint32_t ); // max_total_num_fsamp_per_iteration

#else
@@ -3516,7 +3516,12 @@ ivas_error write_binary_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, 


    for ( iIR = 0; iIR < hrtf->max_num_ir; iIR++ )

    {

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

        ( (float *) hrtf_bin_wptr )[iIR] = hrtf->inv_diffuse_weight[0][iIR];

#else

        sprintf( tmpStr, FORMAT_FLOAT, hrtf->inv_diffuse_weight[0][iIR] );

        sscanf( tmpStr, "%f", &( (float *) hrtf_bin_wptr )[iIR] );

#endif

    }



    data_size_tmp = hrtf->max_num_ir * sizeof( float );
@@ -3524,7 +3529,12 @@ ivas_error write_binary_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, 


    for ( iIR = 0; iIR < hrtf->max_num_ir; iIR++ )

    {

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

        ( (float *) hrtf_bin_wptr )[iIR] = hrtf->inv_diffuse_weight[1][iIR];

#else

        sprintf( tmpStr, FORMAT_FLOAT, hrtf->inv_diffuse_weight[1][iIR] );

        sscanf( tmpStr, "%f", &( (float *) hrtf_bin_wptr )[iIR] );

#endif

    }

    data_size_tmp = hrtf->max_num_ir * sizeof( float );

    hrtf_bin_wptr += data_size_tmp;
@@ -3551,7 +3561,13 @@ ivas_error write_binary_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, 
                // memcpy( hrtf_bin_wptr, coeff_rptr, data_size_tmp );

                for ( iTap = 0; iTap < hrtf->pIndex_frequency_max[iIR][iChan][iIter]; iTap++ )

                {

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

                    ( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap];

#else

                    //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap];

                    sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] );

                    sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) );

#endif

                }

                hrtf_bin_wptr += data_size_tmp;

                coeff_rptr += hrtf->pIndex_frequency_max[iIR][iChan][iIter];
@@ -3570,7 +3586,13 @@ ivas_error write_binary_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, 
                data_size_tmp = hrtf->pIndex_frequency_max[iIR][iChan][iIter] * sizeof( float );

                for ( iTap = 0; iTap < hrtf->pIndex_frequency_max[iIR][iChan][iIter]; iTap++ )

                {

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

                    ( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap];

#else

                    //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap];

                    sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] );

                    sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) );

#endif

                }

                hrtf_bin_wptr += data_size_tmp;

                coeff_rptr += hrtf->pIndex_frequency_max[iIR][iChan][iIter];
@@ -3597,7 +3619,13 @@ ivas_error write_binary_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, 
                data_size_tmp = hrtf->pIndex_frequency_max_diffuse[iChan][iIter] * sizeof( float );

                for ( iTap = 0; iTap < hrtf->pIndex_frequency_max_diffuse[iChan][iIter]; iTap++ )

                {

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

                    ( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap];

#else

                    //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap];

                    sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] );

                    sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) );

#endif

                }

                hrtf_bin_wptr += data_size_tmp;

                coeff_rptr += hrtf->pIndex_frequency_max_diffuse[iChan][iIter];
@@ -3613,7 +3641,13 @@ ivas_error write_binary_file( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, 
                data_size_tmp = hrtf->pIndex_frequency_max_diffuse[iChan][iIter] * sizeof( float );

                for ( iTap = 0; iTap < hrtf->pIndex_frequency_max_diffuse[iChan][iIter]; iTap++ )

                {

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

                    ( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap];

#else

                    //( (float *) hrtf_bin_wptr )[iTap] = coeff_rptr[iTap];

                    sprintf( tmpStr, FORMAT_FLOAT, coeff_rptr[iTap] );

                    sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) );

#endif

                }

                hrtf_bin_wptr += data_size_tmp;

                coeff_rptr += hrtf->pIndex_frequency_max_diffuse[iChan][iIter];
@@ -3896,17 +3930,32 @@ ivas_error write_reverb_to_binary_file( float *pEner_l, float *pEner_r, float *p 


    for ( iTap = 0; iTap < len; iTap++ )

    {

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

        ( (float *) hrtf_bin_wptr )[iTap] = pEner_l[iTap];

#else

        sprintf( tmpStr, FORMAT_FLOAT, pEner_l[iTap] );

        sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) );

#endif

    }

    hrtf_bin_wptr += sizeof( float ) * len;

    for ( iTap = 0; iTap < len; iTap++ )

    {

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

        ( (float *) hrtf_bin_wptr )[iTap] = pEner_r[iTap];

#else

        sprintf( tmpStr, FORMAT_FLOAT, pEner_r[iTap] );

        sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) );

#endif

    }

    hrtf_bin_wptr += sizeof( float ) * len;

    for ( iTap = 0; iTap < len; iTap++ )

    {

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

        ( (float *) hrtf_bin_wptr )[iTap] = pCoherence[iTap];

#else

        sprintf( tmpStr, FORMAT_FLOAT, pCoherence[iTap] );

        sscanf( tmpStr, "%f", &( ( (float *) hrtf_bin_wptr )[iTap] ) );

#endif

    }

    hrtf_bin_wptr += sizeof( float ) * len;