Commit f3531bee authored by vaclav's avatar vaclav
Browse files

rename in-function parameters to match their input function names

parent 8a256de0

lib_com/ivas_prot.h

+3 −3
Original line number Diff line number Diff line
@@ -182,9 +182,9 @@ ivas_error pre_proc_front_ivas( 
    const int16_t localVAD_HE_SAD_LR[CPE_CHANNELS],             /* i  : HE-SAD flag without hangover, LR channels  */

    float band_energies_LR[2 * NB_BANDS],                       /* o  : energy in critical bands without minimum noise floor E_MIN      */

    const int16_t flag_16k_smc,                                 /* i  : flag to indicate if the OL SMC is run at 16 kHz */

    const int16_t spar_front_vad_flag,                          /* i  : front-VAD flag to overwrite VAD decision   */

    const int16_t spar_force_front_vad,                         /* i  : flag to force VAD decision                 */

    const int16_t spar_front_vad_dtx_flag                       /* i  : front-VAD DTX flag to overwrite VAD decision*/

    const int16_t front_vad_flag,                               /* i  : front-VAD flag to overwrite VAD decision   */

    const int16_t force_front_vad,                              /* i  : flag to force VAD decision                 */

    const int16_t front_vad_dtx_flag                            /* i  : front-VAD DTX flag to overwrite VAD decision*/

);



ivas_error pre_proc_ivas(

lib_enc/ivas_core_pre_proc_front.c

+8 −8
Original line number Diff line number Diff line
@@ -98,9 +98,9 @@ ivas_error pre_proc_front_ivas( 
    const int16_t localVAD_HE_SAD_LR[CPE_CHANNELS],            /* i  : HE-SAD flag without hangover, LR channels  */

    float band_energies_LR[2 * NB_BANDS],                      /* o  : energy in critical bands without minimum noise floor E_MIN */

    const int16_t flag_16k_smc,                                /* i  : flag to indicate if the OL SMC is run at 16 kHz */

    const int16_t spar_front_vad_flag,                         /* i  : front-VAD flag to overwrite VAD decision */

    const int16_t spar_force_front_vad,                        /* i  : flag to force VAD decision               */

    const int16_t spar_front_vad_dtx_flag                      /* i  : front-VAD DTX flag to overwrite VAD decision*/

    const int16_t front_vad_flag,                              /* i  : front-VAD flag to overwrite VAD decision */

    const int16_t force_front_vad,                             /* i  : flag to force VAD decision               */

    const int16_t front_vad_dtx_flag                           /* i  : front-VAD DTX flag to overwrite VAD decision*/

)

{

    float *inp_12k8, *new_inp_12k8;        /* pointers to current frame and new data       */
@@ -442,11 +442,11 @@ ivas_error pre_proc_front_ivas( 
    }

#endif



    if ( spar_force_front_vad == 1 || spar_front_vad_flag == 1 )

    if ( force_front_vad == 1 || front_vad_flag == 1 )

    {

        /* overwrite VAD decision with front-VAD decision if external VAD is set to 1*/

        st->vad_flag = spar_front_vad_flag;

        st->localVAD = spar_front_vad_flag;

        st->vad_flag = front_vad_flag;

        st->localVAD = front_vad_flag;

    }



    if ( ( hCPE != NULL && !( lr_vad_enabled && st->idchan == 0 ) ) || hSCE != NULL )
@@ -466,10 +466,10 @@ ivas_error pre_proc_front_ivas( 
        *vad_hover_flag = *vad_flag_dtx && !( LR_localVAD || st->localVAD );

    }



    if ( spar_force_front_vad == 1 || spar_front_vad_dtx_flag == 1 )

    if ( force_front_vad == 1 || front_vad_dtx_flag == 1 )

    {

        /* overwrite VAD decision with front-VAD decision if external VAD is set to 1*/

        *vad_flag_dtx = spar_front_vad_dtx_flag;

        *vad_flag_dtx = front_vad_dtx_flag;

    }



    /*----------------------------------------------------------------*

lib_enc/ivas_sce_enc.c

+1 −3
Original line number Diff line number Diff line
@@ -183,10 +183,8 @@ ivas_error ivas_sce_enc( 
    error = pre_proc_front_ivas( hSCE, NULL, hSCE->element_brate, nb_bits_metadata, input_frame, 0, old_inp_12k8[0], old_inp_16k[0],

                                 &Etot[0], &ener[0], &relE[0], A[0], Aw[0], epsP[0], lsp_new[0], lsp_mid[0],

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

                                 fft_buff[0], A[0], lsp_new[0], currFlatness[0], 0, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, NULL,

                                 flag_16k_smc,

                                 fft_buff[0], A[0], lsp_new[0], currFlatness[0], 0, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, NULL, flag_16k_smc,

                                 st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->force_front_vad : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_dtx_flag : 0 );



    if ( error != IVAS_ERR_OK )

    {

        return error;