Commit a15eb533 authored by vaclav's avatar vaclav
Browse files

formatting

parent 7e298a5a

apps/decoder.c

+8 −11
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ typedef struct 
    int16_t Opt_dpid_on;

#endif

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];



} DecArguments;
@@ -157,22 +158,16 @@ typedef struct 
 *------------------------------------------------------------------------------------------*/



static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );



static void usage_dec( void );



#ifdef SPLIT_REND_WITH_HEAD_ROT

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, uint8_t *splitRendBitsBuf, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

#else

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

#endif



static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );



#ifdef DEBUGGING

static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );



static int16_t app_own_random( int16_t *seed );



static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );

#endif
@@ -188,6 +183,13 @@ int main( 
{

    bool mainFailed = true; /* Assume main failed until cleanup is reached without errors */

    DecArguments arg;

    ivas_error error = IVAS_ERR_UNKNOWN;

    int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE];

#ifdef SPLIT_REND_WITH_HEAD_ROT

    uint8_t splitRendBitsBuf[IVAS_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES];

#endif



    /* Any handles that require cleanup must be declared here and initialized to NULL */

    IVAS_DEC_HANDLE hIvasDec = NULL;

    BS_READER_HANDLE hBsReader = NULL;

    LsCustomFileReader *hLsCustomReader = NULL;
@@ -196,11 +198,6 @@ int main( 
    RotFileReader *externalOrientationFileReader = NULL;

    RotFileReader *refRotReader = NULL;

    Vector3PairFileReader *referenceVectorReader = NULL;

    ivas_error error = IVAS_ERR_UNKNOWN;

    int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE];

#ifdef SPLIT_REND_WITH_HEAD_ROT

    uint8_t splitRendBitsBuf[IVAS_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES];

#endif

    RenderConfigReader *renderConfigReader = NULL;

#ifdef DEBUGGING

    int32_t noClipping;

apps/encoder.c

+2 −7
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ typedef struct 
    const char *ca_config_file;

    bool mimeOutput;

    IVAS_ENC_COMPLEXITY_LEVEL complexityLevel;



#ifdef DEBUGGING

    IVAS_ENC_FORCED_MODE forcedMode;

    const char *forcedModeFile;
@@ -178,7 +177,7 @@ int main( 
{

    bool mainFailed = true; /* Assume main failed until cleanup is reached without errors */

    EncArguments arg;

    int16_t i = 0;

    int16_t i;

    ivas_error error = IVAS_ERR_UNKNOWN;



    /* Any handles that require cleanup must be declared here and initialized to NULL */
@@ -189,11 +188,7 @@ int main( 
    FILE *f_bwProfile = NULL;

    JbmFileReader *jbmReader = NULL;

    MasaFileReader *masaReader = NULL;

    IsmFileReader *ismReaders[IVAS_MAX_NUM_OBJECTS];

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

    {

        ismReaders[i] = NULL;

    }

    IsmFileReader *ismReaders[IVAS_MAX_NUM_OBJECTS] = { NULL, NULL, NULL, NULL };

    int16_t *pcmBuf = NULL;

#ifdef DEBUGGING

    FILE *f_forcedModeProfile = NULL;

lib_rend/ivas_stat_rend.h

+8 −8
Original line number Diff line number Diff line
@@ -668,6 +668,7 @@ typedef struct ivas_external_orientation_struct 
    int16_t numFramesToTargetOrientation[MAX_PARAM_SPATIAL_SUBFRAMES]; /* Number of frames until target orientation is reached        */

    IVAS_QUATERNION Quaternions[MAX_PARAM_SPATIAL_SUBFRAMES];          /* External orientation in quaternions                         */

    int16_t num_subframes;



} EXTERNAL_ORIENTATION_DATA, *EXTERNAL_ORIENTATION_HANDLE;



/*----------------------------------------------------------------------------------*
@@ -706,6 +707,7 @@ typedef struct ivas_combined_orientation_struct 
    int8_t isExtOrientationFrozen;

    int8_t isHeadRotationFrozen;

    int16_t num_subframes;



} COMBINED_ORIENTATION_DATA, *COMBINED_ORIENTATION_HANDLE;
@@ -829,8 +831,8 @@ typedef struct 
    float soundspeed;

    float air_coeff;

    shoebox_config_t cal;

} shoebox_obj_t;



} shoebox_obj_t;



typedef struct shoebox_data_t

{
@@ -839,7 +841,6 @@ typedef struct shoebox_data_t 


} shoebox_data_t;





typedef struct

{

    uint16_t n_sources;
@@ -851,6 +852,7 @@ typedef struct 


} shoebox_output_t;





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

 * Reflections structure

 *----------------------------------------------------------------------------------*/
@@ -1072,8 +1074,8 @@ typedef struct TDREND_SRC_REND_s 
    float SrcGainMax_p[SPAT_BIN_MAX_INPUT_CHANNELS];

    float DirGain_p[SPAT_BIN_MAX_INPUT_CHANNELS];

    float DistGain_p[SPAT_BIN_MAX_INPUT_CHANNELS];

} TDREND_SRC_REND_t;



} TDREND_SRC_REND_t;



/* Source spatial parameters */

typedef struct
@@ -1106,6 +1108,7 @@ typedef struct 
    float mem_hrf_right[SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1];

    float Gain;

    float prevGain;



} TDREND_SRC_t;



/* Top level TD binaural renderer handle */
@@ -1224,7 +1227,7 @@ typedef struct ivas_binaural_rendering_struct 
#endif



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

 * HRTF structures - htrfs from binary files

 * HRTF structures - hrtfs from binary files

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



typedef struct ivas_hrtfs_crend_structure
@@ -1237,9 +1240,7 @@ typedef struct ivas_hrtfs_crend_structure 


} HRTFS_CREND, *HRTFS_CREND_HANDLE;





/* Fastconv binaural data structure */



typedef struct ivas_hrtfs_fastconv_struct

{

    float FASTCONV_HOA3_latency_s;
@@ -1279,7 +1280,6 @@ typedef struct ivas_hrtfs_fastconv_struct 


} HRTFS_FASTCONV, *HRTFS_FASTCONV_HANDLE;





typedef struct ivas_hrtfs_parambin_struct

{

    float hrtfShCoeffsRe[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];
@@ -1523,7 +1523,6 @@ typedef struct ivas_LS_setupconversion_struct 


} LSSETUP_CONVERSION_STRUCT, *LSSETUP_CONVERSION_HANDLE;





typedef struct ivas_LS_setupconversion_matrix

{

    int16_t index;
@@ -1578,6 +1577,7 @@ typedef struct 
    int32_t binaural_latency_ns;

    BINAURAL_RENDERER_HANDLE hCldfbRend;

    HRTFS_FASTCONV_HANDLE hHrtfFastConv;



} CLDFB_REND_WRAPPER;



#endif