Commit 6d9e75ba authored by multrus's avatar multrus
Browse files

[cleanup] accept REMOVE_OBS_CODE

parent de23b783

lib_com/options.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -151,7 +151,6 @@ 
#define FIX_545_ASSERT                                  /* VA: fix issue 545, replace assert() with warning message when hitting memory limit in the buffer of indices */

#define FIX_545_ASSERT                                  /* VA: fix issue 545, replace assert() with warning message when hitting memory limit in the buffer of indices */

#endif

#endif





#define REMOVE_OBS_CODE                                 /* FhG: Remove unnecessary assignement after LFE cleanup (Issue #451)*/





#define FIX_TODO_FD_CNG_SBA_CLEANUP                     /* FhG: BE, address TODO comment in fd_cng_enc */

#define FIX_TODO_FD_CNG_SBA_CLEANUP                     /* FhG: BE, address TODO comment in fd_cng_enc */

#define ENHANCED_STEREO_DMX                             /* Orange : Contribution 48 - Enhanced stereo downmix. */

#define ENHANCED_STEREO_DMX                             /* Orange : Contribution 48 - Enhanced stereo downmix. */

lib_dec/ivas_cpe_dec.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -831,13 +831,6 @@ void destroy_cpe_dec( 
    int16_t n;

    int16_t n;

    Decoder_State *st;

    Decoder_State *st;





#ifndef REMOVE_OBS_CODE

    /* make sure we deallocate a potential distinct hTcxCfg for a MCT LFE channel (can only happen in rs) */ /*TODO Check this again with LFE clean up!*/

    if ( hCPE->hCoreCoder[1] != NULL && hCPE->hCoreCoder[1]->hTcxCfg != hCPE->hCoreCoder[0]->hTcxCfg )

    {

        hCPE->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE;

    }

#endif





    for ( n = 0; n < CPE_CHANNELS; n++ )

    for ( n = 0; n < CPE_CHANNELS; n++ )

    {

    {