Commit 87a4b66d authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch 'float-1535-tcx_ari_res_q_spec-remove-dead-code-possibly-harmonize-basop-functions' into 'main'

Resolve "tcx_ari_res_Q_spec(): Remove dead code, possibly harmonize BASOP functions"

See merge request !2541
parents a7ee5592 2c425e48

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ 
#define FIX_FLOAT_1526_DIRAC_MEM_LEAK                   /* FhG: potential memory leak in DirAC handles in case of format switching */

#define ALIGN_ACELP_CORE                                /* VA: align ACELP core functions with BASOP */

#define FIX_1532_MSAN_ERR_AMR_FIRST_FRAME_IS_SID        /* FhG: fix msan complaint in AMR-WB when first frame is an SID */

#define FIX_FLOAT_1535_ARI_RES_Q_CLEANUP                /* FhG: remove dead code from tcx_ari_res_Q_spec() */



/* #################### End BE switches ################################## */

lib_enc/tcx_utils_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -1106,6 +1106,9 @@ int16_t tcx_ari_res_Q_spec( 
    fac_p = 0.5f - fac_m;

    num_zeros = 0;



#ifdef FIX_FLOAT_1535_ARI_RES_Q_CLEANUP

    assert( x_fac != NULL );

#else

    if ( x_fac == NULL )

    {

        for ( i = 0; i < L_frame; ++i )
@@ -1166,6 +1169,7 @@ int16_t tcx_ari_res_Q_spec( 


        return bits;

    }

#endif



    for ( i = 0; i < L_frame; ++i )

    {