Commit 8cf9ef3c authored by fotopoulou's avatar fotopoulou
Browse files

merge FIX_MC_BR_SW_MCT_UPDT_ENC_COMMON define under MC_BITRATE_SWITCHING

parent 4db795d8

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ 




#define MC_BITRATE_SWITCHING                            /* Issue 116: support bitrate switching in MC format  */

#define FIX_MC_BR_SW_MCT_UPDT_ENC_COMMON





/* ################## End DEVELOPMENT switches ######################### */

lib_com/prot.h

+1 −1
Original line number Diff line number Diff line
@@ -3915,7 +3915,7 @@ void updt_enc( 


void updt_enc_common(

    Encoder_State *st /* i/o: encoder state structure                     */

#ifndef FIX_MC_BR_SW_MCT_UPDT_ENC_COMMON

#ifndef MC_BITRATE_SWITCHING

    ,

    const float Etot /* i  : total energy                                */

#endif

lib_enc/amr_wb_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ void amr_wb_enc( 
    updt_enc( st, old_exc, pitch_buf, 0, Aq, isf_new, isp_new, dummy_buf );



    /* update main codec paramaters */

#ifdef FIX_MC_BR_SW_MCT_UPDT_ENC_COMMON

#ifdef MC_BITRATE_SWITCHING

    st->hNoiseEst->Etot_last = Etot;

    updt_enc_common( st );

#else

lib_enc/evs_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ ivas_error evs_enc( 
     * Updates

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



#ifdef FIX_MC_BR_SW_MCT_UPDT_ENC_COMMON

#ifdef MC_BITRATE_SWITCHING

    st->hNoiseEst->Etot_last = Etot;

    updt_enc_common( st );

#else

lib_enc/ivas_core_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ ivas_error ivas_core_enc( 
/*---------------------------------------------------------------------*

 * Common updates

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

#ifdef FIX_MC_BR_SW_MCT_UPDT_ENC_COMMON

#ifdef MC_BITRATE_SWITCHING

        /* for MCT do this later, otherwise there can be a problem because TCX quant happens later and might get the wrong last_core on a bit rate switch */

        st->hNoiseEst->Etot_last = Etot[n];

        if ( !MCT_flag )