Commit 42481e51 authored by multrus's avatar multrus
Browse files

Merge branch '1638_ref_cleanup' into 'ivas-float-update' 

1638 ref cleanup

See merge request !1975
parents 9271d225 ab44319d

lib_com/ivas_prot.h

+0 −6
Original line number Diff line number Diff line
@@ -999,20 +999,14 @@ ivas_error ivas_ism_metadata_enc_create( 


ivas_error ivas_ism_metadata_dec_create(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                      */

#ifdef NONBE_FIX_1065_ISM_MD_HANDLE

    const int16_t n_ISms,                                       /* i  : number of separately coded objects          */

#else

    const int16_t n_ISms,                                       /* i  : number of objects                           */

#endif

    int32_t element_brate_tmp[]                                 /* o  : element bitrate per object                  */

);



#ifdef NONBE_FIX_1065_ISM_MD_HANDLE

void ivas_ism_reset_metadata_handle_dec(

    ISM_METADATA_HANDLE hIsmMeta                                /* i/o: ISM metadata handle                         */

);



#endif

ivas_error ivas_ism_enc(

    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                      */

    float *data[],                                             /* i  : input signal [channels][samples]            */

lib_com/nelp.c

+0 −4
Original line number Diff line number Diff line
@@ -121,11 +121,7 @@ void generate_nelp_excitation( 


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

        {

#ifdef FIX_970_USAN_IN_NELP_SEED

            tmp[j] = ( ( *seed ) = (int16_t) ( 521 * ( *seed ) + 259 ) ) / PCM16_TO_FLT_FAC;

#else

            tmp[j] = ( ( *seed ) = 521 * ( *seed ) + 259 ) / PCM16_TO_FLT_FAC;

#endif

            tmp1[j] = ABSVAL( tmp[j] );

            I[j] = j;

        }

lib_com/options.h

+0 −15
Original line number Diff line number Diff line
@@ -177,27 +177,12 @@ 


/* #################### Start BASOP porting switches ############################ */



#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

#endif



#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */

#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */

#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF              /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on  )*/

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST           /* FhG: address issue 1037 */

#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI      /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */

#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	

#define FIX_970_USAN_IN_NELP_SEED

#define NONBE_FIX_1075                                  /* FhG: fix segfault for bitrate switching + BINAURAL_ROOM_REVERB output in MC */

#define NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB     /* FhG: fix bug in TD MDCT-Stereo concealment */

#define FIX_1044_ISM_REND_MEMORY                        /* VA: issue 1044: Lower the memory of the ISM renderer handle. */

#define NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG               /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */

#define FIX_1060_USAN_ARRAY_BOUNDS                      /* FhG: issue 1060: USAN array-bounds errors */

#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING            /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */

#define NONBE_FIX_984_OMASA_EXT_OUTPUT                  /* Nok: issue 1497 - porting OMASA EXT MR   */

#define NONBE_FIX_1065_ISM_MD_HANDLE                    /* VA: issue 1065: Allocate only the necessary number of ISM MD decoder handles. */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */



/* #################### End BASOP porting switches ############################ */

lib_dec/dec_LPD.c

+0 −8
Original line number Diff line number Diff line
@@ -604,20 +604,12 @@ void decoder_LPD( 


        for ( k = 0; k < 2; k++ )

        {

#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

            /* Set pointer to parameters */

            prm = param + ( k * DEC_NPRM_DIV );



            /* Stability Factor */

#endif

            if ( !bfi )

            {

#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

                /* Set pointer to parameters */

                prm = param + ( k * DEC_NPRM_DIV );



                /* Stability Factor */

#endif

                st->stab_fac = lsf_stab( &lsf[( k + 1 ) * M], &lsf[k * M], 0, st->L_frame );

            }

lib_dec/dec_tcx.c

+0 −19
Original line number Diff line number Diff line
@@ -93,9 +93,7 @@ void decoder_tcx( 
    tmp_concealment_method = 0;

    nf_seed = 0;

    fUseTns = 0; /* flag that is set if TNS data is present */

#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

    prm_sqQ = NULL;

#endif



    set_f( xn_buf, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX );
@@ -733,15 +731,11 @@ void decoder_tcx_invQ( 
    TCX_CONFIG_HANDLE hTcxCfg = st->hTcxCfg;



    tnsSize = 0;

#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

    prm_target = NULL; /* just to suppress MSVC warnigs */

#else

    /* just to suppress MSVC warnigs */

    prm_target = NULL;

    prm_ltp = NULL;

    prm_tns = NULL;

    prm_sqQ = NULL;

#endif



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

     * Initializations
@@ -761,10 +755,6 @@ void decoder_tcx_invQ( 
        noiseFillingSize = st->hIGFDec->infoIGFStartLine;

    }



#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

    prm_ltp = &prm[1 + NOISE_FILL_RANGES];

    prm_tns = prm_ltp + LTPSIZE;

#endif



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

     * Read TCX parameters                                       *
@@ -775,10 +765,8 @@ void decoder_tcx_invQ( 
    if ( !bfi )

    {

        index = prm[0];

#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

        prm_ltp = &prm[1 + NOISE_FILL_RANGES];

        prm_tns = prm_ltp + LTPSIZE;

#endif

        /* read noise level (fac_ns) */

        st->hTcxDec->noise_filling_index[frame_cnt] = prm[1];

    }
@@ -793,11 +781,6 @@ void decoder_tcx_invQ( 
        *fUseTns = 0;

    }



#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

    prm_hm = prm_tns + tnsSize;

    prm_sqQ = prm_hm + NPRM_CTX_HM;

    *prm_sqQ1 = prm_sqQ;

#endif



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

     * Spectrum data                                             *
@@ -805,11 +788,9 @@ void decoder_tcx_invQ( 


    if ( !bfi )

    {

#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

        prm_hm = prm_tns + tnsSize;

        prm_sqQ = prm_hm + NPRM_CTX_HM;

        *prm_sqQ1 = prm_sqQ;

#endif

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

         * Context HM                                                *

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