Commit a7c19aa0 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_779_ISM_FREE_REVERB_HANDLE

parent cfb84da5

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ 




#define NONBE_FIX_787_PARAM_UPMIX_LEVEL                       /* Dlb: issue 787: fix level of Mono/Stereo for ParamUpmix mode */

#define NONBE_FIX_779_ISM_FREE_REVERB_HANDLE                  /* VA: issue 779: fix Crash in ISM rate switching with BINAURAL_ROOM_REVERB */



#define NONBE_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX               /* Dlb : issue 722: memory leak fix in MC param upmix mode with BR switching*/

#define NONBE_FIX_780_ISM_STARTS_WITH_SID                     /* VA: issue 780: fix Crash in ISM decoding when bitstream starts with an SID and output_config is not EXT */

lib_rend/ivas_reverb.c

+0 −11
Original line number Diff line number Diff line
@@ -1279,16 +1279,11 @@ void ivas_reverb_close( 


    hReverb = *hReverb_in;



#ifdef NONBE_FIX_779_ISM_FREE_REVERB_HANDLE

    if ( hReverb_in == NULL || *hReverb_in == NULL )

    {

        return;

    }



#else

    if ( hReverb != NULL )

    {

#endif

    for ( loop_idx = 0; loop_idx < IVAS_REV_MAX_NR_BRANCHES; loop_idx++ )

    {

        if ( hReverb->loop_delay_buffer[loop_idx] != NULL )
@@ -1301,14 +1296,8 @@ void ivas_reverb_close( 
    free( hReverb->pPredelay_buffer );

    hReverb->pPredelay_buffer = NULL;



#ifdef NONBE_FIX_779_ISM_FREE_REVERB_HANDLE

    free( *hReverb_in );

    *hReverb_in = NULL;

#else

        free( hReverb );

        hReverb = NULL;

    }

#endif



    return;

}