Commit 29645fa7 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'basop-2478-harmonize-enc_prm_hm-and-enc_prm_hm_ivas_fx' into 'main' 

Resolve "Harmonize enc_prm_hm() and enc_prm_hm_ivas_fx()"

Closes #2478

See merge request !2881
parents 6c4812f3 72341df7

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
#define FIX_2346_DUPLICATED_IGF_FUNCTIONS               /* FhG: basop issue 2346: Review potentially duplicated IGF functions */

#define FIX_1525_UNINIT_FORMAT_SWITCHING_DEC            /* VA: float issue 1525: fix reading of uninitialized memory in format switching at the decoder */

#define HARMONIZE_2446_CON_TCX_FX                       /* FhG: basop issue: 2446 harmonization of function con_tcx_fx() */

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

#define FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC            /* Nokia: Fix to convert non-converted binary operations */



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

lib_enc/enc_prm_fx.c

+12 −0
Original line number Diff line number Diff line
@@ -14,6 +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,
@@ -53,6 +54,9 @@ static void enc_prm_hm( 
    }

}

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 */
@@ -754,7 +758,11 @@ 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*/
@@ -1235,7 +1243,11 @@ 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*/