Commit f1bb6f3f authored by Vidhya V P's avatar Vidhya V P
Browse files

Combined two switches into one 

[x] Merged the changes under the switch 'SBA_BR_SWITCHING_2' into 'SBA_BR_SWITCHING'
parent 56c40ab0

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ typedef enum 
{

    DIRAC_OPEN,                                 /* initialize to default value              */

    DIRAC_RECONFIGURE                           /* HOA3                                     */

#ifdef SBA_BR_SWITCHING_2

#ifdef SBA_BR_SWITCHING

    ,

    DIRAC_RECONFIGURE_MODE

#endif

lib_com/ivas_prot.h

+1 −3
Original line number Diff line number Diff line
@@ -117,13 +117,11 @@ ivas_error ivas_sba_enc_reinit( 
int16_t get_sba_reinit_flag(

    int32_t ivas_total_bitrate,                                /* i  : Current bitrate  */

    int32_t last_ivas_total_brate                              /* i  : Previous bitrate  */

#ifdef SBA_BR_SWITCHING_2

    , int16_t sba_order

#endif

);

#endif

#endif

#ifdef SBA_BR_SWITCHING_2

#ifdef SBA_BR_SWITCHING

ivas_error ivas_spar_md_enc_init

(

    ivas_spar_md_enc_state_t *hMdEnc,                         /* o  : MD encoder handle        */

lib_com/ivas_sba_config.c

+1 −12
Original line number Diff line number Diff line
@@ -81,23 +81,15 @@ SBA_MODE ivas_sba_mode_select( 


int16_t get_sba_reinit_flag(

    int32_t ivas_total_bitrate,   /* i  : Current bitrate  */

    int32_t last_ivas_total_brate /* i  : Previous bitrate  */

#ifdef SBA_BR_SWITCHING_2

    ,

    int32_t last_ivas_total_brate, /* i  : Previous bitrate  */

    int16_t sba_order

#endif

)

{

    int16_t sba_reinit_flag;



    sba_reinit_flag = 0;

#ifdef SBA_BR_SWITCHING_2

    if ( ivas_total_bitrate != last_ivas_total_brate && ( ivas_total_bitrate > IVAS_SID_5k2 ) )

#else

    if ( ivas_total_bitrate != last_ivas_total_brate && ( last_ivas_total_brate > IVAS_SID_5k2 ) && ( ivas_total_bitrate > IVAS_SID_5k2 ) )

#endif

    {

#ifdef SBA_BR_SWITCHING_2

        int16_t sba_analysis_order, nchan_transport_old, nchan_transport_new;

        SBA_MODE last_sba_mode, current_sba_mode;

        sba_analysis_order = ivas_sba_get_analysis_order( last_ivas_total_brate, sba_order );
@@ -108,11 +100,8 @@ int16_t get_sba_reinit_flag( 
        nchan_transport_new = ivas_get_sba_num_TCs( ivas_total_bitrate, min( sba_analysis_order, IVAS_MAX_SBA_ORDER ) );

        if ( ( current_sba_mode != last_sba_mode ) || ( nchan_transport_new != nchan_transport_old ) )

        {

#endif

            sba_reinit_flag = 1;

#ifdef SBA_BR_SWITCHING_2

        }

#endif

    }



    return sba_reinit_flag;

lib_com/options.h

+3 −4
Original line number Diff line number Diff line
@@ -148,12 +148,11 @@ 
#define FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS              /* Issue 124: do not allocate unused plc struct in IVAS modes which is only used in EVS mono */

#define SBA_BR_SWITCHING_RECONFIG                       /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/

#ifdef SBA_BR_SWITCHING_RECONFIG

#define SBA_BR_SWITCHING_2                              /* Issue 114: Changes for SBA bit rate switching with reconfiguration for bitrates with same number of transport channels*/

#define SBA_BR_SWITCHING                              /* Issue 114: Changes for SBA bit rate switching with reconfiguration for bitrates with same number of transport channels*/

#endif

#ifndef SBA_BR_SWITCHING_2

#define SBA_BR_SWITCHING_2                              /* Issue 114: Changes for SBA bit rate switching with reconfiguration for bitrates with same number of transport channels*/

#ifndef SBA_BR_SWITCHING

#define SBA_BR_SWITCHING                              /* Issue 114: Changes for SBA bit rate switching with reconfiguration for bitrates with same no:of transport channels and reinitialization for different no:of transport channels */

#endif

#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define FIX_ITD                                         /* Contribution 16: TD renderer ITD improvement and code cleanup */

#define BRATE_SWITCHING_RENDERING                       /* Bitrate switching changes related to the renderers */

#define FIX_ISM_DECODER_PRINTOUT                        /* Issue 229: fix ISM decoder printout */

lib_dec/ivas_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ ivas_error ivas_dec( 
    if ( !st_ivas->bfi ) /* do not update if first frame(s) are lost or NO_DATA */

    {

        st_ivas->hDecoderConfig->last_ivas_total_brate = ivas_total_brate;

#ifdef SBA_BR_SWITCHING_2

#ifdef SBA_BR_SWITCHING

        st_ivas->last_active_ivas_total_brate = ( ivas_total_brate <= IVAS_SID_5k2 ) ? st_ivas->last_active_ivas_total_brate : ivas_total_brate;

#endif

    }