Commit f6078db0 authored by multrus's avatar multrus
Browse files

some smaller issues

parent b0b8261b

lib_enc/fd_cng_enc_fx.c

+10 −9
Original line number Diff line number Diff line
@@ -163,8 +163,9 @@ void initFdCngEnc_fx( 
void configureFdCngEnc_fx(

    HANDLE_FD_CNG_ENC hsEnc,  /* i/o: Contains the variables related to the FD-based CNG process */

    const Word16 bandwidth,   /* i  : bandwidth    Q0 */

    const Word32 bitrate,    /* Q0 */

    const Word16 element_mode )

    const Word32 bitrate,     /* i  : bitrate Q0 */

    const Word16 element_mode /* i  : element mode Q0 */

)

#else

void configureFdCngEnc_fx(

    HANDLE_FD_CNG_ENC hsEnc, /* i/o: Contains the variables related to the FD-based CNG process */
@@ -274,7 +275,7 @@ void configureFdCngEnc_fx( 
    {

        case 512:

#ifdef FIX_2455_HARMONIZE_configureFdCngEnc

            if ( GT_16( element_mode, 0 ) )

            if ( GT_16( element_mode, EVS_MONO ) )

            {

                hsCom->fftSineTab_fx = NULL;

                hsCom->olapWinAna_fx = olapWinAna512_fx; /* Q30 */
@@ -288,7 +289,7 @@ void configureFdCngEnc_fx( 
            BREAK;

        case 640:

#ifdef FIX_2455_HARMONIZE_configureFdCngEnc

            if ( GT_16( element_mode, 0 ) )

            if ( GT_16( element_mode, EVS_MONO ) )

            {

                hsCom->fftSineTab_fx = fftSineTab640_fx; /* Q15 */

                hsCom->olapWinAna_fx = olapWinAna640_fx; /* Q30 */
@@ -1683,7 +1684,7 @@ void generate_comfort_noise_enc_fx( 
    Encoder_State *stcod,

    Word16 Q_new,

    Word16 gen_exc,

    int element_mode )

    Word16 element_mode )

#else

void generate_comfort_noise_enc_ivas_fx(

    Encoder_State *stcod,
@@ -1813,7 +1814,7 @@ void generate_comfort_noise_enc_ivas_fx( 


    /* Perform STFT synthesis */

#ifdef FIX_2455_HARMONIZE_generate_comfort_noise_enc

    IF( element_mode == EVS_MONO )

    IF( EQ_16( element_mode, EVS_MONO ) )

    {

        SynthesisSTFT( fftBuffer, fftBufferExp, timeDomainOutput, st->olapBufferSynth, st->olapWinSyn,

                       tcx_transition, st, gen_exc, &Q_new, -1, -1 );
@@ -1823,7 +1824,7 @@ void generate_comfort_noise_enc_ivas_fx( 
        SynthesisSTFT_enc_ivas_fx( fftBuffer, fftBufferExp, timeDomainOutput, st->olapBufferSynth, st->olapWinSyn,

                                   tcx_transition, st, gen_exc, &Q_new, -1, -1 );

    }

    IF( ( ( hTdCngEnc != NULL ) && ( element_mode != EVS_MONO ) ) || ( element_mode == EVS_MONO ) )

    IF( ( ( hTdCngEnc != NULL ) && ( NE_16( element_mode, EVS_MONO ) ) ) || EQ_16( element_mode, EVS_MONO ) )

#else

    SynthesisSTFT_enc_ivas_fx( fftBuffer, fftBufferExp, timeDomainOutput, st->olapBufferSynth, st->olapWinSyn,

                               tcx_transition, st, gen_exc, &Q_new, -1, -1 );

lib_enc/ivas_core_pre_proc_front_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ void pre_proc_front_ivas_fx( 
            total_brate = imult3216( FRAMES_PER_SEC, st->bits_frame_nominal ); /* Q0 */

        }

#ifdef FIX_2455_HARMONIZE_configureFdCngEnc

        configureFdCngEnc_ivas_fx( st->hFdCngEnc, s_max( st->input_bwidth, WB ), total_brate, element_mode );

        configureFdCngEnc_fx( st->hFdCngEnc, s_max( st->input_bwidth, WB ), total_brate, element_mode );

#else

        configureFdCngEnc_ivas_fx( st->hFdCngEnc, s_max( st->input_bwidth, WB ), total_brate );

#endif

lib_enc/prot_fx_enc.h

+10 −1
Original line number Diff line number Diff line
@@ -1538,7 +1538,7 @@ void generate_comfort_noise_enc_fx( 
    Encoder_State *stcod,

    Word16 Q_new,

    Word16 gen_exc,

    int element_mode );

    Word16 element_mode );

#else

/* Generate the comfort noise based on the target noise level */

void generate_comfort_noise_enc_fx(
@@ -1651,11 +1651,20 @@ void initFdCngEnc_fx( 
    const Word32 input_Fs, /* Q0 */

    const Word16 scale );



#ifdef FIX_2455_HARMONIZE_configureFdCngEnc

void configureFdCngEnc_fx(

    HANDLE_FD_CNG_ENC hsEnc,  /* i/o: Contains the variables related to the FD-based CNG process */

    const Word16 bandwidth,   /* i  : bandwidth    Q0 */

    const Word32 bitrate,     /* i  : bitrate Q0 */

    const Word16 element_mode /* i  : element mode Q0 */

);

#else

void configureFdCngEnc_fx(

    HANDLE_FD_CNG_ENC hs,   /* i/o: Contains the variables related to the CLDFB-based CNG process */

    const Word16 bandwidth, /* i  : bandwidth Q0*/

    const Word32 bitrate    /* Q0 */

);

#endif



/* Perform noise estimation */

void perform_noise_estimation_enc_fx(