Commit 9f78bff5 authored by Stefan Doehla's avatar Stefan Doehla
Browse files

Band aid for Issue #150 - should correspond to legacy behavior using globals

parent c0727907

lib_com/hq2_bit_alloc.c

+16 −1
Original line number Diff line number Diff line
@@ -375,6 +375,13 @@ 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;

    grp_rngmax_fx[1] = 0;
@@ -639,8 +646,16 @@ 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

    exp_normn = norm_s( norm_sum_fx );

    exp_normn = sub( exp_normn, 1 );

    exp_normd = norm_s( harmonic_band_fx );

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ 
#define FIX_GET_DELAY_RETURN                            /* Issue 223: change return data type in function get_delay() */

#define NTT_REDUC_COMP_POC                              /* NTT Contribution 10: Complexity reduction of phase spectrum in stereo downmix*/

#define FIX_ISM_DECODER_PRINTOUT                        /* Issue 229: fix ISM decoder printout */



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



#define FIX_ITD_CNG                                     /* Eri: Fix for CNG ITD */