Commit 5862de4c authored by emerit's avatar emerit
Browse files

fix renderer msan ason error

parent c8a28b5f

lib_rend/ivas_objectRenderer.c

+4 −1
Original line number Diff line number Diff line
@@ -687,8 +687,11 @@ ivas_error ivas_td_binaural_open_ext( 
    {

        directivity = hRendCfg->directivity;

    }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    return ivas_td_binaural_open_unwrap( pTDRend->hHrtfTD, outFs, nchan_transport, ivas_format, transport_config, directivity, hTransSetup, &pTDRend->hBinRendererTd, &pTDRend->binaural_latency_ns );

#else

    return ivas_td_binaural_open_unwrap( &pTDRend->hHrtfTD, outFs, nchan_transport, ivas_format, transport_config, directivity, hTransSetup, &pTDRend->hBinRendererTd, &pTDRend->binaural_latency_ns );

#endif

}

lib_rend/ivas_stat_rend.h

+4 −0
Original line number Diff line number Diff line
@@ -1147,7 +1147,11 @@ typedef struct 
{

    int32_t binaural_latency_ns;

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd;

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    TDREND_HRFILT_FiltSet_t **hHrtfTD;

#else

    TDREND_HRFILT_FiltSet_t *hHrtfTD;

#endif



} TDREND_WRAPPER, *TDREND_WRAPPER_HANDLE;

lib_rend/lib_rend.c

+20 −18
Original line number Diff line number Diff line
@@ -1352,7 +1352,7 @@ static ivas_error setRendInputActiveIsm( 
    RENDER_CONFIG_DATA *hRendCfg

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    ,

    struct hrtf_handles hrtfs

    hrtf_handles *hrtfs

#endif

)

{
@@ -1394,7 +1394,7 @@ static ivas_error setRendInputActiveIsm( 
    {

        inputIsm->splitTdRendWrappers[i] = defaultTdRendWrapper();

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        inputIsm->splitTdRendWrappers[i].hHrtfTD = hrtfs.hHrtfTD;

        inputIsm->splitTdRendWrappers[i].hHrtfTD = hrtfs->hHrtfTD;

#endif

    }

#endif
@@ -1403,7 +1403,7 @@ static ivas_error setRendInputActiveIsm( 


    error = IVAS_ERR_OK;

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    inputIsm->tdRendWrapper.hHrtfTD = hrtfs.hHrtfTD;

    inputIsm->tdRendWrapper.hHrtfTD = &hrtfs->hHrtfTD;

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT
@@ -1414,7 +1414,7 @@ static ivas_error setRendInputActiveIsm( 
    {

#ifndef SPLIT_REND_WITH_HEAD_ROT

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( error = ivas_rend_openCrend( &inputIsm->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig, hRendCfg, hrtfs.hSetOfHRTF, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_rend_openCrend( &inputIsm->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig, hRendCfg, hrtfs->hSetOfHRTF, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )

#else

        if ( ( error = ivas_rend_openCrend( &inputIsm->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig, hRendCfg, NULL, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )

#endif
@@ -1478,7 +1478,7 @@ static ivas_error setRendInputActiveIsm( 
        else if ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

        {

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

            if ( ( error = ivas_rend_openCrend( &inputIsm->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig, hRendCfg, hrtfs.hSetOfHRTF, *rendCtx.pOutSampleRate, rendCtx.pSplitRendWrapper->multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_rend_openCrend( &inputIsm->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig, hRendCfg, hrtfs->hSetOfHRTF, *rendCtx.pOutSampleRate, rendCtx.pSplitRendWrapper->multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_rend_openCrend( &inputIsm->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig, hRendCfg, NULL, *rendCtx.pOutSampleRate, rendCtx.pSplitRendWrapper->multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )

#endif
@@ -2204,7 +2204,9 @@ static ivas_error initMcBinauralRendering( 
    if ( !reconfigureFlag || ( !useTDRend && inputMc->tdRendWrapper.hBinRendererTd != NULL ) )

    {

        ivas_td_binaural_close( &inputMc->tdRendWrapper.hBinRendererTd );

#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        inputMc->tdRendWrapper.hHrtfTD = NULL;

#endif

    }



#ifdef SPLIT_REND_WITH_HEAD_ROT
@@ -2428,7 +2430,7 @@ static ivas_error setRendInputActiveMc( 
    RENDER_CONFIG_DATA *hRendCfg

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    ,

    struct hrtf_handles hrtfs

    hrtf_handles *hrtfs

#endif

)

{
@@ -2467,11 +2469,11 @@ static ivas_error setRendInputActiveMc( 
    inputMc->customLsInput = defaultCustomLs();

    inputMc->tdRendWrapper = defaultTdRendWrapper();

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    if ( hrtfs.hHrtfTD )

    if ( hrtfs->hHrtfTD )

    {

        inputMc->tdRendWrapper.binaural_latency_ns = (int32_t) ( hrtfs.hHrtfTD->latency_s * 1000000000.f );

        inputMc->tdRendWrapper.binaural_latency_ns = (int32_t) ( hrtfs->hHrtfTD->latency_s * 1000000000.f );

    }

    inputMc->tdRendWrapper.hHrtfTD = hrtfs.hHrtfTD;

    inputMc->tdRendWrapper.hHrtfTD = &hrtfs->hHrtfTD;

#endif

    inputMc->crendWrapper = NULL;

    inputMc->hReverb = NULL;
@@ -2503,7 +2505,7 @@ static ivas_error setRendInputActiveMc( 
        if ( ( error = initMcBinauralRendering( inputMc, inConfig, outConfig, hRendCfg

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

                                                ,

                                                hrtfs.hSetOfHRTF

                                                hrtfs->hSetOfHRTF

#endif

                                                ,

                                                FALSE ) ) != IVAS_ERR_OK )
@@ -2836,7 +2838,7 @@ static ivas_error setRendInputActiveSplitPostRend( 
    RENDER_CONFIG_DATA *hRendCfg

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    ,

    struct hrtf_handles hrtfs

    hrtf_handles hrtfs

#endif



)
@@ -2896,7 +2898,7 @@ static ivas_error setRendInputActiveSba( 
    RENDER_CONFIG_DATA *hRendCfg

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    ,

    struct hrtf_handles hrtfs

    hrtf_handles *hrtfs

#endif



)
@@ -2942,7 +2944,7 @@ static ivas_error setRendInputActiveSba( 
        initRotGains( inputSba->rot_gains_prev[pos_idx] );

    }

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    inputSba->cldfbRendWrapper.hHrtfFastConv = hrtfs.hHrtfFastConv;

    inputSba->cldfbRendWrapper.hHrtfFastConv = hrtf->.hHrtfFastConv;

#endif

#else

    inputSba->crendWrapper = NULL;
@@ -2959,7 +2961,7 @@ static ivas_error setRendInputActiveSba( 
    }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    if ( ( error = updateSbaPanGains( inputSba, outConfig, hRendCfg, hrtfs.hSetOfHRTF ) ) != IVAS_ERR_OK )

    if ( ( error = updateSbaPanGains( inputSba, outConfig, hRendCfg, hrtfs->hSetOfHRTF ) ) != IVAS_ERR_OK )

#else

    if ( ( error = updateSbaPanGains( inputSba, outConfig, hRendCfg ) ) != IVAS_ERR_OK )

#endif
@@ -3424,7 +3426,7 @@ static ivas_error setRendInputActiveMasa( 
    RENDER_CONFIG_DATA *hRendCfg

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    ,

    struct hrtf_handles hrtfs

    hrtf_handles *hrtfs

#endif



    ) /* Todo: This is not used at all within MASA. Support might be better to do after refactoring. */
@@ -3472,7 +3474,7 @@ static ivas_error setRendInputActiveMasa( 
        inputMasa->decDummy = initDecoderDummy( *rendCtx.pOutSampleRate, numInChannels, outConfig, 0 );

#endif

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        inputMasa->decDummy->hHrtfParambin = hrtfs.hHrtfParambin;

        inputMasa->decDummy->hHrtfParambin = hrtfs->hHrtfParambin;

#endif



        inputMasa->metadataHasBeenFed = false;
@@ -4355,7 +4357,7 @@ ivas_error IVAS_REND_AddInput( 
    void *inputsArray;

    int32_t inputStructSize;

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    ivas_error ( *activateInput )( void *, AUDIO_CONFIG, IVAS_REND_InputId, RENDER_CONFIG_DATA *, struct hrtf_handles hrtfs );

    ivas_error ( *activateInput )( void *, AUDIO_CONFIG, IVAS_REND_InputId, RENDER_CONFIG_DATA *, hrtf_handles *hrtfs );

#else

    ivas_error ( *activateInput )( void *, AUDIO_CONFIG, IVAS_REND_InputId, RENDER_CONFIG_DATA * );

#endif
@@ -4431,7 +4433,7 @@ ivas_error IVAS_REND_AddInput( 


    *inputId = makeInputId( inConfig, inputIndex );

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    if ( ( error = activateInput( (uint8_t *) inputsArray + inputStructSize * inputIndex, inConfig, *inputId, hIvasRend->hRendererConfig, hIvasRend->hHrtfs ) ) != IVAS_ERR_OK )

    if ( ( error = activateInput( (uint8_t *) inputsArray + inputStructSize * inputIndex, inConfig, *inputId, hIvasRend->hRendererConfig, &hIvasRend->hHrtfs ) ) != IVAS_ERR_OK )

#else

    if ( ( error = activateInput( (uint8_t *) inputsArray + inputStructSize * inputIndex, inConfig, *inputId, hIvasRend->hRendererConfig ) ) != IVAS_ERR_OK )

#endif