Commit 9951b0d3 authored by multrus's avatar multrus
Browse files

formatting

parent 7c42ab5f

apps/renderer.c

+2 −4
Original line number Diff line number Diff line
@@ -425,10 +425,8 @@ static int16_t getTotalNumInChannels( 
    IVAS_REND_HANDLE hIvasRend,

    IVAS_REND_InputId mcIds[RENDERER_MAX_MC_INPUTS],

    IVAS_REND_InputId ismIds[RENDERER_MAX_ISM_INPUTS],

    IVAS_REND_InputId sbaIds[RENDERER_MAX_SBA_INPUTS]

    ,

    IVAS_REND_InputId masaIds[RENDERER_MAX_MASA_INPUTS]

)

    IVAS_REND_InputId sbaIds[RENDERER_MAX_SBA_INPUTS],

    IVAS_REND_InputId masaIds[RENDERER_MAX_MASA_INPUTS] )

{

    int16_t totalNumInChannels = 0;

    int16_t i, numInputChannels;

lib_com/prot.h

100755 → 100644
+3 −3

File changed.File mode changed from 100755 to 100644.

Contains only whitespace changes.

lib_dec/ivas_stereo_switching_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -1474,7 +1474,6 @@ void stereo_switching_dec( 
            mvr2r( sts[0]->delay_buf_out, sts[1]->delay_buf_out, HQ_DELTA_MAX * HQ_DELAY_COMP );

            mvr2r( sts[0]->hTcxDec->old_syn_Overl, sts[1]->hTcxDec->old_syn_Overl, 256 );

            /* Todo: apply panning to buffers instead of simply using dmx in left and right channel */



        }

    }

    else if ( hCPE->element_mode == IVAS_CPE_TD && hCPE->last_element_mode == IVAS_CPE_MDCT )

lib_enc/ivas_agc_enc.c

+14 −17
Original line number Diff line number Diff line
@@ -320,8 +320,7 @@ void ivas_agc_enc_process( 
        if ( !isGainAdjusted )

        {

            float actualMaxAbsVal = 0.f;

            int16_t currMaxAttExp

                ;

            int16_t currMaxAttExp;



            currMaxAttExp = min( ( pState->gain_state[i].lastExp + pState->agc_com.absEmin ), pState->agc_com.maxAttExp );

            extendedExpVal = FALSE;
@@ -366,7 +365,6 @@ void ivas_agc_enc_process( 
                        pState->gain_state[i].gainExpVal = min( pState->gain_state[i].gainExpVal, currMaxAttExp );

                        break;

                    }



                }

            }
@@ -404,8 +402,7 @@ void ivas_agc_enc_process( 


        pState->gain_data[i].absGainExp = pState->gain_state[i].prevExp + pState->agc_com.absEmin;



        if ( extendedExpVal

             && pState->gain_state[i].gainExpVal <= 0 )

        if ( extendedExpVal && pState->gain_state[i].gainExpVal <= 0 )

        {

            pState->gain_state[i].gainExpVal = pState->agc_com.maxAttExp + 1;

        }

lib_enc/ivas_cpe_enc.c

+2 −4
Original line number Diff line number Diff line
@@ -436,10 +436,8 @@ ivas_error ivas_cpe_enc( 
    {

        error = pre_proc_front_ivas( NULL, hCPE, hCPE->element_brate, nb_bits_metadata, input_frame, n, old_inp_12k8[n], old_inp_16k[n], &Etot[n], &ener[n], &relE[n], A[n], Aw[n], epsP[n], lsp_new[n], lsp_mid[n],

                                     &vad_hover_flag[n], &attack_flag[n], realBuffer[n], imagBuffer[n], old_wsp[n], pitch_fr[n], voicing_fr[n], &loc_harm[n], &cor_map_sum[n], &vad_flag_dtx[n], enerBuffer[n],

                                     fft_buff[n], A[0], lsp_new[0], currFlatness[n], tdm_ratio_idx, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, band_energies_LR, 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, 0, 0

                                     ,

                                     ivas_total_brate

        );

                                     fft_buff[n], A[0], lsp_new[0], currFlatness[n], tdm_ratio_idx, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, band_energies_LR, 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, 0, 0,

                                     ivas_total_brate );

        if ( error != IVAS_ERR_OK )

        {

            return error;