Commit 80862b47 authored by emerit's avatar emerit
Browse files

clean up version

parent da5bc615

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -134,9 +134,8 @@ 


#define FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM                     /* FhG: issue 1123: update FastConv and ParamBin ROM tables and scripts to generate 16 bit tables instead of float */

#define FIX_POINT_HRTF_FILE_FORMAT          /* ORANGE : add crend changes and fix point binaural rom and hrtf binary file format */

//#define FIX_PARAM_CHANGES_AND_HRTF_FILE_FORMAT          /* ORANGE : add parametric binaural renderer changes and fix point binaural rom and hrtf binary file format */

#define FIX_POINT_CREND_HRTF_FILE_FORMAT

#define FIX_TDREND_HRTF_FILE_FORMAT

#define FIX_TDREND_HRTF_FILE_FORMAT_OR



#define NONBE_MDCT_ST_DTX_SKIP_DEWHITENING_OF_NOISE_SHAPES_ON_SID_FRAMES /* FhG: issue 1133: skip de-whitening of bg noise shape after frameloss period if the first good frame is an SID */

#define NONBE_MDCT_ST_PLC_DO_NOT_SCALE_OLD_OUT_IF_FIRST_GOOD_IS_SID /* FhG: issue 1133: in TCX PLC, don't scale hHQ_core->old_out after applying fade to noise in burst frame error */

lib_dec/ivas_binRenderer_internal.c

+4 −0
Original line number Diff line number Diff line
@@ -3005,7 +3005,11 @@ void ivas_binaural_add_LFE_fx( 
            test();

            IF( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hHrtfCrend != NULL ) )

            {

#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM                

                gain_fx = st_ivas->hCrendWrapper->hHrtfCrend->gain_lfe;

#else

                gain_fx = st_ivas->hCrendWrapper->hHrtfCrend->gain_lfe_fx;

#endif

                move16();

            }

            ELSE

lib_rend/ivas_crend.c

+3828 −874

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_objectRenderer_mix.c

+38 −19
Original line number Diff line number Diff line
@@ -794,13 +794,13 @@ static ivas_error DefaultBSplineModel_fx( 
    model->azimShapeSampFactor = defaultHRIR_rom_azimShapeSampFactor;



    model->elevKSeq_fx = defaultHRIR_rom_elevKSeq_fx;

#ifdef FIX_POINT_HRTF_FILE_FORMAT

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

    model->elevBsShape_e = defaultHRIR_rom_elevBsShape_Q_fx;

    model->elevBsShape_fx = defaultHRIR_rom_elevBsShape_fx;

#else

    model->elevBsShape_fx = (const Word32 *) defaultHRIR_rom_elevBsShape_fx;

#endif

#ifdef FIX_POINT_HRTF_FILE_FORMAT

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

    IF( ( model->azimBsShape_fx = (const Word16 **) malloc( model->num_unique_azim_splines * sizeof( Word16 * ) ) ) == NULL )

#else

    IF( ( model->azimBsShape_fx = (const Word32 **) malloc( model->num_unique_azim_splines * sizeof( Word32 * ) ) ) == NULL )
@@ -914,17 +914,20 @@ static ivas_error DefaultBSplineModel_fx( 
    SWITCH( output_Fs )

    {

        case 48000:

            model->AlphaL_fx = (const Word16 *) defaultHRIR_rom_AlphaL48_fx;

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

            model->AlphaL_fx = (const Word16 *) defaultHRIR_rom_AlphaL48_fx;

            model->AlphaL_e = sub( 15, defaultHRIR_rom_Alpha48_Q_fx );

#else

            model->AlphaL_fx = (const Word32 *) defaultHRIR_rom_AlphaL48_fx;

            model->AlphaL_e = 1;

            move16();

#endif

            model->AlphaR_fx = (const Word16 *) defaultHRIR_rom_AlphaR48_fx;

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

            model->AlphaR_fx = (const Word16 *) defaultHRIR_rom_AlphaR48_fx;

            model->AlphaR_e = sub( 15, defaultHRIR_rom_Alpha48_Q_fx );

#else

            model->AlphaR_fx = (const Word32 *) defaultHRIR_rom_AlphaR48_fx;

            model->AlphaR_e = 1;

            move16();

#endif
@@ -951,17 +954,19 @@ static ivas_error DefaultBSplineModel_fx( 
            }

            BREAK;

        case 32000:

            model->AlphaL_fx = (const Word16 *) defaultHRIR_rom_AlphaL32_fx;

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

            model->AlphaL_fx = (const Word16 *) defaultHRIR_rom_AlphaL32_fx;

            model->AlphaL_e = sub( 15, defaultHRIR_rom_Alpha32_Q_fx );

#else

            model->AlphaL_fx = (const Word32 *) defaultHRIR_rom_AlphaL32_fx;

            model->AlphaL_e = 1;

            move16();

#endif

            model->AlphaR_fx = (const Word16 *) defaultHRIR_rom_AlphaR32_fx;

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

            model->AlphaR_fx = (const Word16 *) defaultHRIR_rom_AlphaR32_fx;

            model->AlphaR_e = sub( 15, defaultHRIR_rom_Alpha32_Q_fx );

#else

            model->AlphaR_fx = (const Word32 *) defaultHRIR_rom_AlphaR32_fx;

            model->AlphaR_e = 1;

            move16();

#endif
@@ -988,17 +993,19 @@ static ivas_error DefaultBSplineModel_fx( 
            }

            BREAK;

        case 16000:

            model->AlphaL_fx = (const Word16 *) defaultHRIR_rom_AlphaL16_fx;

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

            model->AlphaL_fx = (const Word16 *) defaultHRIR_rom_AlphaL16_fx;

            model->AlphaL_e = sub( 15, defaultHRIR_rom_Alpha16_Q_fx );

#else

            model->AlphaL_fx = (const Word32 *) defaultHRIR_rom_AlphaL16_fx;

            model->AlphaL_e = 1;

            move16();

#endif

            model->AlphaR_fx = (const Word16 *) defaultHRIR_rom_AlphaR16_fx;

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

            model->AlphaR_fx = (const Word16 *) defaultHRIR_rom_AlphaR16_fx;

            model->AlphaR_e = sub( 15, defaultHRIR_rom_Alpha16_Q_fx );

#else

            model->AlphaR_fx = (const Word32 *) defaultHRIR_rom_AlphaR16_fx;

            model->AlphaR_e = 1;

            move16();

#endif
@@ -1068,31 +1075,43 @@ static ivas_error DefaultBSplineModel_fx( 
    modelITD->elevBsStart[3] = 21;

    move16();

#endif

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

    modelITD->elevKSeq_fx = defaultHRIR_rom_ITD_elevKSeq_fx;

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

    modelITD->elevKSeq_e = defaultHRIR_rom_ITD_elevKSeq_Q_fx;

    modelITD->azimBsLen = defaultHRIR_rom_ITD_azimBsLen;

    modelITD->azimBsStart = defaultHRIR_rom_ITD_azimBsStart;



    modelITD->azimKSeq_fx = defaultHRIR_rom_ITD_azimKSeq_fx;

    modelITD->azimKSeq_e = defaultHRIR_rom_ITD_azimKSeq_Q_fx;

#else

    modelITD->elevKSeq_fx = defaultHRIR_rom_ITD_elevKSeq_fx;

    modelITD->azimBsLen[0] = 11;

    move16();

    modelITD->azimBsLen[1] = 21;

    move16();

    modelITD->azimBsLen[2] = 31;

    move16();

    modelITD->azimBsLen[3] = 21;

    move16();

    modelITD->azimBsStart[0] = 0;

    move16();

    modelITD->azimBsStart[1] = 11;

    move16();

    modelITD->azimBsStart[2] = 32;

    move16();

    modelITD->azimBsStart[3] = 63;

    move16();



    modelITD->azimSegSamples = 10;

    move16();

#endif    

    modelITD->azimKSeq_fx = defaultHRIR_rom_ITD_azimKSeq_fx;

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

    modelITD->azimKSeq_e = defaultHRIR_rom_ITD_azimKSeq_Q_fx;

    modelITD->W_fx = defaultHRIR_rom_ITD_W_fx;

    modelITD->W_e = sub( 15, defaultHRIR_rom_ITD_W_Q_fx );

#else

    modelITD->W_fx = (const Word32 *) defaultHRIR_rom_ITD_W_fx; // Q25



    modelITD->W_e = 6;

    move16();

#endif

#if 0 /*To be removed later : floating point pointer initialization*/

    modelITD->azimKSeq = defaultHRIR_rom_ITD_azimKSeq;

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

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

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

#endif

    modelITD->azimKSeq_fx = defaultHRIR_rom_ITD_azimKSeq_fx;

    modelITD->azimBsShape_fx = defaultHRIR_rom_ITD_azimBsShape_fx;

    modelITD->elevBsShape_fx = defaultHRIR_rom_ITD_elevBsShape_fx;

lib_rend/ivas_reverb.c

+5 −5
Original line number Diff line number Diff line
@@ -161,19 +161,19 @@ typedef struct ivas_reverb_params_t 
    // const float *pHrtf_avg_pwr_response_r_const;                                                                                                                          /* The HRTF set's average right ear power response                                      */

    // const float *pHrtf_inter_aural_coherence_const;                                                                                                                       /* The HRTF set's inter-aural coherence for diffuse sound                               */



#ifdef IVAS_FLOAT_FIXED

    Word32 *pHrtf_avg_pwr_response_l_fx;                /* The HRTF set's average left  ear power response                                      */

    Word32 *pHrtf_avg_pwr_response_r_fx;                /* The HRTF set's average right ear power response                                      */

    Word32 *pHrtf_inter_aural_coherence_fx;             /* The HRTF set's inter-aural coherence for diffuse sound                               */

#endif

#ifdef FIX_POINT_HRTF_FILE_FORMAT

    const Word16 *pHrtf_avg_pwr_response_l_const_fx;    /* The HRTF set's average left  ear power response                                      */

    const Word16 *pHrtf_avg_pwr_response_r_const_fx;    /* The HRTF set's average right ear power response                                      */

    const Word16 *pHrtf_inter_aural_coherence_const_fx; /* The HRTF set's inter-aural coherence for diffuse sound                               */

#else

#ifdef IVAS_FLOAT_FIXED

    const Word32 *pHrtf_avg_pwr_response_l_const_fx;    /* The HRTF set's average left  ear power response                                      */

    const Word32 *pHrtf_avg_pwr_response_r_const_fx;    /* The HRTF set's average right ear power response                                      */

    const Word32 *pHrtf_inter_aural_coherence_const_fx; /* The HRTF set's inter-aural coherence for diffuse sound                               */

#endif

#endif

    Word16 do_corr_filter; /* Flag indicating whether correlation filters should be used.                          */

                           /*        Correlation only supported and needed for binaural playback (i.e.             */