Commit 0bee2bc2 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch 'main' into isar_selection_branch

parents fde6a16e 637d9bbf

lib_com/ivas_cnst.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -1189,10 +1189,8 @@ enum 
#define MASA_RATIO_TOLERANCE                    0.1f

#define MASA_RATIO_TOLERANCE                    0.1f

#define MASA_RATIO_THRESHOLD                    0.015f

#define MASA_RATIO_THRESHOLD                    0.015f

#define MASA_ANGLE_TOLERANCE                    0.5f

#define MASA_ANGLE_TOLERANCE                    0.5f

#ifdef  NON_BE_FIX_1048_THRESHOLD_COH_BASOP

#define MASA_SUR_COH_THRESHOLD                  1e-7f

#define MASA_SUR_COH_THRESHOLD                  1e-7f

#define MASA_SUR_COH_PRECISION                  1e7f

#define MASA_SUR_COH_PRECISION                  1e7f

#endif

#define MASA_LIMIT_NO_BANDS_SUR_COH             8

#define MASA_LIMIT_NO_BANDS_SUR_COH             8

#define MINIMUM_BIT_BUDGET_NORMAL_META          100

#define MINIMUM_BIT_BUDGET_NORMAL_META          100

#define DIFF_DFRATIO_2BIT_LIMIT_IDX_HODIRAC     4

#define DIFF_DFRATIO_2BIT_LIMIT_IDX_HODIRAC     4

lib_com/ivas_prot.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -982,10 +982,20 @@ ivas_error ivas_ism_metadata_enc_create( 




ivas_error ivas_ism_metadata_dec_create(

ivas_error ivas_ism_metadata_dec_create(

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

    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                           */

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

#endif

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

    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(

ivas_error ivas_ism_enc(

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

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

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

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

lib_com/mslvq_com.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -828,11 +828,7 @@ void deindex_lvq_SHB( 




        /* find idx_leader */

        /* find idx_leader */

        i = 1;

        i = 1;

#ifdef NONBE_FIX_1054_NEGATIVE_LVQ_INDEX

        while ( index > table_no_cv[i] )

        while ( index > table_no_cv[i] )

#else

        while ( index >= table_no_cv[i] )

#endif

        {

        {

            i++;

            i++;

        }

        }

lib_com/nelp.c

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




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

        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;

            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] );

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

            I[j] = j;

            I[j] = j;

        }

        }

lib_com/options.h

+2 −12
Original line number Original line Diff line number Diff line
@@ -158,9 +158,6 @@ 




#define FIX_NUM_SUBFRAME_UPDATE

#define FIX_NUM_SUBFRAME_UPDATE





#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 FIX_970_USAN_IN_NELP_SEED

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

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

#define FIX_1060_USAN_ARRAY_BOUNDS                      /* FhG: issue 1060: USAN array-bounds errors */
@@ -170,16 +167,9 @@ 
/* any switch which is non-be wrt selection floating point code */

/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */

/* all switches in this category should start with "NONBE_" */





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

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

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

#define NON_BE_1055_RESET_LP_MEMORIES                   /* VA: issue 1055: Correctly reset LP filter MA and AR memories in bitrate switching */

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

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

#define NON_BE_FIX_1048_THRESHOLD_COH_BASOP             /* Nokia: Fix 1048 replace comparison with 0 with comparison to threshold, to align with BASOP*/

#define NONBE_FIX_1054_NEGATIVE_LVQ_INDEX               /* Nokia: issue 1054: Input to decode_comb in deindex_lvq_SHB should be positive */

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

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

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

#define NONBE_FIX_1067_QUATERNIONSLERP_INACCURACIES     /* Philips: issue 1067: QuaternionSlerp inaccuracies in corner cases */

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





/* ##################### End NON-BE switches ########################### */

/* ##################### End NON-BE switches ########################### */