Commit ec19281e authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

parent a7c19aa0

lib_com/options.h

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


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



#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 */

#define NONBE_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE    /* FhG: fix for cng in ISM DTX on sudden silence periods - JBM addon (issue 552) */

#define NONBE_FIX_738_SBA_BR_SW_ASAN                          /* FhG: issue 738: fixes bug when switching to an MCT bitrate and previous frame was ACELP */

lib_dec/ivas_mct_dec.c

+0 −12
Original line number Diff line number Diff line
@@ -952,12 +952,7 @@ static ivas_error ivas_mc_dec_reconfig( 
            {

                ivas_mct_dec_close( &st_ivas->hMCT );

            }

#ifndef NONBE_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

            /* LFE handle */

            ivas_lfe_dec_close( &( st_ivas->hLFE ) );

#endif

        }

#ifdef NONBE_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

        else if ( last_mc_mode == MC_MODE_PARAMUPMIX )

        {

            ivas_mc_paramupmix_dec_close( &( st_ivas->hMCParamUpmix ) );
@@ -965,7 +960,6 @@ static ivas_error ivas_mc_dec_reconfig( 


        /* LFE handle */

        ivas_lfe_dec_close( &( st_ivas->hLFE ) );

#endif

    }

    else if ( st_ivas->mc_mode == MC_MODE_MCMASA )

    {
@@ -1001,16 +995,10 @@ static ivas_error ivas_mc_dec_reconfig( 
        if ( last_mc_mode == MC_MODE_MCT )

        {

            ivas_mct_dec_close( &st_ivas->hMCT );

#ifndef NONBE_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

            /* LFE handle */

            ivas_lfe_dec_close( &( st_ivas->hLFE ) );

#endif

        }



#ifdef NONBE_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

        /* LFE handle */

        ivas_lfe_dec_close( &( st_ivas->hLFE ) );

#endif

    }



    if ( st_ivas->mc_mode != MC_MODE_MCMASA )