Commit 80a069d9 authored by emerit's avatar emerit
Browse files

Merge branch 'ericsson/fixpoint_tdrend_hrtf_file_format' into... 

Merge branch 'ericsson/fixpoint_tdrend_hrtf_file_format' into orange/fixpoint_crend_hrtf_file_format
parents 4a423f38 c2672f50

lib_rend/ivas_objectRenderer_mix.c

+12 −0
Original line number Diff line number Diff line
@@ -512,7 +512,11 @@ static ivas_error DefaultBSplineModel( 
    modelITD->elevBsStart[2] = 11;

    modelITD->elevBsStart[3] = 21;



#ifdef FIX_TDREND_HRTF_FILE_FORMAT

    modelITD->elevKSeq = (const float *) defaultHRIR_rom_ITD_elevKSeq;

#else

    modelITD->elevKSeq = defaultHRIR_rom_ITD_elevKSeq;

#endif



    modelITD->azimBsLen[0] = 11;

    modelITD->azimBsLen[1] = 21;
@@ -525,14 +529,22 @@ static ivas_error DefaultBSplineModel( 


    modelITD->azimSegSamples = 10;



#ifdef FIX_TDREND_HRTF_FILE_FORMAT

    modelITD->azimKSeq = (const float *) defaultHRIR_rom_ITD_azimKSeq;

#else

    modelITD->azimKSeq = defaultHRIR_rom_ITD_azimKSeq;

#endif

    modelITD->W = (const float *) defaultHRIR_rom_ITD_W;

    modelITD->azimBsShape = (const float *) defaultHRIR_rom_ITD_azimBsShape;

    modelITD->elevBsShape = (const float *) defaultHRIR_rom_ITD_elevBsShape;



    HRTF_model_precalc( model );



#ifdef FIX_TDREND_HRTF_FILE_FORMAT

    HrFiltSet_p->latency_s = (const float) defaultHRIR_rom_latency_s;

#else

    HrFiltSet_p->latency_s = defaultHRIR_rom_latency_s;

#endif

    HrFiltSet_p->SampleRate = output_Fs;

    HrFiltSet_p->FiltLength = HrFiltSet_p->ModelParams.K;

lib_rend/ivas_rom_TdBinauralRenderer.c

+10052 −10051

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_rom_TdBinauralRenderer.h

+4 −4
Original line number Diff line number Diff line
@@ -46,14 +46,14 @@ 
 * TD Binaural rendering related ROM tables

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

/* TD renderer default HRIR model */

extern const float defaultHRIR_rom_latency_s;

extern const uint32_t defaultHRIR_rom_latency_s;

extern const int16_t defaultHRIR_rom_azimDim2[15];

extern const int16_t defaultHRIR_rom_azimDim3[15];

extern const int16_t defaultHRIR_rom_azim_start_idx[15];

extern const int16_t defaultHRIR_rom_azimSegSamples[1];

extern const int16_t defaultHRIR_rom_azimShapeIdx[15];

extern const int16_t defaultHRIR_rom_azimShapeSampFactor[15];

extern const float defaultHRIR_rom_elevKSeq[13];

extern const uint32_t defaultHRIR_rom_elevKSeq[13];

extern const uint32_t defaultHRIR_rom_AlphaL48[470 * 128];

extern const uint32_t defaultHRIR_rom_AlphaR48[470 * 128];

extern const uint32_t defaultHRIR_rom_AlphaL32[470 * 86];
@@ -70,7 +70,7 @@ extern const uint32_t defaultHRIR_rom_elevBsShape[36]; 
extern const uint32_t defaultHRIR_rom_azimBsShape[21];

extern const uint32_t defaultHRIR_rom_ITD_W[658];

extern const uint32_t defaultHRIR_rom_ITD_azimBsShape[84];

extern const float defaultHRIR_rom_ITD_azimKSeq[19];

extern const uint32_t defaultHRIR_rom_ITD_azimKSeq[19];

extern const uint32_t defaultHRIR_rom_ITD_elevBsShape[28];

extern const float defaultHRIR_rom_ITD_elevKSeq[16];

extern const uint32_t defaultHRIR_rom_ITD_elevKSeq[16];

#endif

lib_util/hrtf_file_reader.c

+3 −2
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ static void LoadBSplineBinaryITD( 
)

{

    int16_t tmp;



    fread( &modelITD->N, sizeof( int16_t ), 1, f_hrtf );

    fread( &modelITD->elevDim2, sizeof( int16_t ), 1, f_hrtf );

    fread( &modelITD->elevDim3, sizeof( int16_t ), 1, f_hrtf );
@@ -394,7 +395,6 @@ static void LoadBSplineBinaryITD( 


    modelITD->azimBsShape_dyn = (float *) malloc( tmp * sizeof( float ) );

    fread( modelITD->azimBsShape_dyn, sizeof( float ), tmp, f_hrtf );



    fread( &modelITD->azimSegSamples, sizeof( int16_t ), 1, f_hrtf );



    /* elevation */
@@ -631,7 +631,6 @@ static ivas_error LoadBSplineBinary( 
    int16_t i, tmp;



    fread( &HrFiltSet_p->latency_s, sizeof( float ), 1, f_hrtf );



    model = &( HrFiltSet_p->ModelParams );



    /* Set ROM flag for correct deallocation */
@@ -677,6 +676,7 @@ static ivas_error LoadBSplineBinary( 
    model->azimDim2_dyn = (int16_t *) malloc( model->elevDim3 * sizeof( int16_t ) );

    model->azimDim3_dyn = (int16_t *) malloc( model->elevDim3 * sizeof( int16_t ) );

    model->azim_start_idx_dyn = (int16_t *) malloc( model->elevDim3 * sizeof( int16_t ) );



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

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

    {
@@ -699,6 +699,7 @@ static ivas_error LoadBSplineBinary( 
    model->azimBsShape = (const float **) malloc( model->num_unique_azim_splines * sizeof( float * ) );

    model->azimBsShape_dyn = (float **) malloc( model->num_unique_azim_splines * sizeof( float * ) );

    model->azimSegSamples_dyn = (int16_t *) malloc( model->num_unique_azim_splines * sizeof( int16_t ) );



    for ( i = 0; i < model->num_unique_azim_splines; i++ )

    {

        fread( &tmp, sizeof( int16_t ), 1, f_hrtf );

scripts/td_object_renderer/hrtf_data/IVAS_default/td_HRIR_128_Meth5_IRC_53_Q10_symL_Itrp1_48000_model_v003_fx_16kHz.bin

0 → 100644LFS
+130 B

File added.

No diff preview for this file type.

View file