Commit 66e7be5f authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER

parent 35850efa

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ 
#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#define FIX_963_USAN_ERROR                              /* Eri: Issue 963: USAN error in Stereo CNG, division by zero */

#define NONBE_FIX_952_MC_PARAMUPMIX_5MS                 /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/

#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER     /* Qualcomm: issue 953: fix order or ER channels in LC mode*/

#define NONBE_FIX_967_ISM_MONO_DMX                      /* FhG: issue 967: accumulating energies in ISM mono DMX */



#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

lib_rend/ivas_reflections_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -56,17 +56,9 @@ static UWord16 LC_mixing_7_1[7] = { 0, 1, 2, 3, 4, 3, 4 }; 


static UWord16 LC_mixing_5_1_2[7] = { 0, 1, 2, 3, 4, 0, 1 };



#ifdef NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER

static UWord16 LC_mixing_5_1_4[9] = { 0, 1, 2, 3, 4, 0, 1, 3, 4 };

#else

static UWord16 LC_mixing_5_1_4[9] = { 0, 1, 2, 3, 4, 0, 1, 2, 3 };

#endif



#ifdef NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER

static UWord16 LC_mixing_7_1_4[11] = { 0, 1, 2, 3, 4, 3, 4, 0, 1, 3, 4 };

#else

static UWord16 LC_mixing_7_1_4[11] = { 0, 1, 2, 3, 4, 3, 4, 0, 1, 2, 3 };

#endif





/*-----------------------------------------------------------------------------------------*