Commit 639ceae7 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1245_fix' into 'main' 

Fix for 3GPP issue 1245: Basop Encoder: Audible noise for silent Stereo input DTX on @24.4 kbps, @32 kbps

See merge request !1085
parents b39182c4 4cacc9a8

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -151,5 +151,6 @@ 
#define FIX_ISSUE_1237_KEEP_EVS_BE              /* VA: Fix to keep EVS bitexactness to 26.444 */

#define FIX_ISSUE_1214                          /* Ittiam: Fix for issue 1214: Energy leakage in IGF tiles for MDCT-stereo @64kbps SWB*/

#define FIX_881_HILBERT_FILTER                  /* VA: improve the precision of the Hilbert filter to remove 2kHz unwanted tone */

#define FIX_ISSUE_1245                          /* Ittiam: Fix for issue 1245: Basop Encoder: Audible noise for silent Stereo input DTX on @24.4 kbps, @32 kbps*/

#endif

#define FIX_MINOR_SVD_WMOPS_MR1010X             /* FhG: Minor WMOPS tuning, bit-exact to previous version, saves about 8.2 WMOPS for MR1010 */

lib_enc/cng_enc_fx.c

+16 −6
Original line number Diff line number Diff line
@@ -2024,13 +2024,23 @@ void CNG_enc_ivas_fx( 


    /* convert log2 of residual signal energy */

    /*enr = (float)log10( enr + 0.1f ) / (float)log10( 2.0f ); */



#ifdef FIX_ISSUE_1245

    IF( L_ener == 0 )

    {

        enr = -850; /*log(0.1) base 2 in Q8*/

        move16();

    }

    ELSE

#endif

    {

        hi = norm_l( L_ener );

        lo = Log2_norm_lc( L_shl( L_ener, hi ) );

        hi = sub( 29, hi );                  /* log2 exp in Q2*Q_new */

        hi = sub( hi, shl( Q_new, 1 ) );     /* Q0 */

        L_tmp = L_Comp( hi, lo );            /* Q16 */

        enr = round_fx( L_shl( L_tmp, 8 ) ); /* Q8 (16+8-16) */



    }

    /* update the circular buffer of old energies */

    hTdCngEnc->cng_ener_hist_fx[hTdCngEnc->cng_hist_ptr] = enr;

    move16(); /* Q8 */