Commit 232fa575 authored by emerit's avatar emerit
Browse files

fix renderer asan error whith MASA

parent 492c3b25

lib_rend/lib_rend.c

+22 −7
Original line number Diff line number Diff line
@@ -306,7 +306,12 @@ struct IVAS_REND 
 * Local function prototypes

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



static ivas_error initMasaExtRenderer( input_masa *inputMasa, const AUDIO_CONFIG outConfig );

static ivas_error initMasaExtRenderer( input_masa *inputMasa, const AUDIO_CONFIG outConfig

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

                                       ,

                                       hrtf_handles *hHrtfs

#endif

);

static void freeMasaExtRenderer( MASA_EXT_REND_HANDLE *hMasaExtRendOut );

#endif
@@ -3529,14 +3534,15 @@ static ivas_error setRendInputActiveMasa( 
    else

    {

#ifdef NONBE_FIX_225_MASA_EXT_REND

        if ( ( error = initMasaExtRenderer( inputMasa, outConfig ) ) != IVAS_ERR_OK )

        if ( ( error = initMasaExtRenderer( inputMasa, outConfig

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

                                            ,

                                            hrtfs

#endif

                                            ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        inputMasa->hMasaExtRend->hHrtfParambin = hrtfs->hHrtfParambin;

#endif



        inputMasa->metadataHasBeenFed = false;

#else

#ifdef SPLIT_REND_WITH_HEAD_ROT
@@ -10131,7 +10137,12 @@ static ivas_error ivas_masa_ext_rend_parambin_init( 


static ivas_error initMasaExtRenderer(

    input_masa *inputMasa,

    const AUDIO_CONFIG outConfig )

    const AUDIO_CONFIG outConfig

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    ,

    hrtf_handles *hrtfs

#endif

)

{

    int16_t i;

    ivas_error error;
@@ -10159,7 +10170,11 @@ static ivas_error initMasaExtRenderer( 
    hMasaExtRend->hDiracDecBin = NULL;

#endif

    hMasaExtRend->hReverb = NULL;

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    hMasaExtRend->hHrtfParambin = hrtfs->hHrtfParambin;

#else

    hMasaExtRend->hHrtfParambin = NULL;

#endif

    hMasaExtRend->hVBAPdata = NULL;

    hMasaExtRend->hoa_dec_mtx = NULL;