Commit 20e06083 authored by PLAINSI's avatar PLAINSI
Browse files

Change enum to typedef enum

parent 69119a99

lib_com/cnst.h

+2 −2
Original line number Diff line number Diff line
@@ -2241,11 +2241,11 @@ enum 
};



#ifdef FIX_489_COV_SMOOTHING

enum

typedef enum _COV_SMOOTHING_TYPE

{

    COV_SMOOTH_SPAR,

    COV_SMOOTH_MC

};

} COV_SMOOTHING_TYPE;

#endif



/* clang-format on */

lib_com/ivas_cov_smooth.c

+5 −6
Original line number Diff line number Diff line
@@ -35,13 +35,12 @@ 
#ifdef DEBUGGING

#include "debug.h"

#endif

#include "ivas_prot.h"

#include "wmc_auto.h"

#include "prot.h"



#ifdef FIX_489_COV_SMOOTHING

#include "cnst.h"

#endif

#include "ivas_prot.h"

#include "wmc_auto.h"

#include "prot.h"



#define BAND_SMOOTH_REST_START_IDX ( 2 )

/*-----------------------------------------------------------------------------------------*
@@ -57,7 +56,7 @@ static void ivas_set_up_cov_smoothing( 
    const int16_t min_pool_size

#ifdef FIX_489_COV_SMOOTHING

    ,

    const int16_t smooth_mode /* i  : flag multichannel vs SPAR       */

    const COV_SMOOTHING_TYPE smooth_mode /* i  : flag multichannel vs SPAR       */

#endif

    ,

    const int32_t ivas_total_brate )
@@ -161,7 +160,7 @@ ivas_error ivas_spar_covar_smooth_enc_open( 
    const int16_t nchan_inp                      /* i  : number of input channels       */

    ,

#ifdef FIX_489_COV_SMOOTHING

    int16_t smooth_mode, /* i : Smooth covariance for SPAR or MC */

    COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC */

#endif

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

)

lib_com/ivas_prot.h

+2 −2
Original line number Diff line number Diff line
@@ -4734,7 +4734,7 @@ ivas_error ivas_spar_covar_enc_open( 
    const int16_t nchan_inp                                     /* i  : number of input channels                */

	,

#ifdef FIX_489_COV_SMOOTHING

    int16_t smooth_mode,                                        /* i : Smooth covariance for SPAR or MC*/

    COV_SMOOTHING_TYPE smooth_mode,                    /* i : Smooth covariance for SPAR or MC*/

#endif

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

);
@@ -4767,7 +4767,7 @@ ivas_error ivas_spar_covar_smooth_enc_open( 
    const int16_t nchan_inp                                     /* i  : number of input channels                */

    ,

#ifdef FIX_489_COV_SMOOTHING

    int16_t smooth_mode,                                        /* i : Smooth covariance for SPAR or MC*/

    COV_SMOOTHING_TYPE smooth_mode,                    /* i : Smooth covariance for SPAR or MC*/

#endif

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

);

lib_enc/ivas_enc_cov_handler.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ ivas_error ivas_spar_covar_enc_open( 
    const int16_t nchan_inp                 /* i  : number of input channels       */

    ,

#ifdef FIX_489_COV_SMOOTHING

    int16_t smooth_mode, /* i : Smooth covariance for SPAR or MC */

    COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC */

#endif

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

)