Commit 2386b513 authored by vaclav's avatar vaclav
Browse files

fixes + revision

parent 55e930ae

apps/decoder.c

+5 −3
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ typedef struct 
    hrtfFileReader *hrtfReader;

    char *hrtfFileName;



    IVAS_DEC_HRTF_HANDLE *hHrtfTD;

    IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD;



    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics;
@@ -202,7 +202,7 @@ int main( 
#ifdef FIX_CREND_SIMPLIFY_CODE

    IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;

#else

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

#endif
@@ -595,7 +595,7 @@ int main( 
    }



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

     * Load HRTF binary file data

     * Initialize HRTF binary file data

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



    if ( arg.hrtfReaderEnabled )
@@ -727,6 +727,7 @@ int main( 
        goto cleanup;

    }

#endif



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

     * Decoding

     *-----------------------------------------------------------------*/
@@ -808,6 +809,7 @@ cleanup: 
    }



#ifdef FIX_1990_SANITIZER_IN_REVERB_LOAD

    // TODO:

    /* This free differs from float version and is done always. This should be safe to do even though we leave a return

     * value as not handled. This is needed as HRTF statistics from ROM are currently converted from float values. */

#ifdef FIX_CREND_SIMPLIFY_CODE

apps/renderer.c

+3 −3
Original line number Diff line number Diff line
@@ -755,7 +755,7 @@ int main( 
#endif

    IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;

    IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

    IsmPositionProvider *positionProvider = NULL;

    LfeRoutingConfig *lfeRoutingConfigs[RENDERER_MAX_MC_INPUTS];
@@ -994,7 +994,7 @@ int main( 


        if ( hrtfFileReader != NULL )

        {

            if ( ( error = IVAS_REND_GetHrtfHandle( hIvasRend, &hHrtfTD ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_REND_GetHrtfTdHandle( hIvasRend, &hHrtfTD ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nIVAS_REND_GetHrtfHandle failed: %s\n\n", ivas_error_to_string( error ) );

                goto cleanup;
@@ -1023,6 +1023,7 @@ int main( 
                fprintf( stderr, "\nIVAS_Rend_GetHrtfCRendHandle failed: %s\n\n", ivas_error_to_string( error ) );

                goto cleanup;

            }



            IVAS_AUDIO_CONFIG hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_7_1_4;

            if ( args.inConfig.ambisonicsBuses->audioConfig != IVAS_AUDIO_CONFIG_INVALID && args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

            {
@@ -2769,7 +2770,6 @@ static CmdlnArgs defaultArgs( 
#ifdef FIX_CREND_SIMPLIFY_CODE

    args.inConfig.ambisonicsBuses->audioConfig = IVAS_AUDIO_CONFIG_INVALID;





    for ( i = 0; i < RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS; ++i )

#else

    for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )

lib_com/common_api_types.h

+2 −2
Original line number Diff line number Diff line
@@ -179,13 +179,13 @@ 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;



#ifdef FIX_CREND_SIMPLIFY_CODE

typedef struct ivas_hrtf_TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;

typedef struct ivas_hrtf_TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_TD_HANDLE;

typedef struct ivas_hrtf_crend_structure *IVAS_DEC_HRTF_CREND_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;

#else

typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;

typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_TD_HANDLE;

typedef struct ivas_hrtfs_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;

lib_com/ivas_cnst.h

+2 −3
Original line number Diff line number Diff line
@@ -1652,6 +1652,7 @@ typedef enum 


#define BINAURAL_COHERENCE_DIFFERENCE_BINS      9                           /* Number of bins for direction-dependent diffuse-field binaural coherence */



#ifndef FIX_CREND_SIMPLIFY_CODE

typedef enum 

{

    BINAURAL_INPUT_AUDIO_CONFIG_INVALID,
@@ -1662,14 +1663,12 @@ typedef enum 
    BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED       /* Not used */



} BINAURAL_INPUT_AUDIO_CONFIG;



#endif

#define HEADROT_ORDER                           3

#define HEADROT_SHMAT_DIM                       ( ( HEADROT_ORDER + 1 ) * ( HEADROT_ORDER + 1 ) )

#define HEADROT_SHMAT_DIM2                      ( HEADROT_SHMAT_DIM * HEADROT_SHMAT_DIM )









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

 * TD Binaural Object renderer

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

lib_com/ivas_prot_fx.h

+1 −2
Original line number Diff line number Diff line
@@ -6713,8 +6713,7 @@ void ivas_set_qmetadata_maxbit_req_fx( 
 * Binaural FastConv Renderer Prototypes

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





void ivas_binaural_hrtf_close(

void ivas_binaural_hrtf_close_fx(

    HRTFS_FASTCONV_HANDLE *hHrtfFastConv                        /* i/o: decoder binaural hrtf handle                    */

);