Commit 1cbeda91 authored by janssontoftg's avatar janssontoftg
Browse files

Corrections for merge conflicts 

Code formatting
parent e727527e

lib_com/ivas_prot.h

+4 −3
Original line number Diff line number Diff line
@@ -215,11 +215,12 @@ ivas_error pre_proc_front_ivas( 
    const int16_t flag_16k_smc,                                 /* i  : flag to indicate if the OL SMC is run at 16 kHz */

    const int16_t front_vad_flag,                               /* i  : front-VAD flag to overwrite VAD decision   */

    const int16_t force_front_vad,                              /* i  : flag to force VAD decision                 */

    const int16_t front_vad_dtx_flag                            /* i  : front-VAD DTX flag to overwrite VAD decision*/

#ifdef LOW_RATE_TRANS

    const int16_t front_vad_dtx_flag,                           /* i  : front-VAD DTX flag to overwrite VAD decision*/

    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                          */

    const int16_t ivas_format                                   /* i  : IVAS format */

#else

    const int16_t front_vad_dtx_flag                            /* i  : front-VAD DTX flag to overwrite VAD decision*/

   ,const int32_t ivas_total_brate                             /* i  : IVAS total bitrate                       */    

#endif

);

lib_enc/ivas_core_pre_proc_front.c

+4 −3
Original line number Diff line number Diff line
@@ -108,11 +108,12 @@ ivas_error pre_proc_front_ivas( 
    const int16_t flag_16k_smc,                                /* i  : flag to indicate if the OL SMC is run at 16 kHz */

    const int16_t front_vad_flag,                              /* i  : front-VAD flag to overwrite VAD decision */

    const int16_t force_front_vad,                             /* i  : flag to force VAD decision               */

    const int16_t front_vad_dtx_flag                           /* i  : front-VAD DTX flag to overwrite VAD decision*/

#ifdef LOW_RATE_TRANS

    const int16_t front_vad_dtx_flag, /* i  : front-VAD DTX flag to overwrite VAD decision*/

    const int32_t ivas_total_brate,   /* i  : IVAS total bitrate - for setting the DTX */

    const int16_t ivas_format         /* i  : IVAS format */

#else

    const int16_t front_vad_dtx_flag /* i  : front-VAD DTX flag to overwrite VAD decision*/

    ,

    const int32_t ivas_total_brate /* i  : IVAS total bitrate - for setting the DTX */

#endif

lib_enc/ivas_cpe_enc.c

+1 −1

File changed.

Contains only whitespace changes.