Commit 528f05be authored by Vidhya V P's avatar Vidhya V P
Browse files

clang format changes

parent 59644cfd

lib_com/ivas_prot.h

+2 −2
Original line number Diff line number Diff line
@@ -3144,12 +3144,12 @@ 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

#ifdef SBA_BR_SWITCHING

    , const int16_t sba_order

#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

+2 −11
Original line number Diff line number Diff line
@@ -81,17 +81,8 @@ SBA_MODE ivas_sba_mode_select( 


int16_t get_sba_reinit_flag(

    int32_t ivas_total_bitrate,    /* i  : Current bitrate  */

<<<<<<< HEAD

    int32_t last_ivas_total_brate, /* i  : Previous bitrate  */

    int16_t sba_order

=======

    int32_t last_ivas_total_brate /* i  : Previous bitrate  */

#ifdef SBA_BR_SWITCHING_2

    ,

    const int16_t sba_order

#endif

>>>>>>> main

)

    int16_t sba_order )

{

    int16_t sba_reinit_flag;

lib_enc/ivas_sba_enc.c

+4 −3
Original line number Diff line number Diff line
@@ -349,7 +349,8 @@ ivas_error ivas_sba_enc_reconfigure( 
        nCPE_old = st_ivas->nCPE;

        nSCE_old = st_ivas->nSCE;

#ifdef SBA_BR_SWITCHING_RECONFIG

        SBA_MODE sba_mode_old = st_ivas->sba_mode;

        SBA_MODE sba_mode_old;

        sba_mode_old = st_ivas->sba_mode;

        st_ivas->flag_sba_bitrate_switch = 1;

#endif

        st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, hEncoderConfig->sba_order );

lib_dec/ivas_init_dec.c

+1 −1

File changed.

Contains only whitespace changes.

lib_enc/ivas_ism_enc.c

+2 −2

File changed.

Contains only whitespace changes.

lib_enc/ivas_sce_enc.c

+1 −1

File changed.

Contains only whitespace changes.