Commit 6ee66176 authored by janssontoftg's avatar janssontoftg
Browse files

Updated default HR filter parameters in ROM to correspond to hrfilter_model_v003.

parent 6de960df

lib_rend/ivas_hrtf.c

+17 −17
Original line number Diff line number Diff line
@@ -93,19 +93,19 @@ void DefaultBSplineModel( 
    /* int16_t parameters */

    model->UseItdModel = 1;

    model->SplineDegree = 4;

    model->elevDim2 = 20;

    model->elevDim3 = 18;

    model->AlphaN = 578;

    model->elevDim2 = 17;

    model->elevDim3 = 15;

    model->AlphaN = 470;

    model->num_unique_azim_splines = 1;

    model->elevSegSamples = 3;

    model->elevBsLen[0] = 4;

    model->elevBsLen[1] = 7;

    model->elevBsLen[2] = 10;

    model->elevBsLen[3] = 7;

    model->elevSegSamples = 4;

    model->elevBsLen[0] = 5;

    model->elevBsLen[1] = 9;

    model->elevBsLen[2] = 13;

    model->elevBsLen[3] = 9;

    model->elevBsStart[0] = 0;

    model->elevBsStart[1] = 4;

    model->elevBsStart[2] = 11;

    model->elevBsStart[3] = 21;

    model->elevBsStart[1] = 5;

    model->elevBsStart[2] = 14;

    model->elevBsStart[3] = 27;



    model->azimDim2 = orange53_rom_azimDim2;

    model->azimDim3 = orange53_rom_azimDim3;
@@ -120,15 +120,15 @@ void DefaultBSplineModel( 


    model->azimBsShape = (const float **) count_malloc( model->num_unique_azim_splines * sizeof( float * ) );

    model->azimBsShape[0] = (const float *) orange53_rom_azimBsShape;

    model->azimKSeq = (float **) count_malloc( 18 * sizeof( float * ) );

    model->azimKSeq = (float **) count_malloc( model->elevDim3 * sizeof( float * ) );

    model->azimKSeq[0] = (float *) count_malloc( 2 * sizeof( float * ) );

    model->azimKSeq[17] = (float *) count_malloc( 2 * sizeof( float * ) );

    model->azimKSeq[model->elevDim3 - 1] = (float *) count_malloc( 2 * sizeof( float * ) );

    model->azimKSeq[0][0] = 0.0f;

    model->azimKSeq[17][0] = 0.0f;

    model->azimKSeq[model->elevDim3 - 1][0] = 0.0f;

    model->azimKSeq[0][1] = 360.0f;

    model->azimKSeq[17][1] = 360.0f;

    model->azimKSeq[model->elevDim3 - 1][1] = 360.0f;



    for ( i = 1; i < 17; i++ )

    for ( i = 1; i < model->elevDim3 - 1; i++ )

    {

        model->azimKSeq[i] = (float *) count_malloc( model->azimDim2[i] * sizeof( float * ) ); /* azimDim2[i] = 91, i=2..15 */

        for ( j = 0; j < model->azimDim2[i]; j++ )
@@ -191,7 +191,7 @@ void DefaultBSplineModel( 
    modelITD->elevBsStart[2] = 11;

    modelITD->elevBsStart[3] = 21;



    modelITD->elevKSeq = model->elevKSeq;

    modelITD->elevKSeq = orange53_rom_ITD_elevKSeq;



    modelITD->azimBsLen[0] = 11;

    modelITD->azimBsLen[1] = 21;

lib_rend/ivas_rom_TdBinauralRenderer.c

+10064 −12362

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_rom_TdBinauralRenderer.h

+20 −19
Original line number Diff line number Diff line
@@ -42,28 +42,29 @@ 
 * TD Binaural rendering related ROM tables

 *------------------------------------------------------------------------*/

/* TD renderer HRTF default model Orange53 */

extern const int16_t orange53_rom_azimDim2[18];

extern const int16_t orange53_rom_azimDim3[18];

extern const int16_t orange53_rom_azim_start_idx[18];

extern const int16_t orange53_rom_azimDim2[15];

extern const int16_t orange53_rom_azimDim3[15];

extern const int16_t orange53_rom_azim_start_idx[15];

extern const int16_t orange53_rom_azimSegSamples[1];

extern const int16_t orange53_rom_azimShapeIdx[18];

extern const int16_t orange53_rom_azimShapeSampFactor[18];

extern const float orange53_rom_elevKSeq[16];

extern const uint32_t orange53_rom_AlphaL48[578 * 128];

extern const uint32_t orange53_rom_AlphaR48[578 * 128];

extern const uint32_t orange53_rom_AlphaL32[578 * 86];

extern const uint32_t orange53_rom_AlphaR32[578 * 86];

extern const uint32_t orange53_rom_AlphaL16[578 * 43];

extern const uint32_t orange53_rom_AlphaR16[578 * 43];

extern const uint32_t orange53_rom_EL48[HRTF_MODEL_N_SECTIONS * 578];

extern const uint32_t orange53_rom_ER48[HRTF_MODEL_N_SECTIONS * 578];

extern const uint32_t orange53_rom_EL32[HRTF_MODEL_N_SECTIONS * 578];

extern const uint32_t orange53_rom_ER32[HRTF_MODEL_N_SECTIONS * 578];

extern const uint32_t orange53_rom_EL16[HRTF_MODEL_N_SECTIONS * 578];

extern const uint32_t orange53_rom_ER16[HRTF_MODEL_N_SECTIONS * 578];

extern const uint32_t orange53_rom_elevBsShape[28];

extern const int16_t orange53_rom_azimShapeIdx[15];

extern const int16_t orange53_rom_azimShapeSampFactor[15];

extern const float orange53_rom_elevKSeq[13];

extern const uint32_t orange53_rom_AlphaL48[470 * 128];

extern const uint32_t orange53_rom_AlphaR48[470 * 128];

extern const uint32_t orange53_rom_AlphaL32[470 * 86];

extern const uint32_t orange53_rom_AlphaR32[470 * 86];

extern const uint32_t orange53_rom_AlphaL16[470 * 43];

extern const uint32_t orange53_rom_AlphaR16[470 * 43];

extern const uint32_t orange53_rom_EL48[HRTF_MODEL_N_SECTIONS * 470];

extern const uint32_t orange53_rom_ER48[HRTF_MODEL_N_SECTIONS * 470];

extern const uint32_t orange53_rom_EL32[HRTF_MODEL_N_SECTIONS * 470];

extern const uint32_t orange53_rom_ER32[HRTF_MODEL_N_SECTIONS * 470];

extern const uint32_t orange53_rom_EL16[HRTF_MODEL_N_SECTIONS * 470];

extern const uint32_t orange53_rom_ER16[HRTF_MODEL_N_SECTIONS * 470];

extern const uint32_t orange53_rom_elevBsShape[36];

extern const uint32_t orange53_rom_azimBsShape[21];

extern const uint32_t orange53_rom_ITD_W[658];

extern const uint32_t orange53_rom_ITD_azimBsShape[84];

extern const float orange53_rom_ITD_azimKSeq[19];

extern const uint32_t orange53_rom_ITD_elevBsShape[28];

extern const float orange53_rom_ITD_elevKSeq[16];