Commit 728f86b4 authored by multrus's avatar multrus
Browse files

Merge branch '20241111_cleanup' into 'main' 

Cleanup 2024-11-11

See merge request !1859
parents 7ab76d69 f84fea7e

apps/decoder.c

+0 −213
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ typedef struct 


} DecArguments;



#ifdef FIX_HRTF_LOAD

typedef struct

{

    hrtfFileReader *hrtfReader;
@@ -176,7 +175,6 @@ typedef struct 


} IVAS_DEC_HRTF_BINARY_WRAPPER;



#endif



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

 * Local functions prototypes
@@ -184,22 +182,15 @@ typedef struct 


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

static void usage_dec( void );

#ifdef FIX_HRTF_LOAD

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, 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, IVAS_DEC_HANDLE hIvasDec );

static ivas_error IVAS_DEC_LoadHrtfFromFile( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const int32_t output_Fs );

#else

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

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

#endif

#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

#ifdef OBJ_EDITING_EXAMPLE

static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters );

#endif





/*------------------------------------------------------------------------------------------*
@@ -230,13 +221,7 @@ int main( 
    RenderConfigReader *renderConfigReader = NULL;

    int16_t *pcmBuf = NULL;

    IVAS_RENDER_FRAMESIZE asked_frame_size;

#ifdef FIX_HRTF_LOAD

    IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;

#else

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

#endif

#ifdef DEBUGGING

    int32_t noClipping;

    int32_t cnt_frames_limited;
@@ -253,11 +238,9 @@ int main( 
    reset_mem( USE_BYTES );

#endif



#ifdef FIX_HRTF_LOAD

    hHrtfBinary.hHrtfTD = NULL;         /* just to avoid compilation warning */

    hHrtfBinary.hSetOfHRTF = NULL;      /* just to avoid compilation warning */

    hHrtfBinary.hHrtfStatistics = NULL; /* just to avoid compilation warning */

#endif



    splitRendBits.bits_buf = splitRendBitsBuf;
@@ -700,9 +683,6 @@ int main( 
                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );

                goto cleanup;

            }

#ifndef FIX_587_DEFAULT_REVERB

            renderConfig.roomAcoustics.override = true;

#endif

        }



        /* ISAR frame size is set from command line, not renderer config file.
@@ -744,111 +724,12 @@ int main( 


    if ( arg.hrtfReaderEnabled )

    {

#ifdef FIX_HRTF_LOAD

        hHrtfBinary.hrtfReader = hrtfReader;

        hHrtfBinary.hrtfFileName = arg.hrtfFileName;

        hHrtfBinary.binaural_renderer = IVAS_BIN_RENDERER_TYPE_NONE;

        hHrtfBinary.binaural_renderer_sec = IVAS_BIN_RENDERER_TYPE_NONE;

        hHrtfBinary.room_reverb_flag = 0;

        hHrtfBinary.intern_audio_config = IVAS_AUDIO_CONFIG_INVALID;

#else

        if ( ( error = IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



        if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

            {

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                goto cleanup;

            }

            else

            {

                destroy_td_hrtf( hHrtfTD );

            }

        }





        if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfCRendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



        if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

            {

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                goto cleanup;

            }

            else

            {

                destroy_SetOfHRTF( hSetOfHRTF );

            }

        }



        IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;

        if ( ( error = IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfFastConvHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



        if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

            {

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                goto cleanup;

            }

            else

            {

                destroy_fastconv_hrtf( hHrtfFastConv );

            }

        }



        IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;

        if ( ( error = IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfParamBinHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



        if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

            {

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                goto cleanup;

            }

            else

            {

                destroy_parambin_hrtf( hHrtfParambin );

            }

        }



        if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }

        if ( ( error = load_reverb_binary( *hHrtfStatistics, arg.output_Fs, hrtfReader ) ) != IVAS_ERR_OK )

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

            {

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                goto cleanup;

            }

            else

            {

                destroy_hrtf_statistics( hHrtfStatistics );

            }

        }

#endif

    }



    /*------------------------------------------------------------------------------------------*
@@ -870,19 +751,11 @@ int main( 


    if ( arg.voipMode )

    {

#ifdef FIX_HRTF_LOAD

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

#else

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

#endif

    }

    else

    {

#ifdef FIX_HRTF_LOAD

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

#else

        error = decodeG192( arg, hBsReader, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, &splitRendBits, hIvasDec, pcmBuf );

#endif

    }



    if ( error == IVAS_ERR_OK || error == IVAS_ERR_END_OF_FILE )
@@ -898,11 +771,7 @@ int main( 
    }

    else

    {

#ifdef FIX_HRTF_LOAD

        fprintf( stderr, "\nDecoding finished prematurely: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

#else

        fprintf( stdout, "Decoding finished prematurely\n\n" );

#endif

        goto cleanup;

    }
@@ -938,20 +807,9 @@ cleanup: 
#endif

    if ( arg.hrtfReaderEnabled )

    {

#ifdef FIX_HRTF_LOAD

        destroy_td_hrtf( hHrtfBinary.hHrtfTD );

        destroy_SetOfHRTF( hHrtfBinary.hSetOfHRTF );

        destroy_hrtf_statistics( hHrtfBinary.hHrtfStatistics );

#else

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );

        destroy_td_hrtf( hHrtfTD );



        IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );

        destroy_SetOfHRTF( hSetOfHRTF );



        IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics );

        destroy_hrtf_statistics( hHrtfStatistics );

#endif

    }



    IVAS_DEC_Close( &hIvasDec );
@@ -2142,9 +2000,7 @@ static ivas_error initOnFirstGoodFrame( 
static ivas_error decodeG192(

    DecArguments arg,

    BS_READER_HANDLE hBsReader,

#ifdef FIX_HRTF_LOAD

    IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary,

#endif

    RotFileReader *headRotReader,

    RotFileReader *externalOrientationFileReader,

    RotFileReader *refRotReader,
@@ -2500,25 +2356,13 @@ static ivas_error decodeG192( 
                    }

                }

#endif

#ifdef FIX_HRTF_LOAD

                /* Feed into decoder and decode transport channels */

                if ( ( error = IVAS_DEC_FeedFrame_Serial( hIvasDec, bit_stream, num_bits, bfi ) ) != IVAS_ERR_OK )

#else

                /* Feed into decoder */

                if ( ( error = IVAS_DEC_FeedFrame_Serial( hIvasDec, bit_stream, num_bits, bfi

#ifdef OBJ_EDITING_API

                                                          ,

                                                          isSplitRend,

                                                          splitRendBits

#endif

                                                          ) ) != IVAS_ERR_OK )

#endif

                {

                    fprintf( stderr, "\nError: could not feed frame to decoder: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;

                }



#ifdef FIX_HRTF_LOAD

                /* Read main parameters from the bitstream to set-up the decoder */

                hHrtfBinary->binaural_renderer_old = hHrtfBinary->binaural_renderer;

                hHrtfBinary->binaural_renderer_sec_old = hHrtfBinary->binaural_renderer_sec;
@@ -2546,8 +2390,6 @@ static ivas_error decodeG192( 
                    return error;

                }



#endif

#ifdef OBJ_EDITING_API

                /* Object metadata editing */

                if ( arg.objEditEnabled )

                {
@@ -2561,10 +2403,8 @@ static ivas_error decodeG192( 
                    }



                    /* Do object metadata editing here ... */

#ifdef OBJ_EDITING_EXAMPLE

                    do_object_editing( &editableParameters );



#endif

                    /* set new object parameters */

                    if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )

                    {
@@ -2580,7 +2420,6 @@ static ivas_error decodeG192( 
                    goto cleanup;

                }

            }

#endif



            /* Render */

            if ( isSplitRend )
@@ -2596,19 +2435,11 @@ static ivas_error decodeG192( 
            }

            else

            {

#ifdef OBJ_EDITING_API

                if ( ( error = IVAS_DEC_GetSamplesRenderer( hIvasDec, nSamplesToRender, IVAS_DEC_PCM_INT16, (void *) ( pcmBuf + nOutChannels * nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError in IVAS_DEC_GetSamplesRenderer(): %s\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;

                }

#else

                    if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, IVAS_DEC_PCM_INT16, (void *) ( pcmBuf + nOutChannels * nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "\nError in IVAS_DEC_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                        goto cleanup;

                    }

#endif



                nSamplesRendered += nSamplesRendered_loop;

                nSamplesToRender -= nSamplesRendered_loop;
@@ -3090,9 +2921,7 @@ static ivas_error writeJbmTraceFileFrameWrapper( const void *data, void *writer 
static ivas_error decodeVoIP(

    DecArguments arg,

    BS_READER_HANDLE hBsReader,

#ifdef FIX_HRTF_LOAD

    IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf,

#endif

    RotFileReader *headRotReader,

    RotFileReader *externalOrientationFileReader,

    RotFileReader *refRotReader,
@@ -3143,14 +2972,10 @@ static ivas_error decodeVoIP( 
    int16_t vec_pos_update, vec_pos_len;

    int16_t nOutSamples = 0;



#ifdef FIX_HRTF_LOAD

    bool bitstreamReadDone = false;

#endif



#ifdef OBJ_EDITING_API

    bool parameterAvailableForEditing = false;

    uint16_t nSamplesRendered = 0;

#endif



    vec_pos_update = 0;

    if ( ( error = IVAS_DEC_GetRenderFramesizeMs( hIvasDec, &systemTimeInc_ms ) ) != IVAS_ERR_OK )
@@ -3268,9 +3093,7 @@ static ivas_error decodeVoIP( 


    while ( 1 )

    {

#ifdef OBJ_EDITING_API

        nSamplesRendered = 0;

#endif



        /* reference vector */

        if ( arg.enableReferenceVectorTracking && vec_pos_update == 0 )
@@ -3433,44 +3256,17 @@ static ivas_error decodeVoIP( 




        /* decode and get samples */

#ifdef OBJ_EDITING_API

        while ( nSamplesRendered < nOutSamples )

        {

#endif

#ifdef SUPPORT_JBM_TRACEFILE

#ifdef FIX_HRTF_LOAD

#ifdef OBJ_EDITING_API

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, systemTime_ms ) ) != IVAS_ERR_OK )

#endif

#else

#ifdef OBJ_EDITING_API

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &nSamplesRendered, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, systemTime_ms ) ) != IVAS_ERR_OK )

#endif

#endif

#else

#ifdef FIX_HRTF_LOAD

#ifdef OBJ_EDITING_API

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &bitstreamReadDone, &nSamplesRendered, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &bitstreamReadDone, systemTime_ms ) ) != IVAS_ERR_OK )

#endif

#else

#ifdef OBJ_EDITING_API

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms, &nSamplesRendered, &parameterAvailableForEditing ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms ) ) != IVAS_ERR_OK )

#endif

#endif

#endif

            {

                fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                goto cleanup;

            }

#ifdef FIX_HRTF_LOAD



            if ( bitstreamReadDone == true )

            {
@@ -3496,8 +3292,6 @@ static ivas_error decodeVoIP( 
                }

            }



#endif

#ifdef OBJ_EDITING_API

            /* Object metadata editing */

            if ( arg.objEditEnabled && parameterAvailableForEditing == true )

            {
@@ -3511,10 +3305,8 @@ static ivas_error decodeVoIP( 
                }



                /* Do object metadata editing here ... */

#ifdef OBJ_EDITING_EXAMPLE

                do_object_editing( &editableParameters );



#endif

                /* set new object parameters */

                if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )

                {
@@ -3523,7 +3315,6 @@ static ivas_error decodeVoIP( 
                }

            }

        } /* while ( nSamplesRendered < nOutSamples ) */

#endif



        /* write JBM Offset file entry */

        if ( jbmOffsetWriter != NULL )
@@ -3806,7 +3597,6 @@ cleanup: 
    return error;

}



#ifdef OBJ_EDITING_EXAMPLE



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

 * do_object_editing()
@@ -3859,7 +3649,6 @@ static void do_object_editing( 
    return;

}



#endif



#ifdef DEBUGGING
@@ -3885,7 +3674,6 @@ static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( 
}

#endif



#ifdef FIX_HRTF_LOAD



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

 * IVAS_DEC_LoadHrtfFromFile()
@@ -4061,6 +3849,5 @@ static ivas_error IVAS_DEC_LoadHrtfFromFile( 


    return IVAS_ERR_OK;

}

#endif



#undef WMC_TOOL_SKIP

apps/renderer.c

+0 −11
Original line number Diff line number Diff line
@@ -615,11 +615,7 @@ static int16_t get_cldfb_in_flag( 
    int16_t cldfb_in_flag;



    cldfb_in_flag = 0;

#ifdef FIX_HRTF_LOAD

    if ( renderConfig->split_rend_config.rendererSelection == IVAS_BIN_RENDERER_TYPE_FASTCONV )

#else

    if ( renderConfig->split_rend_config.rendererSelection == ISAR_SPLIT_REND_RENDERER_SELECTION_FASTCONV )

#endif

    {

#ifdef DEBUGGING

        cldfb_in_flag = 1;
@@ -949,11 +945,7 @@ int main( 
                goto cleanup;

            }



#ifdef FIX_HRTF_LOAD

            if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, 0, IVAS_AUDIO_CONFIG_INVALID, hrtfFileReader ) ) != IVAS_ERR_OK )

#else

            if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hrtfFileReader ) ) != IVAS_ERR_OK )

#endif

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {
@@ -1052,9 +1044,6 @@ int main( 
                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );

                exit( -1 );

            }

#ifndef FIX_587_DEFAULT_REVERB

            renderConfig.roomAcoustics.override = 1;

#endif

        }



        /* ISAR frame size is set from command line, not renderer config file.

lib_com/common_api_types.h

+0 −24
Original line number Diff line number Diff line
@@ -128,13 +128,10 @@ typedef struct _IVAS_ISM_METADATA 
    float yaw;

    float pitch;

    int16_t non_diegetic_flag;

#ifdef OBJ_EDITING_API

    float gain;

#endif



} IVAS_ISM_METADATA;



#ifdef OBJ_EDITING_API

typedef struct _IVAS_EDITABLE_PARAMETERS

{

    int16_t num_obj;
@@ -142,7 +139,6 @@ typedef struct _IVAS_EDITABLE_PARAMETERS 
    float gain_bed;



} IVAS_EDITABLE_PARAMETERS;

#endif



typedef struct

{
@@ -214,7 +210,6 @@ typedef struct _IVAS_JBM_TRACE_DATA 


} IVAS_JBM_TRACE_DATA;



#ifdef FIX_HRTF_LOAD

typedef enum _ivas_binaural_renderer_type

{

    IVAS_BIN_RENDERER_TYPE_NONE,
@@ -225,7 +220,6 @@ typedef enum _ivas_binaural_renderer_type 
    IVAS_BIN_RENDERER_TYPE_DEFAULT,



} IVAS_BIN_RENDERER_TYPE;

#endif



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

 * Split rendering API constants, structures, and enums
@@ -264,17 +258,6 @@ typedef enum 


} ISAR_SPLIT_REND_CODEC;



#ifndef FIX_HRTF_LOAD

typedef enum

{

    ISAR_SPLIT_REND_RENDERER_SELECTION_CREND,

    ISAR_SPLIT_REND_RENDERER_SELECTION_FASTCONV,

    ISAR_SPLIT_REND_RENDERER_SELECTION_PARAMBIN,

    ISAR_SPLIT_REND_RENDERER_SELECTION_TDREND,

    ISAR_SPLIT_REND_RENDERER_SELECTION_DEFAULT,



} ISAR_SPLIT_REND_RENDERER_SELECTION;

#endif



typedef struct _ISAR_SPLIT_REND_BITS_DATA

{
@@ -306,11 +289,7 @@ typedef struct _ISAR_SPLIT_REND_CONFIG 
    int16_t codec_frame_size_ms; /* Codec frame size in milliseconds, only relevant with LC3plus */

    ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode;

    ISAR_SPLIT_REND_CODEC codec;

#ifdef FIX_HRTF_LOAD

    IVAS_BIN_RENDERER_TYPE rendererSelection;

#else

    ISAR_SPLIT_REND_RENDERER_SELECTION rendererSelection;

#endif

    int16_t lc3plus_highres;



} ISAR_SPLIT_REND_CONFIG_DATA, *ISAR_SPLIT_REND_CONFIG_HANDLE;
@@ -331,9 +310,6 @@ typedef enum 


typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG

{

#ifndef FIX_587_DEFAULT_REVERB

    int16_t override;

#endif

    int16_t nBands;                                   /* Number of frequency bands for which reverb properties are provided, integer, range [2..256]        */

    float pFc_input[IVAS_CLDFB_NO_CHANNELS_MAX];      /* Center frequencies for which following values are provided:                                        */

    float pAcoustic_rt60[IVAS_CLDFB_NO_CHANNELS_MAX]; /*  - The room's T60 per center frequency                                                             */

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -1219,11 +1219,9 @@ enum 
#define MASA_MAXIMUM_TWO_DIR_BANDS              24

#define NBITS_HR_COH                            4

#define OMASA_TDREND_MATCHING_GAIN              0.7943f

#ifdef OMASA_OBJECT_EDITING

#define OMASA_GAIN_EDIT_THR                     0.06f                       /* OMASA gain change threshold */

#define OMASA_AZI_EDIT_THR                      1.0f                        /* OMASA-DISC azimuth change threshold */

#define OMASA_ELE_EDIT_THR                      2.0f                        /* OMASA-DISC elevation change threshold */

#endif



#define MASA_JBM_RINGBUFFER_FRAMES              3

lib_com/ivas_error.h

+0 −4
Original line number Diff line number Diff line
@@ -77,9 +77,7 @@ typedef enum 
    IVAS_ERR_EXT_ORIENTATION_NOT_SUPPORTED,

    IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,

    IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,

#ifdef OBJ_EDITING_API

    IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED,

#endif

    IVAS_ERR_INVALID_HRTF,

    IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,

    IVAS_ERR_INVALID_INPUT_FORMAT,
@@ -257,10 +255,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Directivity not supported";

        case IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED:

            return "Acoustic environment not supported";

#ifdef OBJ_EDITING_API

        case IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED:

            return "Objects editing not supported";

#endif

        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

        case IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA: