diff --git a/lib_com/options.h b/lib_com/options.h index 9b4289c1324e041dbfe13ceaa61a66f6cbed0151..42aeaf2a2531f4807c5a592b390bd7d6c96d015b 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -154,6 +154,7 @@ #define FIX_740_MASA_PREREND_VALIDITY_CHECK /* Nokia: issue 740: fix incorrect validity check in lib_rend to allow use of MASA prerenderer */ #define FIX_865_MOVE_TD_DECORR /* VA: issue 865: Move ivas_td_decorr.c from lib_com to lib_rend */ #define FIX_889_MASA_FILE_WRITER_OPEN /* Nokia: issue #889: mismatch in function definition and use */ +#define FIX_890_ARRAY_SIZE /* Nokia: issue #890: mismatch in 2D array size declaration and use */ /* #################### End BE switches ################################## */ diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index a7de09eb0078c8104b1b2ee84594217e88f2608e..e4295c1c78f673e0f091ed065e8097cf2ec6b48f 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -436,7 +436,11 @@ 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; @@ -459,7 +463,11 @@ 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