Commit 1869f2e1 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_CONTROLLABLE_SID_UPDATE_RATE

parent d63dc2ab

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ 
#define SPAR_SCALING_HARMONIZATION                      /* Issue 80: Changes to harmonize scaling in spar */

#define FIX_I98_HANDLES_TO_NULL                         /* Issue 98: do the setting of all handles to NULL in one place */

#define FIX_I102_SWB_TBE_SWITCH                         /* Issue 102: avoid IO->SWB switching code for IVAS, generate SHB ACB mem with lerp in case of switch */

#define FIX_CONTROLLABLE_SID_UPDATE_RATE                /* Issue 117: fix controllable SID update rate mechanism */

#define FIX_DIRAC_CHANNELS                              /* Issue 71: lower number of DirAC analysis channels */

#define FIX_CREND_CHANNELS                              /* Issue 71: fix number of Crend channels */

#define HARMONIZE_SBA_NCHAN_TRANSPORT                   /* harmonize setting of number of transport channels in SBA */

lib_enc/fd_cng_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -903,11 +903,9 @@ void stereoFdCngCoherence( 
            sts[1]->core_brate = SID_2k40;

        }



#ifdef FIX_CONTROLLABLE_SID_UPDATE_RATE

        /* synchronize SID counters */

        sts[0]->hDtxEnc->cnt_SID = min( sts[0]->hDtxEnc->cnt_SID, sts[1]->hDtxEnc->cnt_SID );

        sts[1]->hDtxEnc->cnt_SID = sts[0]->hDtxEnc->cnt_SID;

#endif

    }



    pt_fftL = fft_buff[0];