Commit baf67198 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

rename the switch

parent ac0da88e

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ 


#define NONBE_FIX_736_FOA_BR_SWITCH                           /* FhG/Dlb : Issue 736: FOA bitrate switching decoding crashes in in ivas_spar_to_dirac */

#define NONBE_FIX_746_NONDIEGETIC_MD                          /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/

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

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



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

lib_dec/ivas_mct_dec.c

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

                ivas_mct_dec_close( &st_ivas->hMCT );

            }

#ifndef CR_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

#ifndef NONBE_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

            /* LFE handle */

            ivas_lfe_dec_close( &( st_ivas->hLFE ) );

#endif

        }

#ifdef CR_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

#ifdef NONBE_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

        else if ( last_mc_mode == MC_MODE_PARAMUPMIX )

        {

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

        {

            ivas_mct_dec_close( &st_ivas->hMCT );

#ifndef CR_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

#ifndef NONBE_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

            /* LFE handle */

            ivas_lfe_dec_close( &( st_ivas->hLFE ) );

#endif

        }



#ifdef CR_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

#ifdef NONBE_FIX_722_MEMORY_LEAK_IN_PARAMUPMIX

        if ( st_ivas->hLFE != NULL )

        {

            /* LFE handle */