Commit ba12394a authored by vaclav's avatar vaclav
Browse files

remove ToDo commented temporary code; under NONBE_1303_REND_GRANULARITY

parent becf4c0d

lib_dec/ivas_objectRenderer_internal.c

+4 −0
Original line number Diff line number Diff line
@@ -61,9 +61,13 @@ ivas_error ivas_td_binaural_open( 
        num_src = st_ivas->nchan_ism;

    }



#ifdef NONBE_1303_REND_GRANULARITY

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

#else

    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

    )

#endif

    {

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

    }

lib_dec/lib_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -2968,9 +2968,13 @@ ivas_error IVAS_DEC_HRTF_binary_close( 


    if ( st_ivas->hDecoderConfig->Opt_HRTF_binary && st_ivas->ini_frame > 0 )

    {

#ifdef NONBE_1303_REND_GRANULARITY

        if ( !( binaural_renderer_old == IVAS_BIN_RENDERER_TYPE_TDREND || binaural_renderer_old == IVAS_BIN_RENDERER_TYPE_DEFAULT ) )

#else

        if ( !( binaural_renderer_old == IVAS_BIN_RENDERER_TYPE_TDREND || binaural_renderer_old == IVAS_BIN_RENDERER_TYPE_DEFAULT ) &&

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

        )

#endif

        {

            ivas_HRTF_binary_close( &st_ivas->hHrtfTD );

        }