Commit f94c197e authored by emerit's avatar emerit
Browse files

version BE between fix point binary file and c rom tables

parent 9d778a5d

lib_rend/ivas_rom_binaural_crend_head.c

+6557 −6557

File changed.

Preview size limit exceeded, changes collapsed.

lib_util/hrtf_file_reader.c

+10 −17
Original line number Diff line number Diff line
@@ -1187,8 +1187,8 @@ static ivas_error create_HRTF_from_rawdata_fx( 
    /* inv_diffuse_weight */

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

    {

        ( *hHRTF )->inv_diffuse_weight[0][i] = (float) ( *( (Word32 *) ( hrtf_data_rptr ) ) ) * powf( 2.f, -1.f * factorQ );

        hrtf_data_rptr += sizeof( Word32 );

        ( *hHRTF )->inv_diffuse_weight[0][i] = (float) ( *( (Word16 *) ( hrtf_data_rptr ) ) ) * powf( 2.f, -1.f * factorQ );

        hrtf_data_rptr += sizeof( Word16 );

        if ( max_num_iterations_diffuse != 0 )

        {

            diff = fabs( ( *hHRTF )->inv_diffuse_weight[0][i] - CRendBin_Combined_BRIR_inv_diffuse_weight_48kHz[0][i] );
@@ -1198,14 +1198,11 @@ static ivas_error create_HRTF_from_rawdata_fx( 
            }

        }

    }

    /* inv_diffuse_weight Q factor*/

    factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

    hrtf_data_rptr += sizeof( Word16 );



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

    {

        ( *hHRTF )->inv_diffuse_weight[1][i] = (float) ( *( (Word32 *) ( hrtf_data_rptr ) ) ) * powf( 2.f, -1.f * factorQ );

        hrtf_data_rptr += sizeof( Word32 );

        ( *hHRTF )->inv_diffuse_weight[1][i] = (float) ( *( (Word16 *) ( hrtf_data_rptr ) ) ) * powf( 2.f, -1.f * factorQ );

        hrtf_data_rptr += sizeof( Word16 );

        if ( max_num_iterations_diffuse != 0 )

        {

            diff = fabs( ( *hHRTF )->inv_diffuse_weight[1][i] - CRendBin_Combined_BRIR_inv_diffuse_weight_48kHz[1][i] );
@@ -1216,11 +1213,13 @@ static ivas_error create_HRTF_from_rawdata_fx( 
        }

    }



    maxDiff = 0;



    /* max_total_num_fsamp_per_iteration */

    max_total_num_fsamp_per_iteration = *( (uint16_t *) ( hrtf_data_rptr ) );

    hrtf_data_rptr += sizeof( uint16_t );

    // factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

    // hrtf_data_rptr += sizeof( Word16 );

    factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

    hrtf_data_rptr += sizeof( Word16 );



    /* coeff_re (the size depends on pIndex_frequency_max) */

    for ( i = 0; i < ( *hHRTF )->max_num_ir; i++ )
@@ -1240,8 +1239,6 @@ static ivas_error create_HRTF_from_rawdata_fx( 


            for ( k = 0; k < ( *hHRTF )->num_iterations[i][j]; k++ )

            {

                factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

                hrtf_data_rptr += sizeof( Word16 );

                mem_size = ( *hHRTF )->pIndex_frequency_max[i][j][k] * sizeof( float );

                memcpy( pOut_to_bin_wptr, hrtf_data_rptr, mem_size );

                Word32 *ptW = (Word32 *) pOut_to_bin_wptr;
@@ -1281,8 +1278,6 @@ static ivas_error create_HRTF_from_rawdata_fx( 
            pOut_to_bin_wptr_ref = CRendBin_Combined_BRIR_coeff_im_48kHz[i][j];

            for ( k = 0; k < ( *hHRTF )->num_iterations[i][j]; k++ )

            {

                factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

                hrtf_data_rptr += sizeof( Word16 );

                mem_size = ( *hHRTF )->pIndex_frequency_max[i][j][k] * sizeof( float );

                memcpy( pOut_to_bin_wptr, hrtf_data_rptr, mem_size );

                Word32 *ptW = (Word32 *) pOut_to_bin_wptr;
@@ -1311,6 +1306,8 @@ static ivas_error create_HRTF_from_rawdata_fx( 


    if ( max_total_num_fsamp_per_iteration_diff != 0 )

    {

        // factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

        // hrtf_data_rptr += sizeof( Word16 );

        /* coeff_diffuse_re : The size depends on pIndex_frequency_max_diffuse */

        for ( j = 0; j < BINAURAL_CHANNELS; j++ )

        {
@@ -1327,8 +1324,6 @@ static ivas_error create_HRTF_from_rawdata_fx( 


            for ( k = 0; k < ( *hHRTF )->num_iterations_diffuse[j]; k++ )

            {

                factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

                hrtf_data_rptr += sizeof( Word16 );

                mem_size = ( *hHRTF )->pIndex_frequency_max_diffuse[j][k] * sizeof( float );

                memcpy( pOut_to_bin_wptr, hrtf_data_rptr, mem_size );

                Word32 *ptW = (Word32 *) pOut_to_bin_wptr;
@@ -1365,8 +1360,6 @@ static ivas_error create_HRTF_from_rawdata_fx( 
            pOut_to_bin_wptr_ref = CRendBin_Combined_BRIR_coeff_diffuse_im_48kHz[j];

            for ( k = 0; k < ( *hHRTF )->num_iterations_diffuse[j]; k++ )

            {

                factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

                hrtf_data_rptr += sizeof( Word16 );

                mem_size = ( *hHRTF )->pIndex_frequency_max_diffuse[j][k] * sizeof( float );

                memcpy( pOut_to_bin_wptr, hrtf_data_rptr, mem_size );

                Word32 *ptW = (Word32 *) pOut_to_bin_wptr;