Commit 48d59587 authored by emerit's avatar emerit
Browse files

merge with main and tested

parent 818b7f19

lib_com/common_api_types.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ typedef struct 
    float x, y, z;

} IVAS_VECTOR3;





typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;

typedef struct ivas_masa_decoder_ext_out_meta_struct *MASA_DECODER_EXT_OUT_META_HANDLE;

lib_com/ivas_cnst.h

+1 −0
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ typedef enum 
#define ISM_Q_STEP_LOW                          (ISM_Q_STEP * 2)

#define ISM_Q_STEP_BORDER_LOW                   (ISM_Q_STEP_BORDER * 2)





typedef enum 

{

    ISM_MODE_NONE,

lib_com/ivas_mct_com.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ void splitAvailableBitsMCT( 
    int16_t min_chan_bits[MCT_MAX_CHANNELS], min_bits_tot, remaining_bits;

    int16_t core[MCT_MAX_CHANNELS];

    MCT_CHAN_MODE mct_chan_mode[MCT_MAX_CHANNELS];



    min_bits_tot = 0;



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

lib_com/ivas_stat_com.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ typedef struct 
    float last_elevation;      /* MD smoothing in DTX - last Q elevation value */

    float last_true_azimuth;   /* MD smoothing in DTX- last true Q azimuth value */

    float last_true_elevation; /* MD smoothing in DTX- last true Q elevation value */



} ISM_METADATA_FRAME, *ISM_METADATA_HANDLE;

lib_dec/ivas_ism_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ ivas_error ivas_ism_dec_config( 


    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;





    /* Assumes that num of input objects are constant */

    nchan_transport_old = st_ivas->nchan_ism;