Commit 73dd5194 authored by multrus's avatar multrus
Browse files

Merge branch 'basop-2596-harmonize-setmodeindex' into 'main' 

Resolve "Harmonize SetModeIndex"

Closes #2596

See merge request !3040
parents e6347c35 0821bb4f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ 
#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define HARMONIZE_2595_reconfig_decoder_LPD             /* FhG: Harmonize reconfig_decoder_LPD with its ivas derivate */

#define HARMONIZE_2596_SetModeIndex                     /* FhG: Harmonize SetModeIndex with its ivas derivate */



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

lib_com/prot_fx.h

+8 −0
Original line number Diff line number Diff line
@@ -9547,11 +9547,19 @@ 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

);



void init_tcx_cfg_ivas_fx(

lib_enc/ivas_core_pre_proc_front_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1501,7 +1501,11 @@ 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

+9 −0
Original line number Diff line number Diff line
@@ -351,7 +351,11 @@ 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();
@@ -411,7 +415,12 @@ 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

+2 −0
Original line number Diff line number Diff line
@@ -2672,12 +2672,14 @@ 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           */