Commit 7470d8dd authored by vaclav's avatar vaclav
Browse files

revision of common API types

parent 9da419d7

apps/decoder.c

+17 −29
Original line number Diff line number Diff line
@@ -69,22 +69,10 @@ static 
#endif

    int32_t frame = 0; /* Counter of frames */



#ifdef DEBUGGING

#define MIN_NUM_BITS_ACTIVE_FRAME 56

#define NUM_BITS_SID_IVAS_5K2     104

#define MAX_OUTPUT_PCM_BUFFER_SIZE ( ( IVAS_MAX_OUTPUT_CHANNELS + IVAS_MAX_NUM_OBJECTS ) * IVAS_MAX_FRAME_SIZE )



#define ORIENT_TRK_NONE        ( 0 )

#define ORIENT_TRK_REF         ( 1 )

#define ORIENT_TRK_AVG         ( 2 )

#define ORIENT_TRK_REF_VEC     ( 3 )

#define ORIENT_TRK_REF_VEC_LEV ( 4 )



#ifdef VARIABLE_SPEED_DECODING

#define VARIABLE_SPEED_FETCH_FRAMESIZE_MS 20

#endif

#define JBM_FRONTEND_FETCH_FRAMESIZE_MS 20

#define HEADROTATION_FETCH_FRAMESIZE_MS 5

#define DEFAULT_FETCH_FRAMESIZE_MS      20





/*------------------------------------------------------------------------------------------*
@@ -129,7 +117,7 @@ typedef struct 
    IVAS_DEC_INPUT_FORMAT inputFormat;

    bool customLsOutputEnabled;

    char *customLsSetupFilename;

    int16_t orientation_tracking;

    IVAS_HEAD_ORIENT_TRK_T orientation_tracking;

    bool non_diegetic_pan_enabled;

    float non_diegetic_pan_gain;

    bool renderConfigEnabled;
@@ -183,7 +171,7 @@ typedef struct 
static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );

static void usage_dec( void );

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, IVAS_DEC_HANDLE hIvasDec );

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );

#ifdef DEBUGGING

static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );
@@ -359,7 +347,7 @@ int main( 
        }



        /* sanity check */

        if ( arg.orientation_tracking != ORIENT_TRK_REF )

        if ( arg.orientation_tracking != IVAS_HEAD_ORIENT_TRK_REF )

        {

            fprintf( stderr, "\nError: Reference rotation file can be used in '-otr ref' mode only.\n\n" );

            goto cleanup;
@@ -386,7 +374,7 @@ int main( 
        }



        /* sanity check */

        if ( arg.orientation_tracking != ORIENT_TRK_REF_VEC && arg.orientation_tracking != ORIENT_TRK_REF_VEC_LEV )

        if ( arg.orientation_tracking != IVAS_HEAD_ORIENT_TRK_REF_VEC && arg.orientation_tracking != IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV )

        {

            fprintf( stderr, "\nError: Reference trajectory file can be used in '-otr ref_vec' or '-otr ref_vec_lev' mode only.\n\n" );

            goto cleanup;
@@ -757,7 +745,7 @@ int main( 


    if ( arg.voipMode )

    {

        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, hIvasDec );

        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, hIvasDec, pcmBuf );

    }

    else

    {
@@ -973,7 +961,7 @@ static bool parseCmdlIVAS_dec( 


    arg->enableHeadRotation = false;

    arg->headrotTrajFileName = NULL;

    arg->orientation_tracking = ORIENT_TRK_NONE;

    arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;

    arg->enableReferenceRotation = false;

    arg->headrotTrajFileName = NULL;

    arg->enableReferenceVectorTracking = false;
@@ -1246,23 +1234,23 @@ static bool parseCmdlIVAS_dec( 


            if ( strcmp( argv_to_upper, "NONE" ) == 0 )

            {

                arg->orientation_tracking = ORIENT_TRK_NONE;

                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;

            }

            else if ( strcmp( argv_to_upper, "REF" ) == 0 )

            {

                arg->orientation_tracking = ORIENT_TRK_REF;

                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF;

            }

            else if ( strcmp( argv_to_upper, "AVG" ) == 0 )

            {

                arg->orientation_tracking = ORIENT_TRK_AVG;

                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_AVG;

            }

            else if ( strcmp( argv_to_upper, "REF_VEC" ) == 0 )

            {

                arg->orientation_tracking = ORIENT_TRK_REF_VEC;

                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF_VEC;

            }

            else if ( strcmp( argv_to_upper, "REF_VEC_LEV" ) == 0 )

            {

                arg->orientation_tracking = ORIENT_TRK_REF_VEC_LEV;

                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV;

            }

            else

            {
@@ -2964,14 +2952,15 @@ static ivas_error decodeVoIP( 
    RotFileReader *refRotReader,

    Vector3PairFileReader *referenceVectorReader,

    ObjectEditFileReader *objectEditFileReader,

    IVAS_DEC_HANDLE hIvasDec )

    IVAS_DEC_HANDLE hIvasDec,

    int16_t *pcmBuf )

{

    bool decodingFailed = true; /* Assume failure until cleanup is reached without errors */

    ivas_error error = IVAS_ERR_OK;



    uint32_t nextPacketRcvTime_ms = 0;

    uint32_t systemTime_ms = 0;

    uint32_t systemTimeInc_ms = (uint32_t) JBM_FRONTEND_FETCH_FRAMESIZE_MS;

    uint32_t systemTimeInc_ms = (uint32_t) ( 1000 / IVAS_NUM_FRAMES_PER_SEC );

    int32_t nFramesFed = 0;



    uint8_t au[( IVAS_MAX_BITS_PER_FRAME + 7 ) >> 3];
@@ -2985,7 +2974,6 @@ static ivas_error decodeVoIP( 
    MasaFileWriter *masaWriter = NULL;

    uint16_t numObj = 0;



    int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE];

    AudioFileWriter *afWriter = NULL;

#ifdef SUPPORT_JBM_TRACEFILE

    JbmTraceFileWriter *jbmTraceWriter = NULL;

apps/isar_post_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ int main( 


    memset( outBuffer.data, 0, outBuffer.config.numSamplesPerChannel * outBuffer.config.numChannels * sizeof( float ) );



    bitsBufferSize = SPLIT_REND_BITS_BUFF_SIZE;

    bitsBufferSize = ISAR_SPLIT_REND_BITS_BUFF_SIZE;



    if ( bitsBufferSize > 0 )

    {

apps/renderer.c

+3 −3
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ typedef struct 
    char externalOrientationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    int8_t orientation_tracking;

    IVAS_HEAD_ORIENT_TRK_T orientation_tracking;

    int16_t Opt_Headrotation;

    int16_t Opt_ExternalOrientation;

    int16_t nonDiegeticPan;
@@ -1436,7 +1436,7 @@ int main( 


    if ( is_split_pre_rend_mode( &args ) )

    {

        bitsBufferSize = SPLIT_REND_BITS_BUFF_SIZE;

        bitsBufferSize = ISAR_SPLIT_REND_BITS_BUFF_SIZE;

    }

    else

    {
@@ -2268,7 +2268,7 @@ static bool parseRenderFramesize( 


static bool parseOrientationTracking(

    char *value,

    int8_t *orientation_tracking )

    IVAS_HEAD_ORIENT_TRK_T *orientation_tracking )

{

    to_upper( value );

lib_com/common_api_types.h

+11 −15
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ 
 * Common API constants

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



#define IVAS_NUM_FRAMES_PER_SEC 50

#define IVAS_MAX_FRAME_SIZE     ( 48000 / IVAS_NUM_FRAMES_PER_SEC )

#define IVAS_MAX_BITS_PER_FRAME ( 512000 / IVAS_NUM_FRAMES_PER_SEC )

#define IVAS_NUM_FRAMES_PER_SEC 50                                   /* number of frames per second */

#define IVAS_MAX_FRAME_SIZE     ( 48000 / IVAS_NUM_FRAMES_PER_SEC )  /* maximum frame buffer length (per channel) in samples; corresponds to maximum sampling rate of 48 kHz */

#define IVAS_MAX_BITS_PER_FRAME ( 512000 / IVAS_NUM_FRAMES_PER_SEC ) /* maximum bits per frame; corresponds to maximum bitrate of 512 kbps */



#define IVAS_MAX_NUM_OBJECTS       4

#define IVAS_MAX_INPUT_CHANNELS    16
@@ -57,11 +57,6 @@ 
#define IVAS_MAX_PARAM_SPATIAL_SUBFRAMES 4

#define IVAS_ROOM_ABS_COEFF              6



/* Maximum buffer length (per channel) in samples */

#define MAX_BUFFER_LENGTH_PER_CHANNEL ( L_FRAME48k )



/* Frame size required when rendering to binaural */

#define BINAURAL_RENDERING_FRAME_SIZE_MS 5



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

 * Common API enum for output audio configurations
@@ -174,12 +169,12 @@ typedef enum 
typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;

typedef struct ivas_masa_decoder_ext_out_meta_struct *IVAS_MASA_DECODER_EXT_OUT_META_HANDLE;



typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;

typedef struct ivas_hrtf_TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;

typedef struct ivas_hrtf_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;

typedef struct ivas_hrtfs_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;

typedef struct ivas_hrtfs_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;

typedef struct ivas_hrtfs_statistics_struct *IVAS_DEC_HRTF_STATISTICS_HANDLE;

typedef struct cldfb_filter_bank_struct *IVAS_CLDFB_FILTER_BANK_HANDLE;

typedef struct ivas_hrtf_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;

typedef struct ivas_hrtf_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;

typedef struct ivas_hrtf_statistics_struct *IVAS_DEC_HRTF_STATISTICS_HANDLE;

typedef struct ivas_cldfb_filter_bank_struct *IVAS_CLDFB_FILTER_BANK_HANDLE;



typedef struct ivas_LS_setup_custom *IVAS_LSSETUP_CUSTOM_HANDLE;

typedef struct ivas_LS_setup_custom IVAS_LSSETUP_CUSTOM_STRUCT;
@@ -228,7 +223,7 @@ typedef enum _ivas_binaural_renderer_type 
#define ISAR_MAX_SPLIT_REND_BITRATE                   768000

#define ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (int32_t) ISAR_MAX_SPLIT_REND_BITRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )

#define ISAR_SPLIT_REND_ADDITIONAL_BYTES_TO_READ      1

#define SPLIT_REND_BITS_BUFF_SIZE                     ( ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES + ISAR_SPLIT_REND_ADDITIONAL_BYTES_TO_READ )

#define ISAR_SPLIT_REND_BITS_BUFF_SIZE                ( ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES + ISAR_SPLIT_REND_ADDITIONAL_BYTES_TO_READ )



typedef enum

{
@@ -306,8 +301,8 @@ typedef enum 
    IVAS_RENDER_TYPE_OVERRIDE_FASTCONV



} IVAS_RENDER_TYPE_OVERRIDE;

#endif



#endif

typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG

{

    int16_t nBands;                                   /* Number of frequency bands for which reverb properties are provided, integer, range [2..256]        */
@@ -350,6 +345,7 @@ typedef struct 
{

    IVAS_REND_AudioBufferConfig config;

    float *data;



} IVAS_REND_AudioBuffer;



#endif /* COMMON_API_TYPES_H */

lib_com/stat_com.h

+1 −1
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ typedef struct 


} FrameSizeParams;



typedef struct cldfb_filter_bank_struct

typedef struct ivas_cldfb_filter_bank_struct

{

    int16_t no_channels;

    int16_t no_col;