Commit 87f3ba37 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_443_FD_CNG_INIT

parent 9441545a

lib_com/options.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -163,7 +163,6 @@ 












#define FIX_443_FD_CNG_INIT                             /* FhG: correct bitrate value for FD-CNG init */

#define VARIABLE_SPEED_DECODING                         /* FhG: Contribution 37: variable speed decoding employing the JBM functioniality */

#define VARIABLE_SPEED_DECODING                         /* FhG: Contribution 37: variable speed decoding employing the JBM functioniality */

#define JBM_TSM_ON_TCS                                  /* FhG: Contribution 37: run the TSM part of JBM on the TCs instead of the final output pcm waveforms */

#define JBM_TSM_ON_TCS                                  /* FhG: Contribution 37: run the TSM part of JBM on the TCs instead of the final output pcm waveforms */

#define FIX_DTX_428                                     /* FhG: fix for issue 428, crash with DTX and bitrate switching */

#define FIX_DTX_428                                     /* FhG: fix for issue 428, crash with DTX and bitrate switching */

lib_enc/ivas_core_pre_proc_front.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -563,14 +563,10 @@ ivas_error pre_proc_front_ivas( 




    if ( st->hFdCngEnc != NULL && ( st->ini_frame == 0 || last_element_brate != element_brate || st->last_bwidth != st->bwidth ) )

    if ( st->hFdCngEnc != NULL && ( st->ini_frame == 0 || last_element_brate != element_brate || st->last_bwidth != st->bwidth ) )

    {

    {

#ifdef FIX_443_FD_CNG_INIT

        int32_t total_brate;

        int32_t total_brate;





        total_brate = ( element_mode == IVAS_SCE ) ? st->total_brate : st->bits_frame_nominal * FRAMES_PER_SEC;

        total_brate = ( element_mode == IVAS_SCE ) ? st->total_brate : st->bits_frame_nominal * FRAMES_PER_SEC;

        configureFdCngEnc( st->hFdCngEnc, max( st->input_bwidth, WB ), total_brate );

        configureFdCngEnc( st->hFdCngEnc, max( st->input_bwidth, WB ), total_brate );

#else

        configureFdCngEnc( st->hFdCngEnc, max( st->input_bwidth, WB ), st->bits_frame_nominal * FRAMES_PER_SEC );

#endif

        if ( hCPE != NULL )

        if ( hCPE != NULL )

        {

        {

            st->hFdCngEnc->hFdCngCom->CngBitrate = hCPE->element_brate - 1;

            st->hFdCngEnc->hFdCngCom->CngBitrate = hCPE->element_brate - 1;