Commit f7a4b6f7 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '1713-wrong-exposant-used-for-specific-channel-ic-bwe' into 'main' 

possible fix to 1713, icBWE exp

Closes #1713

See merge request !1661
parents 103b5351 ae6c1839

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -104,4 +104,6 @@ 
#define TEST_HR

#define REMOVE_EVS_DUPLICATES                   /* remove core-coder duplicated functions, ACELP low-band decoder */



#define FIX_1713_EXP                            /* VA: proposed correction to exp in ic-BWE*/



#endif

lib_enc/ivas_stereo_icbwe_enc_fx.c

+9 −2
Original line number Diff line number Diff line
@@ -828,7 +828,11 @@ void stereo_icBWE_enc_ivas_fx( 
    ELSE

    {



#ifndef FIX_1713_EXP

        max_e = s_max( hStereoICBWE->mem_shb_speech_nonref_e, shb_speech_nonref_e );

#else

        max_e = s_max( hStereoICBWE->mem_shb_speech_ref_e, shb_speech_ref_e );

#endif

        Copy_Scale_sig( hStereoICBWE->mem_shb_speech_ref_fx, hStereoICBWE->mem_shb_speech_ref_fx, L_LOOK_16k, negate( sub( max_e, hStereoICBWE->mem_shb_speech_ref_e ) ) ); // mem_shb_speech_ref_e



        set32_fx( shb_frame_ref_fx, 0, L_LOOK_16k + L_FRAME16k );
@@ -854,8 +858,11 @@ void stereo_icBWE_enc_ivas_fx( 
        /* shb_frame_ref_ICBWE @ (8.75 - shb_speech_delay (=1.25) ms) after shb_speech */



        Copy_Scale_sig32( shb_speech_nonref_fx, shb_frame_nonref_fx + L_LOOK_16k - nonRefMemLen, L_FRAME16k, negate( sub( max_e, shb_speech_nonref_e ) ) ); /* Q31-max_e */

#ifndef FIX_1713_EXP

        Copy_Scale_sig_32_16( shb_frame_nonref_fx + L_FRAME16k, hStereoICBWE->mem_shb_speech_nonref_fx, L_LOOK_16k, sub( negate( sub( max_e, hStereoICBWE->mem_shb_speech_ref_e ) ), Q16 ) ); // mem_shb_speech_ref_e



#else

        Copy_Scale_sig_32_16( shb_frame_nonref_fx + L_FRAME16k, hStereoICBWE->mem_shb_speech_nonref_fx, L_LOOK_16k, sub( negate( sub( max_e, hStereoICBWE->mem_shb_speech_nonref_e ) ), Q16 ) ); // mem_shb_speech_ref_e

#endif



        /* core switching reset */

        test();