Commit 89be4d82 authored by emerit's avatar emerit
Browse files

fix

parent 5ed7a145

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+34 −5
Original line number Diff line number Diff line
@@ -73,9 +73,9 @@ 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_ROOM,

#else

    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,
@@ -106,8 +106,13 @@ typedef struct _crend_hrtf_tables_dimensions 
    int16_t max_num_ir;

    int16_t max_num_iterations;

    int16_t max_num_iterations_diffuse;

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    uint32_t max_total_num_fsamp_per_iteration;

    uint32_t max_total_num_fsamp_per_iteration_diff;

#else

    uint16_t max_total_num_fsamp_per_iteration;

    uint16_t max_total_num_fsamp_per_iteration_diff;

#endif



} crend_hrtf_tables_dimensions;
@@ -2103,7 +2108,11 @@ int32_t compute_crend_hrtf_data_size_fx( crend_hrtf_tables_pointers *hrtf_table_ 
    hrtf_data_size += sizeof( uint16_t );                                                 // index_frequency_max_diffuse

    hrtf_data_size += sizeof( Word16 );                                                   // inv_diffuse_weight factor Q

    hrtf_data_size += hrtf_table_dims->max_num_ir * BINAURAL_CHANNELS * sizeof( Word16 ); // inv_diffuse_weight

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    hrtf_data_size += sizeof( uint32_t ); // max_total_num_fsamp_per_iteration

#else

    hrtf_data_size += sizeof( uint16_t ); // max_total_num_fsamp_per_iteration

#endif



    hrtf_data_size += sizeof( Word16 ); // filters factor Q

    // coeff_re & coeff_im : The size depends on pIndex_frequency_max
@@ -2118,7 +2127,11 @@ int32_t compute_crend_hrtf_data_size_fx( crend_hrtf_tables_pointers *hrtf_table_ 
        }

    }



#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    hrtf_data_size += sizeof( uint32_t ); // max_total_num_fsamp_per_iteration_diff

#else

    hrtf_data_size += sizeof( uint16_t ); // max_total_num_fsamp_per_iteration_diff

#endif

    if ( hrtf_table_dims->max_total_num_fsamp_per_iteration_diff != 0 )

    {

        // coeff_diffuse_re & coeff_diffuse_im : The size depends on pIndex_frequency_max
@@ -2168,7 +2181,11 @@ int32_t compute_crend_hrtf_data_size( crend_hrtf_tables_pointers *hrtf_table_ptr 


    hrtf_data_size += sizeof( uint16_t );                                                // index_frequency_max_diffuse

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

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    hrtf_data_size += sizeof( uint32_t ); // max_total_num_fsamp_per_iteration

#else

    hrtf_data_size += sizeof( uint16_t ); // max_total_num_fsamp_per_iteration

#endif

    // coeff_re & coeff_im : The size depends on pIndex_frequency_max

    for ( iIR = 0, iIndex = 0; iIR < hrtf_table_dims->max_num_ir; iIR++ )

    {
@@ -2181,7 +2198,11 @@ int32_t compute_crend_hrtf_data_size( crend_hrtf_tables_pointers *hrtf_table_ptr 
        }

    }



#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    hrtf_data_size += sizeof( uint32_t ); // max_total_num_fsamp_per_iteration_diff

#else

    hrtf_data_size += sizeof( uint16_t ); // max_total_num_fsamp_per_iteration_diff

#endif

    if ( hrtf_table_dims->max_total_num_fsamp_per_iteration_diff != 0 )

    {

        // coeff_diffuse_re & coeff_diffuse_im : The size depends on pIndex_frequency_max
@@ -2494,7 +2515,11 @@ int16_t check_hrtf_data( HRTF_READER_RENDERER_TYPE rend_type, BINAURAL_INPUT_AUD 
    hrtf_data_in_rptr += ctrl_size;



// max_total_num_fsamp_per_iteration

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    if ( tabs_dims.max_total_num_fsamp_per_iteration != *( (uint32_t *) ( hrtf_data_in_rptr ) ) )

#else

    if ( tabs_dims.max_total_num_fsamp_per_iteration != *( (uint16_t *) ( hrtf_data_in_rptr ) ) )

#endif

    {

        fprintf( stderr, "check_hrtf_data of binary file failed: bad max_total_num_fsamp_per_iteration!\n\n" );

        return -1;
@@ -2567,7 +2592,11 @@ int16_t check_hrtf_data( HRTF_READER_RENDERER_TYPE rend_type, BINAURAL_INPUT_AUD 
    }



    // max_total_num_fsamp_per_iteration_diff

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    if ( tabs_dims.max_total_num_fsamp_per_iteration_diff != *( (uint32_t *) ( hrtf_data_in_rptr ) ) )

#else

    if ( tabs_dims.max_total_num_fsamp_per_iteration_diff != *( (uint16_t *) ( hrtf_data_in_rptr ) ) )

#endif

    {

        fprintf( stderr, "check_hrtf_data of binary file failed: bad max_total_num_fsamp_per_iteration_diff!\n\n" );

        return -1;

scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c

+35 −224

File changed.

Preview size limit exceeded, changes collapsed.

scripts/binauralRenderer_interface/ivas_crend_binaural_filter_design.c

+2 −76

File changed.

Preview size limit exceeded, changes collapsed.