Commit 7abcc8a4 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_890_ARRAY_SIZE

parent c405146b

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_890_ARRAY_SIZE                              /* Nokia: issue #890: mismatch in 2D array size declaration and use */

#define BE_FIX_887_GCC_WARNING_ARRAY_SIZE               /* VoiceAge: Issue 887: change array size definition to avoid warning with gcc 11.4.0 */

#define FIX_247_EXTERNAL_RENDERER_COMMAND_LINE          /* VA: issue 247: harmonize command-line options names of external renderer with the decoder */

#define FIX_643_PCA_OPTION                              /* VA: issue 643: rename PCA bypass command-line option */

lib_rend/lib_rend.c

+0 −8
Original line number Diff line number Diff line
@@ -456,11 +456,7 @@ static void accumulateCLDFBArrayToBuffer( 


static void copyBufferTo2dArray(

    const IVAS_REND_AudioBuffer buffer,

#ifdef FIX_890_ARRAY_SIZE

    float array[][L_FRAME48k] )

#else

    float array[MAX_OUTPUT_CHANNELS][L_FRAME48k] )

#endif

{

    uint32_t smplIdx;

    uint32_t chnlIdx;
@@ -483,11 +479,7 @@ static void copyBufferTo2dArray( 
}



static void accumulate2dArrayToBuffer(

#ifdef FIX_890_ARRAY_SIZE

    float array[][L_FRAME48k],

#else

    float array[MAX_OUTPUT_CHANNELS][L_FRAME48k],

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

    const

#endif