Commit ad28813b authored by PLAINSI's avatar PLAINSI
Browse files

FIx clang and complexity compilation

parent 34c1e8c4

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2613,7 +2613,7 @@ void ivas_init_dec_get_num_cldfb_instances( 
#ifdef PARAMUPMIX_BINAURAL_UPDATES

        if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

        {

            *numCldfbAnalyses = max( MC_PARAMUPMIX_MIN_CLDFB+3, *numCldfbAnalyses );

            *numCldfbAnalyses = max( MC_PARAMUPMIX_MAX_INPUT_CHANS, *numCldfbAnalyses );

        }

        else

        {

lib_dec/ivas_mc_paramupmix_dec.c

+109 −108
Original line number Diff line number Diff line
@@ -1013,7 +1013,8 @@ static void ivas_mc_paramupmix_dec_sf( 
    Decoder_Struct *st_ivas,             /* i/o: IVAS decoder handle                        */

    float *output_f[MAX_OUTPUT_CHANNELS] /* i/o: synthesized core-coder transport channels  */

#ifdef PARAMUPMIX_BINAURAL_UPDATES

    ,int16_t slot_index_start

    ,

    int16_t slot_index_start

#endif

)

{
@@ -1024,12 +1025,11 @@ static void ivas_mc_paramupmix_dec_sf( 
    float Cldfb_ImagBuffer[MC_PARAMUPMIX_MAX_TRANSPORT_CHANS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];

    int16_t noparamupmix_delay, n_samples_rendered;

    MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix;

    hMCParamUpmix = st_ivas->hMCParamUpmix;

#ifdef PARAMUPMIX_BINAURAL_UPDATES

    int16_t subframeIdx, idx_in, maxBand;

#ifdef SPLIT_REND_WITH_HEAD_ROT

    float Cldfb_RealBuffer_subfr[4+MC_PARAMUPMIX_MAX_TRANSPORT_CHANS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_subfr[4+MC_PARAMUPMIX_MAX_TRANSPORT_CHANS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_RealBuffer_subfr[MC_PARAMUPMIX_MAX_INPUT_CHANS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_subfr[MC_PARAMUPMIX_MAX_INPUT_CHANS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_RealBuffer_Binaural[1][BINAURAL_CHANNELS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_Binaural[1][BINAURAL_CHANNELS][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];

    int16_t idx_lfe;
@@ -1043,6 +1043,7 @@ static void ivas_mc_paramupmix_dec_sf( 
    int16_t chidx1[MC_PARAMUPMIX_COMBINATIONS] = { 0, 1, 4, 5 };

    int16_t chidx2[MC_PARAMUPMIX_COMBINATIONS] = { 2, 3, 6, 7 };

#endif

    hMCParamUpmix = st_ivas->hMCParamUpmix;

    assert( hMCParamUpmix );



    push_wmops( "ivas_mc_paramupmix_dec_sf" );
@@ -1099,7 +1100,7 @@ static void ivas_mc_paramupmix_dec_sf( 
        /* fastconv binaural rendering and CLDFB synthesis */

        /* cldfb analysis of non-coupled, non-LFE channels */

        idx_in = 0;

        for ( ch = 0; ch < 12-2*MC_PARAMUPMIX_COMBINATIONS; ch++ )

        for ( ch = 0; ch < MC_PARAMUPMIX_MAX_INPUT_CHANS - 2 * MC_PARAMUPMIX_COMBINATIONS; ch++ )

        {

            if ( st_ivas->hIntSetup.index_lfe[0] != ch )

            {