Commit 7cfb9740 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

rename the switch to CR_ as it is potentially non-BE

parent 028e3437

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -168,8 +168,6 @@ 
#define FIX_718_JBM_MD_UDPATE                           /* Fhg: fix issue #718, wrong setting of the update flag in the TD obj renderer in the JBM path */

#define FIX_719_CRASH_IN_CLEANUP                        /* VA: issue 719: fix Decoder crash after call to goto to cleanup */



#define FIX_722_MEMORY_LEAK_IN_PARAMUPMIX



/* ################## End BE DEVELOPMENT switches ######################### */



/* #################### Start NON-BE CR switches ########################## */
@@ -181,6 +179,7 @@ 
#define CR_FIX_586_BPF_DFT_MEM                          /* FhG: issue 586: set input memory of DFT analysis of BPF signal to zero for HQ core to fix issue with PLC and bitrate switching */

#define CR_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE /* FhG: fix for cng in ISM DTX on sudden silence periods */

#define CR_FIX_698_SBA_MSAN                             /* Dlb: issue 698: Uninitialized memory read in SBA init */

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



/* ##################### End NON-BE CR switches ########################### */

lib_dec/ivas_mct_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -934,12 +934,12 @@ static ivas_error ivas_mc_dec_reconfig( 
            {

                ivas_mct_dec_close( &st_ivas->hMCT );

            }

#ifndef FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

#ifndef CR_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

            /* LFE handle */

            ivas_lfe_dec_close( &( st_ivas->hLFE ) );

#endif

        }

#ifdef FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

#ifdef CR_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

        else if ( last_mc_mode == MC_MODE_PARAMUPMIX )

        {

            ivas_mc_paramupmix_dec_close( &( st_ivas->hMCParamUpmix ) );
@@ -986,13 +986,13 @@ static ivas_error ivas_mc_dec_reconfig( 
        if ( last_mc_mode == MC_MODE_MCT )

        {

            ivas_mct_dec_close( &st_ivas->hMCT );

#ifndef FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

#ifndef CR_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

            /* LFE handle */

            ivas_lfe_dec_close( &( st_ivas->hLFE ) );

#endif

        }



#ifdef FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

#ifdef CR_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

        if ( st_ivas->hLFE != NULL )

        {

            /* LFE handle */