Commit f358aa44 authored by multrus's avatar multrus
Browse files

[cleanup] accept HARMONIZE_2596_SetModeIndex

parent 31ec9ece

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 HARMONIZE_2596_SetModeIndex                     /* FhG: Harmonize SetModeIndex with its ivas derivate */

#define HARMONIZE_2597_ShapeSpectrum                    /* FhG: Harmonize ShapeSpectrum with its ivas derivate */

#define HARMONIZE_2567_init_functions                   /* FhG: harmonize derivates for evs/ivas regarding functions init_acelp*(),init_tcx_cfg*(), init_tcx*(), init_coder_ace_plus*(), init_core_sig_ana*() and init_modes*() */

#define HARMONIZE_2607_GetFilterParameters              /* FhG: Harmonize GetFilterParameters with its ivas derivate */

lib_com/prot_fx.h

+0 −6
Original line number Diff line number Diff line
@@ -9552,19 +9552,13 @@ void core_coder_mode_switch_ivas_fx( 
);





#ifdef HARMONIZE_2596_SetModeIndex

void SetModeIndex_fx(

#else

void SetModeIndex_ivas_fx(

#endif

    Encoder_State *st,              /* i  : Encoder state                          */

    const Word32 last_total_brate,  /* i  : last total bitrate                     Q0*/

    const Word16 last_element_mode, /* i  : last IVAS element mode                 Q0*/

    const Word16 MCT_flag           /* i  : hMCT handle allocated (1) or not (0)   Q0*/

#ifdef HARMONIZE_2596_SetModeIndex

    ,

    const Word16 shift

#endif

);



#ifdef HARMONIZE_2567_init_functions

lib_enc/ivas_core_pre_proc_front_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1393,11 +1393,7 @@ void pre_proc_front_ivas_fx( 
            test();

            IF( EQ_32( ivas_format, SBA_FORMAT ) && st->core_brate != FRAME_NO_DATA && st->last_core_brate == FRAME_NO_DATA && st->sba_br_sw_while_no_data )

            {

#ifdef HARMONIZE_2596_SetModeIndex

                SetModeIndex_fx( st, L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC ), element_mode, MCT_flag, 0 );

#else

                SetModeIndex_ivas_fx( st, L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC ), element_mode, MCT_flag );

#endif



                st->sba_br_sw_while_no_data = 0;

                move16();

lib_enc/ivas_core_pre_proc_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -343,11 +343,7 @@ void pre_proc_ivas_fx( 
        st->total_brate = L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC ); /* Q0 */

        move32();



#ifdef HARMONIZE_2596_SetModeIndex

        SetModeIndex_fx( st, imult3216( st->last_bits_frame_nominal, FRAMES_PER_SEC ), last_element_mode, MCT_flag, 0 );

#else

        SetModeIndex_ivas_fx( st, imult3216( st->last_bits_frame_nominal, FRAMES_PER_SEC ), last_element_mode, MCT_flag );

#endif



        st->sr_core = getCoreSamplerateMode2( element_mode, st->total_brate, st->bwidth, st->flag_ACELP16k, st->rf_mode, st->is_ism_format ); /* Q0 */

        move16();
@@ -408,11 +404,7 @@ void pre_proc_ivas_fx( 
        IF( NE_32( st->core_brate, FRAME_NO_DATA ) )

        {



#ifdef HARMONIZE_2596_SetModeIndex

            SetModeIndex_fx( st, L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC ), element_mode, MCT_flag, 0 );

#else

            SetModeIndex_ivas_fx( st, L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC ), element_mode, MCT_flag );

#endif

        }



        test();

lib_enc/prot_fx_enc.h

+0 −8
Original line number Diff line number Diff line
@@ -2685,14 +2685,6 @@ void spec_flatness_fx( 
    Word16 sSFM[SFM_NUM]      /*(o) spectral flatness rate*/

);



#ifndef HARMONIZE_2596_SetModeIndex

void SetModeIndex_fx(

    Encoder_State *st,

    Word32 last_total_brate,        /* Q0 */

    const Word16 last_element_mode, /* Q0 */

    const Word16 is_mct,            /* Q0 */

    const Word16 shift );

#endif



void MDCT_selector_fx(

    Encoder_State *st,          /* i/o: Encoder State           */