Commit abdf17d1 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into... 

- Merge remote-tracking branch 'remotes/origin/main' into 1386-msan-clang-18-use-of-uninitialized-value-in-ivas_spar_dec_open
parents c7a29ef0 734e272c

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

+10 −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;

            }
@@ -2611,7 +2611,14 @@ static CmdlnArgs defaultArgs( 
    args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_INVALID;

    args.outConfig.outSetupCustom.num_spk = 0;

    args.outConfig.outSetupCustom.num_lfe = 0;

#ifdef FIX_HRTF_LEFTOVERS

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

    {

        args.inConfig.ambisonicsBuses[i].audioConfig = IVAS_AUDIO_CONFIG_INVALID;

    }

#else

    args.inConfig.ambisonicsBuses->audioConfig = IVAS_AUDIO_CONFIG_INVALID;

#endif



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

    {

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_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ 
#define FIX_1119_SPLIT_RENDERING_VOIP                   /* FhG: Add split rendering support to decoder in VoIP mode */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define FIX_1377_HANDLE_ERROR_CODE                      /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */

#define FIX_HRTF_LEFTOVERS                              /* VA: HRTF updates - bring float main in line with BASOP main */

#define FIX_1384_MSAN_ivas_spar_dec_open                /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */



/* #################### End BE switches ################################## */

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;

}