Commit f8c9e323 authored by Jan Kiene's avatar Jan Kiene
Browse files

accept FIX_583_CLANG_TRANS_DET

parent 0609449a

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ 
#define FIX_595_SHL_NOGLOB                              /* FhG: Issue 595: compilation with BASOP_NOGLOB disabled */

#define UPDATE_FASTCONV_SBA_FILTER                      /* Dlb: Issue 584: Update SBA CLDFB-Domain HRTFs */

#define FIX_570_SF_EXT_ORIENTATION

#define FIX_583_CLANG_TRANS_DET                         /* FhG: Issue 583: clang left shift on ramp_up_flag in transient detector */

#define FIX_280_PLANAR_CP                               /* Dlb : fix issue 28 : remove planarCP=1 related code*/

#define CODE_CLEAN_UP_DIRAC                             /* Dlb : code clean up*/

#define COVARIANCE_MEMORY_OPT                           /* Dlb : Issue 231: define SPAR covariance buffers in stack instead of inter-frame heap */

lib_enc/stat_enc.h

+0 −4
Original line number Diff line number Diff line
@@ -126,11 +126,7 @@ typedef struct 
    float firState1;

    float firState2;



#ifdef FIX_583_CLANG_TRANS_DET

    uint16_t ramp_up_flag; /* bit map flags to indicate a ramp up in beginning of TCX frame */

#else

    int16_t ramp_up_flag; /* bit map flags to indicate a ramp up in beginning of TCX frame */

#endif



} SubblockEnergies;

lib_enc/transient_detection.c

+0 −4
Original line number Diff line number Diff line
@@ -241,11 +241,7 @@ void RunTransientDetection( 
    UpdateDelayBuffer( filteredInput, length, &hTranDet->delayBuffer );



    /* compute ramp up flag */

#ifdef FIX_583_CLANG_TRANS_DET

    pSubblockEnergies->ramp_up_flag = ( ( pSubblockEnergies->ramp_up_flag << 1 ) & 0x0003 );

#else

    pSubblockEnergies->ramp_up_flag = pSubblockEnergies->ramp_up_flag << 1;

#endif

    e0 = dotp( filteredInput + length / 2, filteredInput + length / 2, pSubblockEnergies->pDelayBuffer->nSubblockSize / 2 ) + 0.5f * MIN_BLOCK_ENERGY;

    e1 = pSubblockEnergies->subblockNrg[pSubblockEnergies->nDelay + 4] - e0;

    if ( e1 > e0 )