Commit 11b4e9e6 authored by PLAINSI's avatar PLAINSI
Browse files

Cosmetic changes

parent 271759c0

lib_com/cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -2237,11 +2237,13 @@ enum 
    VOIP_RTPDUMP

};



#ifndef JBM_PARAMUPMIX

typedef enum _COV_SMOOTHING_TYPE

{

    COV_SMOOTH_SPAR,

    COV_SMOOTH_MC

} COV_SMOOTHING_TYPE;

#endif



/* clang-format on */

#endif /* CNST_H */

lib_com/ivas_cnst.h

+8 −0
Original line number Diff line number Diff line
@@ -1332,6 +1332,14 @@ typedef enum 
#define MC_PARAMUPMIX_NCH                  2           /* number of channels to combine into 1 */

#define MC_PARAMUPMIX_MIN_CLDFB            8



#ifdef JBM_PARAMUPMIX

typedef enum _COV_SMOOTHING_TYPE

{

    COV_SMOOTH_SPAR,

    COV_SMOOTH_MC

} COV_SMOOTHING_TYPE;

#endif



typedef struct {

    const int32_t *value;

    const uint16_t *length;

lib_dec/ivas_mc_paramupmix_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -478,16 +478,16 @@ ivas_error ivas_mc_paramupmix_dec_open( 
        ivas_td_decorr_dec_open( &( hMCParamUpmix->hTdDecorr[i] ), output_Fs, 2, 1 );

    }



#ifdef JBM_PARAMUPMIX

    for ( i = 0; i < MC_PARAMUPMIX_MAX_TRANSPORT_CHANS; i++ )

    {

        if ( ( hMCParamUpmix->pcm_delay[i] = (float *) malloc( 240 * sizeof( float ) ) ) == NULL )

        if ( ( hMCParamUpmix->pcm_delay[i] = (float *) malloc( NS2SA( output_Fs, IVAS_FB_DEC_DELAY_NS ) * sizeof( float ) ) ) == NULL )

        {

            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for delay buffer\n" ) );

        }

        set_zero( hMCParamUpmix->pcm_delay[i], 240 );

        set_zero( hMCParamUpmix->pcm_delay[i], NS2SA( output_Fs, IVAS_FB_DEC_DELAY_NS ) );

    }



#ifdef JBM_PARAMUPMIX

    /* allocate transport channels*/

    hMCParamUpmix->free_param_interpolator = 0;

    hMCParamUpmix->param_interpolator = NULL;