Commit 2588e57c authored by Jouni Paulus's avatar Jouni Paulus
Browse files

ISM-to-MASA rendering. mismatch in 2D array size in declaration and use. switch: FIX_889_ARRAY_SIZE

parent 0fcb812a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ 
#define FIX_879_USAN_ERROR_IN_MASA_DECODING             /* FhG: Issue 879 : avoid arithmetic with NULL pointer in the DirAC decoder to fix USAN error */



#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_889_ARRAY_SIZE                              /* Nokia: issue #889: mismatch in 2D array size declaration and use */



/* #################### End BE switches ################################## */

lib_rend/lib_rend.c

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


static void copyBufferTo2dArray(

    const IVAS_REND_AudioBuffer buffer,

#ifdef FIX_889_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_889_ARRAY_SIZE

    float array[][L_FRAME48k],

#else

    float array[MAX_OUTPUT_CHANNELS][L_FRAME48k],

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

    const

#endif