Commit 5f810e24 authored by norvell's avatar norvell
Browse files

Cleanup and bug fixes

parent a5869bb6

lib_com/common_api_types.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ typedef struct _IVAS_ISM_METADATA 
    float yaw;

    float pitch;

#ifdef ISM_NON_DIEGETIC_PAN

    uint16_t non_diegetic_flag;

    int16_t non_diegetic_flag;

#endif

} IVAS_ISM_METADATA;

lib_com/ivas_cnst.h

+7 −5
Original line number Diff line number Diff line
@@ -152,9 +152,10 @@ typedef enum 
    RENDERER_MCMASA_MONO_STEREO,

    RENDERER_PARAM_ISM,

    RENDERER_BINAURAL_MIXER_CONV,

    RENDERER_BINAURAL_MIXER_CONV_ROOM

#if defined NON_DIEGETIC_PAN || defined ISM_NON_DIEGETIC_PAN

    ,

    RENDERER_BINAURAL_MIXER_CONV_ROOM,

    RENDERER_NON_DIEGETIC_DOWNMIX

#else

    RENDERER_NON_DIEGETIC_DOWNMIX

#endif
@@ -1497,10 +1498,11 @@ typedef enum 
typedef enum

{

    TDREND_PLAYSTATUS_INITIAL,

    TDREND_PLAYSTATUS_PLAYING

#ifdef ISM_NON_DIEGETIC_PAN   

    ,

    TDREND_PLAYSTATUS_PLAYING,

    TDREND_PLAYSTATUS_PLAYING_NON_DIEGETIC

#else

    TDREND_PLAYSTATUS_PLAYING

#endif    

} TDREND_PlayStatus_t;

lib_com/ivas_error.h

+0 −3
Original line number Diff line number Diff line
@@ -69,9 +69,6 @@ typedef enum 
    IVAS_ERR_DTX_NOT_SUPPORTED,

    IVAS_ERR_UNEXPECTED_NULL_POINTER,

    IVAS_ERR_METADATA_NOT_EXPECTED,

#ifdef ISM_NON_DIEGETIC_PAN

    IVAS_ERR_NON_DIEGETIC_PAN_METADATA_NOT_EXPECTED,

#endif

    IVAS_ERR_INVALID_SPAR_CONFIG,

    IVAS_ERR_WRONG_PARAMS,

    IVAS_ERR_INIT_ERROR,

lib_com/ivas_ism_com.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ ivas_error ivas_ism_config( 
    const int16_t nchan_ism,        /* i  : number of objects              */

    ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles           */

#ifdef ISM_NON_DIEGETIC_PAN

    const int16_t ism_extended_metadata_flag,

    const int16_t ism_extended_metadata_flag, /* i  : extended metadata flag         */

#endif

    const int16_t localVAD[MAX_NUM_OBJECTS], /* i  : local VAD flag                 */

    const int16_t ism_imp[],                 /* i  : ISM importance flags           */

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ ivas_error ivas_ism_config( 
    const int16_t nchan_ism,                                    /* i  : number of objects                           */

    ISM_METADATA_HANDLE hIsmMeta[],                             /* i/o: ISM metadata handles                        */

#ifdef ISM_NON_DIEGETIC_PAN

    const int16_t ism_extended_metadata_flag,

    const int16_t ism_extended_metadata_flag,                   /* i  : extended metadata flag                      */

#endif

    const int16_t localVAD[MAX_NUM_OBJECTS],                    /* i  : local VAD flag                              */

    const int16_t ism_imp[],                                    /* i  : ISM importance flags                        */