Commit 9cd76149 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch 'basop-2620-dead-always-overwritten-clamp-on-log-domain-gsMapping' into 'main' 

Resolve: "Dead (always-overwritten) clamp on log-domain gsMapping"

See merge request !3069
parents 8b76d0b5 1f410439

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
#define FIX_ISSUE_2613_WRONG_COMP_MACRO                 /* FhG: basop issue 2613: Inconsistent comparison macros in function tdm_SCh_LSF_intra_pred_fx*/

#define FIX_ISSUE_2611_WRONG_COMMENT                    /* FhG: basop issue 2611: Wrong Q value comment in fucntion stereo_dft_sg_recovery_fx()*/

#define FIX_BASOP_2550_TCX_ENC_MEM_UPDATE               /* FhG: fix condition in tcx_encoder_memory_update_*_fx(), bring inline with float */

#define FIX_BASOP_2620_ICBWE_GSMAPPING_DEAD_CLAMP       /* FhG: remove dead (always-overwritten) gsMapping clamp in ic_bwe_enc_gsMapping_fx; float ref has no clamp */



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

lib_enc/ivas_stereo_icbwe_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ static Word16 ic_bwe_enc_gsMapping_fx( 
    /* quantize the IC-BWE GS mapping*/

    IF( EQ_16( element_mode, IVAS_CPE_TD ) )

    {

#ifndef FIX_BASOP_2620_ICBWE_GSMAPPING_DEAD_CLAMP

        IF( LT_32( temp2_fx32, -( 2 << 25 ) ) )

        {

            temp2_fx = -( 2 << 12 ); // Q12
@@ -383,6 +384,7 @@ static Word16 ic_bwe_enc_gsMapping_fx( 
            temp2_fx = 1 << 12; // Q12

            move16();

        }

#endif



        temp2_fx = extract_h( L_shl_sat( temp2_fx32, Q3 ) ); // Q12

        gsMapping_fx16 = 0;
@@ -391,6 +393,7 @@ static Word16 ic_bwe_enc_gsMapping_fx( 
    }

    ELSE

    {

#ifndef FIX_BASOP_2620_ICBWE_GSMAPPING_DEAD_CLAMP

        IF( LT_32( temp2_fx32, -( 5 << 25 ) ) )

        {

            temp2_fx = -( 5 << 12 ); // Q12
@@ -401,6 +404,7 @@ static Word16 ic_bwe_enc_gsMapping_fx( 
            temp2_fx = 1 << 12; // Q12

            move16();

        }

#endif



        temp2_fx = extract_h( L_shl_sat( temp2_fx32, Q3 ) ); // Q12

        gsMapping_fx16 = 0;