Commit 45492d80 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

clang formatting (also increase switch scopes to handle formatting after acceptance)

parent 89538fd9

lib_rend/ivas_masa_merge.c

+15 −5
Original line number Diff line number Diff line
@@ -124,15 +124,19 @@ void copy_masa_descriptive_meta( 
 *---------------------------------------------------------------------*/



void diffuse_meta_merge_1x1(

#ifdef NONBE_FIX_869_MASA_PREREND_MERGE

    MASA_DECODER_EXT_OUT_META_HANDLE outMeta,                         /* o  : Merged metadata output                   */

    MASA_DECODER_EXT_OUT_META_HANDLE inMeta,                          /* i  : Input metadata 1                         */

#ifdef NONBE_FIX_869_MASA_PREREND_MERGE

    float inEne[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],   /* i/o: TF-energy of input 1. energy after merge */

    MASA_DECODER_EXT_OUT_META_HANDLE inMetaISM,                       /* i  : Input metadata 2                         */

    float inEneISM[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] /* i  : TF-energy of input 2                     */

#else

    MASA_DECODER_EXT_OUT_META_HANDLE outMeta,                         /* o  : Merged metadata output      */

    MASA_DECODER_EXT_OUT_META_HANDLE inMeta,                          /* i  : Input metadata 1            */

    float inEne[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],   /* i  : TF-energy of input 1        */

#endif

    MASA_DECODER_EXT_OUT_META_HANDLE inMetaISM,                       /* i  : Input metadata 2            */

    float inEneISM[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] /* i  : TF-energy of input 2        */

#endif

)

{

    int8_t sf, band;
@@ -280,15 +284,21 @@ void full_stream_merge( 
 *---------------------------------------------------------------------*/



void ivas_prerend_merge_masa_metadata(

#ifdef NONBE_FIX_869_MASA_PREREND_MERGE

    MASA_DECODER_EXT_OUT_META_HANDLE outMeta,                        /* o  : Merged metadata output                                                        */

    MASA_DECODER_EXT_OUT_META_HANDLE inMeta1,                        /* i  : Input metadata 1                                                              */

    IVAS_REND_AudioConfigType inType1,                               /* i  : Type of input 1                                                               */

    float inEne1[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS], /* i/o: TF-energy of input 1. after merge, contains the energy of the merged signal   */

    MASA_DECODER_EXT_OUT_META_HANDLE inMeta2,                        /* i  : Input metadata 2                                                              */

    IVAS_REND_AudioConfigType inType2,                               /* i  : Type of input 2                                                               */

#ifdef NONBE_FIX_869_MASA_PREREND_MERGE

    float inEne2[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]  /* i  : TF-energy of input 2. may be altered                                          */

#else

    MASA_DECODER_EXT_OUT_META_HANDLE outMeta,                        /* o  : Merged metadata output                                                        */

    MASA_DECODER_EXT_OUT_META_HANDLE inMeta1,                        /* i  : Input metadata 1                                                              */

    IVAS_REND_AudioConfigType inType1,                               /* i  : Type of input 1                                                               */

    float inEne1[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS], /* i/o: TF-energy of input 1. after merge, contains the energy of the merged signal   */

    MASA_DECODER_EXT_OUT_META_HANDLE inMeta2,                        /* i  : Input metadata 2                                                              */

    IVAS_REND_AudioConfigType inType2,                               /* i  : Type of input 2                                                               */

    float inEne2[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]  /* i  : TF-energy of input 2                                                          */

#endif

)