Commit 555ab26f authored by lefort's avatar lefort
Browse files

FASTCONV_ROOM added.

parent fc8fe701

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+8 −3
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ char *create_reverb( int32_t frequency, int32_t *hrtf_size ) 
#ifdef _WIN32

    sprintf( full_in_reverb_path, "%s\\%s_%s_%dkHz%s", input_reverb_file_path, input_reverb_file_name, "Reverb", frequency / 1000, DEFAULT_BIN_FILE_EXT );

#else

    sprintf( full_in_td_path, "%s/%s_%dkHz%s", input_td_bin_path, input_td_bin_file_name, frequency / 1000, DEFAULT_BIN_FILE_EXT );

    sprintf( full_in_reverb_path, "%s/%s_%s_%dkHz%s", input_reverb_file_path, input_reverb_file_name, "Reverb", frequency / 1000, DEFAULT_BIN_FILE_EXT );

#endif

    input_reverb_file = fopen( full_in_reverb_path, "rb" );
@@ -1273,6 +1273,13 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG 
    char *full_in_fastconv_path = NULL;

    FILE *input_fastconv_bin_file = NULL;



    if ( ( rend_type == RENDERER_BINAURAL_FASTCONV_ROOM ) 

    && ( ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 ) || (input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2) || (input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA)) )

    {

        /* No FOA, HOA2, HOA3 BRIRs */

        return NULL;

    }



    // Get the HRTF raw data



    full_in_fastconv_path = (char *) malloc( sizeof( char ) * ( strlen( input_fastconv_bin_path ) + strlen( input_fastconv_bin_file_name ) + 2 ) );
@@ -1289,7 +1296,6 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG 
    sprintf( full_in_fastconv_path, "%s/%s", input_fastconv_bin_path, input_fastconv_bin_file_name );

#endif





    input_fastconv_bin_file = fopen( full_in_fastconv_path, "rb" );



    if ( input_fastconv_bin_file != NULL )
@@ -1386,7 +1392,6 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG 
        //      Sampling Frequency    (4 bytes)

        //      Raw data size         (4 bytes)





        if ( fastconv_hrtf == NULL )

        {

            fprintf( stderr, "Memory allocation for the block failed!\n\n" );

tests/binaural/constants.py

+2 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ FORMAT_TO_METADATA_FILES = { 
    "ISM" : "stvISM{}.csv"

}



OUTPUT_FORMATS_BINAURAL = ["BINAURAL", "BINAURAL_ROOM_IR"] # "BINAURAL_ROOM_REVERB"

OUTPUT_FORMATS_BINAURAL = ["BINAURAL", "BINAURAL_ROOM_IR", "BINAURAL_ROOM_REVERB"]

HR_TRAJECTORIES_TO_TEST = ["headrot_case00_3000_q", "headrot"]
@@ -122,6 +122,7 @@ REQ_HRTF_CONFIG = [ 
    {"renderer_type": RENDERER_BINAURAL_FASTCONV, "input_configuration" : BINAURAL_INPUT_AUDIO_CONFIG_HOA3, "sampling_frequency" : 48000},

    {"renderer_type": RENDERER_BINAURAL_FASTCONV, "input_configuration" : BINAURAL_INPUT_AUDIO_CONFIG_HOA2, "sampling_frequency" : 48000},

    {"renderer_type": RENDERER_BINAURAL_FASTCONV, "input_configuration" : BINAURAL_INPUT_AUDIO_CONFIG_FOA, "sampling_frequency" : 48000},

    {"renderer_type": RENDERER_BINAURAL_FASTCONV_ROOM, "input_configuration" : BINAURAL_INPUT_AUDIO_CONFIG_COMBINED, "sampling_frequency" : 48000},

    {"renderer_type": RENDERER_BINAURAL_PARAMETRIC_ROOM, "input_configuration" : BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED, "sampling_frequency" : 48000},

    {"renderer_type": RENDERER_BINAURAL_OBJECTS_TD, "input_configuration" : BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED, "sampling_frequency" : -1},

    {"renderer_type": RENDERER_BINAURAL_MIXER_CONV, "input_configuration" : BINAURAL_INPUT_AUDIO_CONFIG_COMBINED, "sampling_frequency" : -1},