Commit a41bb380 authored by multrus's avatar multrus
Browse files

[cleanup] accept HAMRONIZE_2606_ENC_PRM

parent 62652af3

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#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 HAMRONIZE_2606_ENC_PRM                          /* FhG: Harmonize enc_prm_fx(), to match floating-point code */

#define HARMONIZE_2604_decoder_tcx_post                 /* FhG: Harmonize decoder_tcx_post with its ivas derivate */

#define HARMONIZE_2598_tcx_arith_decode_envelope        /* FhG: harmonize tcx_arith_decode_envelope between EVS and IVAS versions */

#define HARMONIZE_2598_tcx_arith_encode_envelope        /* FhG: harmonize tcx_arith_encode_envelope between EVS and IVAS versions */

lib_enc/core_enc_2div_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -336,9 +336,5 @@ void core_encode_twodiv_fx( 
     * Generate Bitstream

     *---------------------------------------------------------------*/



#ifdef HAMRONIZE_2606_ENC_PRM

    enc_prm_fx( st, param_core, param_lpc, hm_cfg, bits_param_lpc, no_param_lpc );

#else

    enc_prm_fx( coder_type, param_core, param_lpc, st, st->L_frame, hm_cfg, bits_param_lpc, no_param_lpc );

#endif

}

lib_enc/core_enc_ol_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -523,11 +523,7 @@ void core_encode_openloop_fx( 
     * Generate Bitstream

     *---------------------------------------------------------------*/



#ifdef HAMRONIZE_2606_ENC_PRM

    enc_prm_fx( st, param_core, param_lpc, &hm_cfg, bits_param_lpc, no_param_lpc );

#else

    enc_prm_fx( coder_type, param_core, param_lpc, st, st->L_frame, &hm_cfg, bits_param_lpc, no_param_lpc );

#endif



    /* Channel-aware mode - encode partial copy */

    IF( EQ_16( st->rf_mode, 1 ) )

lib_enc/enc_prm_fx.c

+0 −680

File changed.

Preview size limit exceeded, changes collapsed.

lib_enc/prot_fx_enc.h

+0 −12
Original line number Diff line number Diff line
@@ -2057,7 +2057,6 @@ void coder_tcx_post_ivas_fx( 
    Word16 *wsig,

    Word16 Q_new );



#ifdef HAMRONIZE_2606_ENC_PRM

void enc_prm_fx(

    Encoder_State *st,        /* i/o : quantization Analysis values     */

    Word16 param[],           /* (i) : parameters                       Q0*/
@@ -2066,17 +2065,6 @@ void enc_prm_fx( 
    Word16 *bits_param_lpc,   /* Q0 */

    const Word16 no_param_lpc /* Q0 */

);

#else

void enc_prm_fx(

    const Word16 coder_type,  /* i  : coding type                        */

    Word16 param[],           /* i  : parameters                         */

    const Word16 param_lpc[], /* i  : LPC parameters                     */

    Encoder_State *st,        /* i/o: quantization Analysis values       */

    const Word16 L_Frame,

    CONTEXT_HM_CONFIG hm_cfg[],

    Word16 *bits_param_lpc,

    const Word16 no_param_lpc );

#endif



void IGFEncSetMode_fx(

    const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i/o: instance handle of IGF Encoder */