Commit 2e34fa38 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1596_ref_port_fl1360' into 'float-pc' 

BASOP porting MR 59/61/67 - Port MR 1360 into float-pc

See merge request !1604
parents 109c1d8b 2573f640

lib_com/ari_hm.c

+4 −0
Original line number Diff line number Diff line
@@ -272,7 +272,11 @@ void tcx_hm_modify_envelope( 
    const int16_t L_frame /* i  : number of spectral lines              */

)

{

#ifdef FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI

    int32_t k, h, x;

#else

    int16_t k, h, x;

#endif

    Word16 inv_shape[2 * kTcxHmParabolaHalfWidth + 1]; /* Q15 */



    if ( gain == 0 )

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ 


#define NONBE_FIX_979_OSBA_STEREO_5MS                    /* FhG : issue #979 : 5ms and 20ms output different for OSBA and stereo */

#define FIX_983_DISC_ISM_DIGEST_NUM_OBJS                 /* FhG: issue #983: the discrete ISM digest function uses the wrong number of objects */

#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */





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