Commit d703e971 authored by vaclav's avatar vaclav
Browse files

port NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER

parent aaa01f05

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA           /* Nokia: issue 944: fix FEC error in OMASA */

#define NONBE_FIX_949_MC_5MS_FRAMING                    /*Dlb: Issue 949: fix for 5ms framing/rendering in MC mode */

#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*/



/* #################### End BASOP porting switches ############################ */

lib_rend/ivas_reflections_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -56,9 +56,17 @@ 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





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