Commit 40a11f3a authored by fotopoulou's avatar fotopoulou
Browse files

remove obsolete code in cpe deallocation function, since LFE not part of CPE... 

remove obsolete code in  cpe deallocation function, since LFE not part of CPE anymore (to do in issue 451)
parent fc2b9898

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ 
#define FIX_509                                         /* FhG: fix issue 509, too low number of bitsream indices in SBA */



#define FIX_TODO_NON_DIEGETIC_PAN_NOT_IMPLELENTED_IN_RENDERER /* ..\apps\renderer.c(240):  .... (todo: implementation)",*/



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



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

/* clang-format on */

lib_dec/ivas_cpe_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -832,11 +832,13 @@ void destroy_cpe_dec( 
    int16_t n;

    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++ )

    {