Commit cc3db8fc authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '443-switch-eri_msvq_cleanup-can-cause-crashes-in-ism-dtx' into 'main' 

[non-BE] Issue 443: use correct bitrate variable for FD-CNG config init

See merge request !636
parents f8063091 b326d7ed

lib_com/options.h

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


#define FIX_642											/* FhG: Fix for issue 642, buggy DoA-array access in DirAC head rotation*/



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

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

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

lib_enc/ivas_core_pre_proc_front.c

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


    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;



        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 );

#else

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

#endif

        if ( hCPE != NULL )

        {

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