Commit b0ec5f47 authored by vaclav's avatar vaclav
Browse files

address HRTF leftovers

parent ab5ed9bb

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ typedef struct 
    hrtfFileReader *hrtfReader;

    char *hrtfFileName;



    IVAS_DEC_HRTF_HANDLE *hHrtfTD;

    IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD;



    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics;

apps/renderer.c

+3 −3
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ int main( 
    IVAS_DEC_HRTF_CREND_HANDLE *hHrtfCrend = NULL;

    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];
@@ -961,9 +961,9 @@ 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 ) );

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

                goto cleanup;

            }

lib_com/common_api_types.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ 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 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;

lib_dec/ivas_binRenderer_internal.c

+2 −6
Original line number Diff line number Diff line
@@ -795,8 +795,6 @@ ivas_error ivas_rend_openCldfbRend( 
    int16_t convBand;

    ivas_error error;



    error = IVAS_ERR_OK;



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

     * prepare library opening

     *-----------------------------------------------------------------*/
@@ -866,7 +864,7 @@ ivas_error ivas_rend_openCldfbRend( 


    pCldfbRend->hCldfbRend = hBinRenderer;



    return error;

    return IVAS_ERR_OK;

}
@@ -885,8 +883,6 @@ ivas_error ivas_binRenderer_open( 
    ivas_error error;

    const IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics;



    error = IVAS_ERR_OK;



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

     * prepare library opening

     *-----------------------------------------------------------------*/
@@ -1045,7 +1041,7 @@ ivas_error ivas_binRenderer_open( 
    /* Copy the handles to main handle */

    st_ivas->hBinRenderer = hBinRenderer;



    return error;

    return IVAS_ERR_OK;

}

lib_dec/lib_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -2944,7 +2944,7 @@ ivas_error IVAS_DEC_FeedCustomLsData( 


ivas_error IVAS_DEC_GetHrtfTDrendHandle(

    IVAS_DEC_HANDLE hIvasDec,         /* i/o: IVAS decoder handle      */

    IVAS_DEC_HRTF_HANDLE **hHrtfTD /* o  : HRTF handle              */

    IVAS_DEC_HRTF_TD_HANDLE **hHrtfTD /* o  : HRTF handle              */

)

{

    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hHrtfTD == NULL )