Commit 4baead52 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1186_fix' into 'main' 

Fix for 3GPP issue 1186: Energy/scaling issue for ISM-1 at all bitrates

See merge request !985
parents 0d4839b8 a0c07997

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -121,4 +121,5 @@ 
#define FIX_1009_REPLACE_DIV_SQRT_BY_ISQRT_LC   /* FhG: Reduce workload of binaural rendering: replace 1./tmp & sqrt by Isqrt32 */

#define FIX_1113_OPT_DIRAC_BIN_REND             /* FhG: Various optimizations to ivas_dirac_dec_binaual_functions.c */

#define FIX_ISSUE_1187                          /* Ittiam: Fix for issue 1187: Assertion error observed in evs_enc_fx (with option stereo_dmx_evs) from bass_pf_enc_fx function*/

#define FIX_ISSUE_1186                          /* Ittiam: Fix for Issue 1186: Energy/scaling issue for ISM-1 at all bitrates */

#endif

lib_enc/transient_detection_fx.c

+6 −1
Original line number Diff line number Diff line
@@ -568,13 +568,18 @@ void RunTransientDetection_ivas_fx( 
    IF( GT_16( sub( q_input, pSubblockEnergies->q_firState ), shift ) )

    {

        Scale_sig( input_fx, length, add( sub( pSubblockEnergies->q_firState, q_input ), shift ) ); // q_firState + shift

#ifdef FIX_ISSUE_1186

        q_input = add( pSubblockEnergies->q_firState, shift ); // q_firState + shift

#endif

        pSubblockEnergies->firState1 = shl( pSubblockEnergies->firState1, shift ); // q_firState + shift

        move16();

        pSubblockEnergies->firState2 = shl( pSubblockEnergies->firState2, shift ); // q_firState + shift

        move16();

        pSubblockEnergies->q_firState = add( pSubblockEnergies->q_firState, shift ); // q_firState + shift

        move16();

#ifndef FIX_ISSUE_1186

        q_input = add( pSubblockEnergies->q_firState, shift ); // q_firState + shift

#endif

    }

    ELSE

    {