Commit cf6ff5d5 authored by vaclav's avatar vaclav
Browse files

accept FIX_150

parent a5c93f86

lib_com/hq2_bit_alloc.c

+0 −6
Original line number Diff line number Diff line
@@ -375,11 +375,9 @@ void hq2_bit_alloc_har( 


    Word32 L_y[BANDS_MAX];



#ifdef FIX_150

#ifdef BASOP_NOGLOB

    Flag Overflow;

    Overflow = 0;

#endif

#endif



    grp_rngmax_fx[0] = 0;
@@ -646,13 +644,9 @@ void hq2_bit_alloc_har( 


    L_temp = Mpy_32_16( L_Ravg_sub[GRP_SB - 1], sub( GRP_SB, 1 ) ); /* Qbe+0+1 */

    L_temp = Mpy_32_16( L_temp, Inv_norm_sum_fx );                  /* Qbe+1+QIpb+1 */

#ifdef FIX_150

#ifdef BASOP_NOGLOB

    lf_hf_ge_r_fx = round_fx_o( L_shl_o( L_temp, sub( 15 + 16, sub( add( SWB_BWE_LR_Qbe, QIns ), 30 ) ), &Overflow ), &Overflow );

    Overflow = 0; /* reset BASOP Overflow */

#else

    lf_hf_ge_r_fx = round_fx( L_shl( L_temp, sub( 15 + 16, sub( add( SWB_BWE_LR_Qbe, QIns ), 30 ) ) ) );

#endif

#else

    lf_hf_ge_r_fx = round_fx( L_shl( L_temp, sub( 15 + 16, sub( add( SWB_BWE_LR_Qbe, QIns ), 30 ) ) ) );

#endif

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ 
#define SBA_BR_SWITCHING_2                              /* Issue 114: Changes for sba bit rate switching with reconfigurations*/

#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define BRATE_SWITCHING_RENDERING                       /* Bitrate switching changes related to the renderers */

#define FIX_150                                         /* Issue 150: Crash in EVS mono, HQ_HARMONIC mode, related to BASOP_NOGLOB */

#define FIX_VBR_COMPLEXITY                              /* Issue 234: fix extremely high complexity numbers for IVAS EVS mode */

#define SBA_DIRAC_RENDERER_TYPE_CLEANUP                 /* Remove leftovers in renderer_type logic in SBA DirAC decoder */

#define FIX_I59_LFE_TD_DELAY                            /* Issue 59: correcting delay of LFE for TD renderer */

lib_enc/swb_bwe_enc.c

+0 −6
Original line number Diff line number Diff line
@@ -1795,12 +1795,10 @@ void hq_generic_hf_encoding( 
    {

        Word16 tmp, frac, exp;

        Word32 L_tmp;

#ifdef FIX_150

#ifdef BASOP_NOGLOB

        Flag Overflow;



        Overflow = 0;

#endif

#endif

        tmp = add( (int16_t) ( hq_generic_fenv[n_band] * 256 ), (int16_t) ( Mean_env[n_band] * 256 ) ); /*Q8 */
@@ -1812,12 +1810,8 @@ void hq_generic_hf_encoding( 
        /* output of Pow2() will be: */

        /* 16384 < Pow2() <= 32767 */

        exp = sub( exp, 13 );

#ifdef FIX_150

#ifdef BASOP_NOGLOB

        tmp = shl_o( tmp, add( exp, 1 ), &Overflow ); /*Q1 */

#else

        tmp = shl( tmp, add( exp, 1 ) ); /*Q1 */

#endif

#else

        tmp = shl( tmp, add( exp, 1 ) ); /*Q1 */

#endif