Commit e87e181f authored by emerit's avatar emerit
Browse files

bugs fixed

parent 8781dc0e
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -163,12 +163,10 @@
#define FIX_CREND_SIMPLIFY_CODE                         /* Ora : simplify line code in crend */
#define FLOAT_FIX_POINT_HRTF_FILE_FORMAT                /* allows reading floation or fix point hrtf binary file format */
#define FIX_TDREND_HRTF_FILE_FORMAT                     /* Eri: fix point hrtf binary file format for TDREND */
#define FIX_TDREND_HRTF_FILE_FORMAT_OR                  /* OR: highligth changes in  FIX_TDREND_HRTF_FILE_FORMAT */
#define FIX_1123_CREND_16BIT_ROM

#define FIX_1123_CREND_16BIT_ROM
#define FIX_1123_FASTCONV_16BIT_ROM                     /* FhG: issue 1123: update FastConv ROM tables and scripts to generate 16 bit tables instead of float */
#define FIX_1123_PARAMBIN_16BIT_ROM                     /* FhG,Nok: issue 1123: update ParamBin ROM tables and scripts to generate 16 bit tables instead of float */
#define FIX_1123_CREND_16BIT_ROM
#define FIX_1123_TDREN_16BIT_ROM 
#define FIX_1101_CLEANING_JBM_CALL                      /* VA: issue 1101: remove obsolete call of ivas_jbm_dec_tc_buffer_open() */
#define FIX_1053_AEID_FILE_TEST                         /* Philips: Tests for the -aeid file and fix for memory error */
+11 −14
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static void LoadBSplineBinaryITD_fx(
    int16_t *v_tmp16;
    int16_t j;
    float q_scale;
#ifdef FIX_TDREND_HRTF_FILE_FORMAT_OR
#ifdef FIX_TDREND_HRTF_FILE_FORMAT
    fread( &modelITD->elevDim3, sizeof( int16_t ), 1, f_hrtf );
    modelITD->elevKSeq_dyn = (float *) malloc( ( modelITD->elevDim3 - 2 ) * sizeof( float ) );
    v_tmp16 = (int16_t *) malloc( ( modelITD->elevDim3 - 2 ) * sizeof( int16_t ) );
@@ -340,7 +340,7 @@ static void LoadBSplineBinaryITD_fx(
    free( v_tmp16 );

    /* azimuth */
#ifdef FIX_TDREND_HRTF_FILE_FORMAT_OR
#ifdef FIX_TDREND_HRTF_FILE_FORMAT
    modelITD->azimBsLen_dyn = (int16_t *) malloc( HRTF_MODEL_BSPLINE_NUM_COEFFS * sizeof( int16_t ) );
    fread( modelITD->azimBsLen_dyn, sizeof( int16_t ), HRTF_MODEL_BSPLINE_NUM_COEFFS, f_hrtf );
    modelITD->azimBsStart_dyn = (int16_t *) malloc( HRTF_MODEL_BSPLINE_NUM_COEFFS * sizeof( int16_t ) );
@@ -349,7 +349,7 @@ static void LoadBSplineBinaryITD_fx(
    fread( &tmp, sizeof( int16_t ), 1, f_hrtf );

    modelITD->azimBsShape_dyn = (float *) malloc( tmp * sizeof( float ) );
#ifdef FIX_TDREND_HRTF_FILE_FORMAT_OR
#ifdef FIX_TDREND_HRTF_FILE_FORMAT
    v_tmp16 = (int16_t *) malloc( tmp * sizeof( int16_t ) );
    fread( &factor_Q, 1, sizeof( int16_t ), f_hrtf );
    q_scale = powf( 2.f, -1.f * (float) factor_Q );
@@ -372,7 +372,7 @@ static void LoadBSplineBinaryITD_fx(
    fread( &modelITD->azimSegSamples, sizeof( int16_t ), 1, f_hrtf );

    /* elevation */
#ifdef FIX_TDREND_HRTF_FILE_FORMAT_OR
#ifdef FIX_TDREND_HRTF_FILE_FORMAT
    modelITD->elevBsLen_dyn = (int16_t *) malloc( HRTF_MODEL_BSPLINE_NUM_COEFFS * sizeof( int16_t ) );
    fread( modelITD->elevBsLen_dyn, sizeof( int16_t ), HRTF_MODEL_BSPLINE_NUM_COEFFS, f_hrtf );
    modelITD->elevBsStart_dyn = (int16_t *) malloc( HRTF_MODEL_BSPLINE_NUM_COEFFS * sizeof( int16_t ) );
@@ -382,7 +382,7 @@ static void LoadBSplineBinaryITD_fx(

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

#ifdef FIX_TDREND_HRTF_FILE_FORMAT_OR
#ifdef FIX_TDREND_HRTF_FILE_FORMAT
    v_tmp16 = (int16_t *) malloc( tmp * sizeof( int16_t ) );
#endif
    fread( &factor_Q, 1, sizeof( int16_t ), f_hrtf );
@@ -400,7 +400,7 @@ static void LoadBSplineBinaryITD_fx(
    modelITD->W = (const float *) modelITD->W_dyn;
    modelITD->azimBsShape = (const float *) modelITD->azimBsShape_dyn;
    modelITD->elevBsShape = (const float *) modelITD->elevBsShape_dyn;
#ifdef FIX_TDREND_HRTF_FILE_FORMAT_OR
#ifdef FIX_TDREND_HRTF_FILE_FORMAT
    modelITD->azimBsLen = modelITD->azimBsLen_dyn;
    modelITD->azimBsStart = modelITD->azimBsStart_dyn;
    modelITD->elevBsLen = modelITD->elevBsLen_dyn;
@@ -531,7 +531,7 @@ static ivas_error LoadBSplineBinary_fx(
            return IVAS_ERROR( IVAS_ERR_INVALID_HRTF, "Error: HR filter file had an unsupported sampling rate (%d kHz)", tmp );
    }

#ifdef FIX_TDREND_HRTF_FILE_FORMAT_OR
#ifdef FIX_TDREND_HRTF_FILE_FORMAT
    fread( &model->K, sizeof( int16_t ), 1, f_hrtf );
    fread( &model->elevDim3, sizeof( int16_t ), 1, f_hrtf );
    model->elevKSeq_dyn = (float *) malloc( ( model->elevDim3 - 2 ) * sizeof( float ) );
@@ -619,14 +619,14 @@ static ivas_error LoadBSplineBinary_fx(
    fread( model->azimShapeSampFactor_dyn, sizeof( int16_t ), model->elevDim3, f_hrtf );

    /* elevation */
#ifdef FIX_TDREND_HRTF_FILE_FORMAT_OR
#ifdef FIX_TDREND_HRTF_FILE_FORMAT
    model->elevBsLen_dyn = (int16_t *) malloc( HRTF_MODEL_BSPLINE_NUM_COEFFS * sizeof( int16_t ) );
    fread( model->elevBsLen_dyn, sizeof( int16_t ), HRTF_MODEL_BSPLINE_NUM_COEFFS, f_hrtf );
    model->elevBsStart_dyn = (int16_t *) malloc( HRTF_MODEL_BSPLINE_NUM_COEFFS * sizeof( int16_t ) );
    fread( model->elevBsStart_dyn, sizeof( int16_t ), HRTF_MODEL_BSPLINE_NUM_COEFFS, f_hrtf );
#endif
    fread( &tmp, sizeof( int16_t ), 1, f_hrtf );
#ifdef FIX_TDREND_HRTF_FILE_FORMAT_OR
#ifdef FIX_TDREND_HRTF_FILE_FORMAT
    v_tmp16 = (int16_t *) malloc( tmp * sizeof( int16_t ) );
#endif
    model->elevBsShape_dyn = (float *) malloc( tmp * sizeof( float ) );
@@ -647,7 +647,7 @@ static ivas_error LoadBSplineBinary_fx(
    model->AlphaR = (const float *) model->AlphaR_dyn;
    model->EL = (const float *) model->EL_dyn;
    model->ER = (const float *) model->ER_dyn;
#ifdef FIX_TDREND_HRTF_FILE_FORMAT_OR
#ifdef FIX_TDREND_HRTF_FILE_FORMAT
    model->elevBsLen = (const int16_t *) model->elevBsLen_dyn;
    model->elevBsStart = (const int16_t *) model->elevBsStart_dyn;
#endif
@@ -676,9 +676,6 @@ static ivas_error LoadBSplineBinary_fx(
        LoadBSplineBinaryITD_fx( &HrFiltSet_p->ModelParamsITD, f_hrtf );
    }

#ifndef FIX_TDREND_HRTF_FILE_FORMAT_OR
    free( v_tmp16 );
#endif
    return IVAS_ERR_OK;
}
#endif
@@ -1253,7 +1250,7 @@ void destroy_td_hrtf(
        }
        free( ( *hHrtf )->ModelParams.azimBsShape_dyn );

#ifdef FIX_TDREND_HRTF_FILE_FORMAT_OR
#ifdef FIX_TDREND_HRTF_FILE_FORMAT
        free( ( *hHrtf )->ModelParams.azimBsShape ); /* void* cast needed to please both gcc and Visual studio compilers. Deallocating const float** should be fine and gcc agrees, but Visual studio complains. */
#else
        free( (void *) ( *hHrtf )->ModelParams.azimBsShape ); /* void* cast needed to please both gcc and Visual studio compilers. Deallocating const float** should be fine and gcc agrees, but Visual studio complains. */
(132 B)

File changed.

No diff preview for this file type.

(132 B)

File changed.

No diff preview for this file type.

(132 B)

File changed.

No diff preview for this file type.

Loading