Commit 7edce461 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2478_HARM_ENC_PRM_HM

parent 73056b47

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define HARM_HQ_CORE_KEEP_BE                            /* hack to keep all BE after HQ core functions harmonization; pending resolving issues #2450, #2451, #2452 */

#define FIX_BASOP_2478_HARM_ENC_PRM_HM                  /* FhG: basop issue 2478: harmonize enc_prm_hm() and enc_prm_hm_ivas_fx() */

#define FIX_2455_HARMONIZE_generate_comfort_noise_enc   /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */

#define FIX_2455_HARMONIZE_configureFdCngEnc            /* FhG: harmonize generate_comfort_noise_enc and generate_comfort_noise_enc_ivas */

#define FIX_2463_EVS_BWE_LSF                            /* VA: basop issue 2463: harmonize calling of Quant_BWE_LSF_fx() */

lib_enc/enc_prm_fx.c

+0 −50
Original line number Diff line number Diff line
@@ -14,49 +14,7 @@ 
#include "prot_fx_enc.h" /* Function prototypes                    */





#ifndef FIX_BASOP_2478_HARM_ENC_PRM_HM

static void enc_prm_hm(

    Word16 *prm_hm, /* Q0 */

    Encoder_State *st,

    Word16 L_frame /* Q0 */

)

{

    Word8 flag;

    BSTR_ENC_HANDLE hBstr = st->hBstr;



    /* Disable HM for non-GC,VC modes */

    test();

    IF( NE_16( st->hTcxCfg->coder_type, VOICED ) && NE_16( st->hTcxCfg->coder_type, GENERIC ) )

    {

        return;

    }



    /* Flag */

    push_next_indice( hBstr, prm_hm[0], 1 );



    IF( prm_hm[0] )

    {

        /* Periodicy index */

        flag = 0;

        move16();

        if ( GE_16( L_frame, 256 ) )

        {

            flag = 1;

            move16();

        }

        EncodeIndex_fx( flag, prm_hm[1], hBstr );



        IF( EQ_16( st->hTcxCfg->coder_type, VOICED ) )

        {

            /* Gain index */

            push_next_indice( hBstr, prm_hm[2], kTcxHmNumGainBits );

        }

    }

}

static void enc_prm_hm_ivas_fx(

#else

static void enc_prm_hm_fx(

#endif

    Word16 *prm_hm, /* Q0 */

    Encoder_State *st,

    Word16 L_frame /* Q0 */
@@ -758,11 +716,7 @@ void enc_prm_fx( 
        test();

        IF( hTcxEnc->tcx_lpc_shaped_ari && NE_16( last_core, ACELP_CORE ) )

        {

#ifdef FIX_BASOP_2478_HARM_ENC_PRM_HM

            enc_prm_hm_fx( &prm[j], st, hm_size );

#else

            enc_prm_hm( &prm[j], st, hm_size );

#endif

        }



        /*Context HM flag*/
@@ -1231,11 +1185,7 @@ void writeTCXparam_fx( 
                test();

                IF( st->hTcxEnc->tcx_lpc_shaped_ari && last_core != ACELP_CORE && EQ_16( core, TCX_20_CORE ) )

                {

#ifdef FIX_BASOP_2478_HARM_ENC_PRM_HM

                    enc_prm_hm_fx( &prm[j], st, hm_size );

#else

                    enc_prm_hm_ivas_fx( &prm[j], st, hm_size );

#endif

                }



                /*Context HM flag*/