Commit d386e93c authored by emerit's avatar emerit
Browse files

code formatting

parent 49fb421d

lib_rend/ivas_crend.c

+0 −10
Original line number Diff line number Diff line
@@ -233,7 +233,6 @@ static ivas_error ivas_rend_initCrend( 
    {

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        hHrtf->init_from_rom = 1;



#endif

        if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED )

        {
@@ -473,7 +472,6 @@ static ivas_error ivas_rend_initCrend( 
#ifdef FIX_INV_DIFFUSE_WEIGHT

                            hHrtf->inv_diffuse_weight[j][i] = CRendBin_Combined_HRIR_inv_diffuse_weight_16kHz[j][tmp];

#endif



                            hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_16kHz[tmp][j];

                            hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz[tmp][j];

                            hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_16kHz[tmp][j];
@@ -499,7 +497,6 @@ static ivas_error ivas_rend_initCrend( 


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

                    {



#ifndef FIX_INV_DIFFUSE_WEIGHT

                        hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_48kHz[i];

#endif
@@ -802,7 +799,6 @@ static ivas_error ivas_rend_initCrend( 
#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        hHrtf->init_from_rom = 0;

#endif



        if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED )

        {

            hHrtf->max_num_ir -= 1; /* subtract LFE */
@@ -816,7 +812,6 @@ static ivas_error ivas_rend_initCrend( 
                    return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Invalid command wrong output format" );

                }

#endif



                hHrtf->latency_s = hSetOfHRTF->hHRTF_brir_combined->latency_s;

                hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_brir_combined->max_num_iterations;

                hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_brir_combined->index_frequency_max_diffuse;
@@ -829,7 +824,6 @@ static ivas_error ivas_rend_initCrend( 
                    return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Invalid command wrong output format" );

                }

#endif



                hHrtf->latency_s = hSetOfHRTF->hHRTF_hrir_combined->latency_s;

                hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_combined->max_num_iterations;

                hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_combined->index_frequency_max_diffuse;
@@ -924,7 +918,6 @@ static ivas_error ivas_rend_initCrend( 
                    return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Invalid command wrong output format" );

                }

#endif



                hHrtf->latency_s = hSetOfHRTF->hHRTF_hrir_hoa3->latency_s;

                hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_hoa3->max_num_iterations;

                hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_hoa3->index_frequency_max_diffuse;
@@ -961,7 +954,6 @@ static ivas_error ivas_rend_initCrend( 
                    return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Invalid command wrong output format" );

                }

#endif



                hHrtf->latency_s = hSetOfHRTF->hHRTF_hrir_hoa2->latency_s;

                hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_hoa2->max_num_iterations;

                hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_hoa2->index_frequency_max_diffuse;
@@ -998,7 +990,6 @@ static ivas_error ivas_rend_initCrend( 
                    return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Invalid command wrong output format" );

                }

#endif



                hHrtf->latency_s = hSetOfHRTF->hHRTF_hrir_foa->latency_s;

                hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_foa->max_num_iterations;

                hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_foa->index_frequency_max_diffuse;
@@ -1471,7 +1462,6 @@ ivas_error ivas_rend_openCrend( 
#else

                set_zero( hCrend->freq_buffer_re[i], max_total_ir_len );

#endif



                if ( ( hCrend->freq_buffer_im[i] = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL )

                {

                    return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" );

lib_rend/lib_rend.c

+0 −1
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ typedef struct 
    MASA_PREREND_HANDLE hMasaPrerend;

} input_masa;





#ifdef NONBE_FIX_BINARY_BINAURAL_READING

typedef struct hrtf_handles

{

scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c

+1 −0
Original line number Diff line number Diff line
@@ -2294,6 +2294,7 @@ void update_h_file_with_reverb( int32_t samplerate ) 
#else

    fprintf( fp, "\nextern float defaultHRIR_right_avg_power_%dkHz[LR_IAC_LENGTH_NR_FC];", samplerate / 1000 );

#endif



    if ( samplerate == LAST_SAMPLERATE )

    {

        fprintf( fp, "\n\n#endif\n" );