Commit fd51f9e5 authored by emerit's avatar emerit
Browse files

cleanup

parent bcc50ed2

apps/decoder.c

+0 −2
Original line number Diff line number Diff line
@@ -111,9 +111,7 @@ typedef struct 
    bool customLsOutputEnabled;

    char *customLsSetupFilename;

    int16_t orientation_tracking;

#ifdef NON_DIEGETIC_PAN    

    float non_diegetic_pan;

#endif

    bool renderConfigEnabled;

    char *renderConfigFilename;

lib_com/common_api_types.h

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ typedef struct _IVAS_ISM_METADATA 
    float pitch;

#ifdef ISM_NON_DIEGETIC_PAN

    uint16_t metadata_flag;

//    float non_diegetic_pan;

#endif

} IVAS_ISM_METADATA;

lib_com/ivas_cnst.h

+0 −10
Original line number Diff line number Diff line
@@ -313,12 +313,6 @@ typedef enum 
#define ISM_MEDIUM_IMP                          2

#define ISM_HIGH_IMP                            3



// #ifdef ISM_NON_DIEGETIC_PAN

// #define ISM_NON_DIEGETIC_PAN_NBITS                       5

// #define ISM_NON_DIEGETIC_PAN_MIN                         -1.0f

// #define ISM_NON_DIEGETIC_PAN_DELTA                        0.125f /* Max Pan = ISM_NON_DIEGETIC_PAN_MIN + (2^ISM_RADIUS_NBITS-1)*0.125 = 1 */

// #endif



#define ISM_AZIMUTH_NBITS                       7

#define ISM_AZIMUTH_MIN                         -180.0f

#define ISM_AZIMUTH_MAX                         180.0f
@@ -412,10 +406,6 @@ enum 
    IND_ISM_ELEVATION = TAG_ISM_LOOP_START,

    IND_ISM_RADIUS_DIFF_FLAG = TAG_ISM_LOOP_START,

    IND_ISM_RADIUS = TAG_ISM_LOOP_START,

#ifdef ISM_NON_DIEGETIC_PAN

    IND_ISM_NON_DIEGETIC_PAN_DIFF_FLAG = TAG_ISM_LOOP_START,

    IND_ISM_NON_DIEGETIC_PAN = TAG_ISM_LOOP_START,

#endif 

    TAG_ISM_LOOP_END = TAG_ISM_LOOP_START + 100, /* IVAS_fmToDo: to be reviewed once the final metadata are defined */

    /* --------- end of loop for objects ----------- */

lib_com/ivas_ism_com.c

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#define BETA_ISM_LOW_IMP    0.6f

#define BETA_ISM_MEDIUM_IMP 0.8f





/*-------------------------------------------------------------------*

 * bitbudget_to_brate()

 *

lib_com/ivas_prot.h

+0 −1
Original line number Diff line number Diff line
@@ -795,7 +795,6 @@ ivas_error ivas_set_ism_metadata( 
    const float pitch                                           /* i  : pitch                                       */

#ifdef ISM_NON_DIEGETIC_PAN

,

//    const float non_diegetic_pan,                                      /* i  : non diegetic pan           */

    const uint16_t metadata_flag                                      /* i : 0 VAD, 1 if metadate type is source or 2 if non diegetic pan*/

#endif

);