Commit 228e3adc authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

experimental patch

parent 41bcdc88

lib_dec/ivas_binRenderer_internal.c

+1 −1
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ ivas_error ivas_binRenderer_open( 
        hBinRenderer->render_lfe = 1;

    }



#ifdef FIX_CREND_SIMPLIFY_CODE

#if 0

    if ( st_ivas->hHrtfFastConv == NULL && st_ivas->hDecoderConfig->Opt_HRTF_binary )

    {

        return IVAS_ERROR( IVAS_ERR_INTERNAL, "HRTF binary file present but not used in FastConv renderer" );

lib_dec/ivas_objectRenderer_internal.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ ivas_error ivas_td_binaural_open( 
        num_src = st_ivas->nchan_ism;

    }



#ifdef FIX_HRTF_LOAD

#if 0

    if ( st_ivas->hHrtfTD == NULL && st_ivas->hDecoderConfig->Opt_HRTF_binary &&

         ( st_ivas->ivas_format != SBA_ISM_FORMAT ) // ToDo: temporary hack to avoid ASAN errors -> see issue #1202

    )

lib_dec/ivas_sba_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -368,6 +368,11 @@ ivas_error ivas_sba_dec_reconfigure( 
    else if ( st_ivas->hBinRenderer != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV && st_ivas->renderer_type != RENDERER_BINAURAL_FASTCONV_ROOM ) )

    {

        ivas_binRenderer_close( &st_ivas->hBinRenderer );

        

        ivas_binaural_hrtf_close( &st_ivas->hHrtfFastConv );



        /* Fastconv HRTF filters */

        ivas_HRTF_fastconv_binary_close( &st_ivas->hHrtfFastConv );

    }



    if ( st_ivas->renderer_type == RENDERER_MONO_DOWNMIX && st_ivas->hMonoDmxRenderer == NULL )

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -3017,7 +3017,7 @@ ivas_error IVAS_DEC_HRTF_binary_open( 
        }



        /* FastConv binaural renderer */

        if ( ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT ) && st_ivas->hHrtfFastConv == NULL )

        if ( ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT ) )

        {

            if ( ( error = ivas_HRTF_fastconv_binary_open( &st_ivas->hHrtfFastConv ) ) != IVAS_ERR_OK )

            {

lib_rend/ivas_hrtf.c

+5 −2
Original line number Diff line number Diff line
@@ -263,12 +263,15 @@ void ivas_HRTF_CRend_binary_close( 


ivas_error ivas_HRTF_fastconv_binary_open(

    HRTFS_FASTCONV **hHrtfFastConv )

{

    if ( *hHrtfFastConv == NULL )

    {

        *hHrtfFastConv = (HRTFS_FASTCONV *) malloc( sizeof( HRTFS_FASTCONV ) );

        if ( *hHrtfFastConv == NULL )

        {

            return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FASTCONV HRTF tables!" );

        }

    }



    ivas_init_binaural_hrtf( *hHrtfFastConv );