Commit d03813af authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge branch... 

Merge branch '890-mismatch-of-the-expected-and-provided-function-argument-size-in-renderismtomasa' into 'main'

Resolve #890 "Mismatch of the expected and provided function argument size in renderIsmToMASA"

See merge request !1198
parents 7b887f9d f338a735

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -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 ################################## */

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_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