Commit 356b9c3b authored by emerit's avatar emerit
Browse files

improve rom variables naming

parent b8e9c305

scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c

+55 −5
Original line number Diff line number Diff line
@@ -3149,8 +3149,24 @@ void update_c_file_fx( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const 


    fprintf( fp, "\nconst Word16 %s_%s_coeff_Q_%2dkHz_fx = %d;", DECLARATION_NAME, lscfg.name, samplerate / 1000, factor_Q[2] );



    /* float *pOut_to_bin_fx[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/

    /* float *pOut_to_bin[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/

    if ( samplerate == 48000 && maxTotalNumFreqSampPerIterations == L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES )

    {

        fprintf( fp, "\nconst Word16 %s_%s_coeff_re_%2dkHz_fx[%s][BINAURAL_CHANNELS][L_FRAME48k/MAX_PARAM_SPATIAL_SUBFRAMES]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name );

    }

    else if ( samplerate == 32000 && maxTotalNumFreqSampPerIterations == L_FRAME32k / MAX_PARAM_SPATIAL_SUBFRAMES )

    {

        fprintf( fp, "\nconst Word16 %s_%s_coeff_re_%2dkHz_fx[%s][BINAURAL_CHANNELS][L_FRAME32k/MAX_PARAM_SPATIAL_SUBFRAMES]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name );

    }

    else if ( samplerate == 16000 && maxTotalNumFreqSampPerIterations == L_FRAME16k / MAX_PARAM_SPATIAL_SUBFRAMES )

    {

        fprintf( fp, "\nconst Word16 %s_%s_coeff_re_%2dkHz_fx[%s][BINAURAL_CHANNELS][L_FRAME16k/MAX_PARAM_SPATIAL_SUBFRAMES]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name );

    }

    else

    {

        fprintf( fp, "\nconst Word16 %s_%s_coeff_re_%2dkHz_fx[%s][BINAURAL_CHANNELS][%d]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name, maxTotalNumFreqSampPerIterations );

    }



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

    {

        fprintf( fp, "\n%s{\n", TAB_WITH_SPACE_OR_NOT );
@@ -3166,7 +3182,22 @@ void update_c_file_fx( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const 
    fprintf( fp, "\n%s}", TAB_WITH_SPACE_OR_NOT );

    fprintf( fp, "\n};" );



    if ( samplerate == 48000 && maxTotalNumFreqSampPerIterations == L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES )

    {

        fprintf( fp, "\nconst Word16 %s_%s_coeff_im_%2dkHz_fx[%s][BINAURAL_CHANNELS][L_FRAME48k/MAX_PARAM_SPATIAL_SUBFRAMES]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name );

    }

    else if ( samplerate == 32000 && maxTotalNumFreqSampPerIterations == L_FRAME32k / MAX_PARAM_SPATIAL_SUBFRAMES )

    {

        fprintf( fp, "\nconst Word16 %s_%s_coeff_im_%2dkHz_fx[%s][BINAURAL_CHANNELS][L_FRAME32k/MAX_PARAM_SPATIAL_SUBFRAMES]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name );

    }

    else if ( samplerate == 16000 && maxTotalNumFreqSampPerIterations == L_FRAME16k / MAX_PARAM_SPATIAL_SUBFRAMES )

    {

        fprintf( fp, "\nconst Word16 %s_%s_coeff_im_%2dkHz_fx[%s][BINAURAL_CHANNELS][L_FRAME16k/MAX_PARAM_SPATIAL_SUBFRAMES]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name );

    }

    else

    {

        fprintf( fp, "\nconst Word16 %s_%s_coeff_im_%2dkHz_fx[%s][BINAURAL_CHANNELS][%d]={", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name, maxTotalNumFreqSampPerIterations );

    }

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

    {

        fprintf( fp, "\n%s{\n", TAB_WITH_SPACE_OR_NOT );
@@ -3560,8 +3591,27 @@ void update_h_file_fx( HRTFS_DATA *hrtf, struct ivas_layout_config lscfg, const 


    /* Word16 *pOut_to_bin_fx[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/

    fprintf( fp, "\nextern const Word16 %s_%s_coeff_Q_%2dkHz_fx;", DECLARATION_NAME, lscfg.name, samplerate / 1000 );

    /* float *pOut_to_bin[MAX_INTERN_CHANNELS][BINAURAL_CHANNELS];*/

    if ( samplerate == 48000 && maxTotalNumFreqSampPerIterations == L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES )

    {

        fprintf( fp, "\nextern const Word16 %s_%s_coeff_re_%2dkHz_fx[%s][BINAURAL_CHANNELS][L_FRAME48k/MAX_PARAM_SPATIAL_SUBFRAMES];", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name );

        fprintf( fp, "\nextern const Word16 %s_%s_coeff_im_%2dkHz_fx[%s][BINAURAL_CHANNELS][L_FRAME48k/MAX_PARAM_SPATIAL_SUBFRAMES];", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name );

    }

    else if ( samplerate == 32000 && maxTotalNumFreqSampPerIterations == L_FRAME32k / MAX_PARAM_SPATIAL_SUBFRAMES )

    {

        fprintf( fp, "\nextern const Word16 %s_%s_coeff_re_%2dkHz_fx[%s][BINAURAL_CHANNELS][L_FRAME32k/MAX_PARAM_SPATIAL_SUBFRAMES];", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name );

        fprintf( fp, "\nextern const Word16 %s_%s_coeff_im_%2dkHz_fx[%s][BINAURAL_CHANNELS][L_FRAME32k/MAX_PARAM_SPATIAL_SUBFRAMES];", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name );

    }

    else if ( samplerate == 16000 && maxTotalNumFreqSampPerIterations == L_FRAME16k / MAX_PARAM_SPATIAL_SUBFRAMES )

    {

        fprintf( fp, "\nextern const Word16 %s_%s_coeff_re_%2dkHz_fx[%s][BINAURAL_CHANNELS][L_FRAME16k/MAX_PARAM_SPATIAL_SUBFRAMES];", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name );

        fprintf( fp, "\nextern const Word16 %s_%s_coeff_im_%2dkHz_fx[%s][BINAURAL_CHANNELS][L_FRAME16k/MAX_PARAM_SPATIAL_SUBFRAMES];", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name );

    }

    else

    {

        fprintf( fp, "\nextern const Word16 %s_%s_coeff_re_%2dkHz_fx[%s][BINAURAL_CHANNELS][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name, maxTotalNumFreqSampPerIterations );

        fprintf( fp, "\nextern const Word16 %s_%s_coeff_im_%2dkHz_fx[%s][BINAURAL_CHANNELS][%u];", DECLARATION_NAME, lscfg.name, samplerate / 1000, lscfg.output_config_num_channel_name, maxTotalNumFreqSampPerIterations );

    }



    /*   float *pOut_to_bin_diffuse_re_fx[BINAURAL_CHANNELS];*/

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