Commit 3baa501e authored by emerit's avatar emerit
Browse files

Merge branch 'main' into fix_hrtf_processing_scripts_for_3rd_party_sofa_support

parents 89f8b521 118a2d09

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -168,7 +168,10 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_GSC_BSTR                              /* VA: issue 1264: Fix bitstream synchronization between encoder and decoder in ACELP GSC in OMASA */

#define NONBE_1273_ISM_METADATA_COUNTER                 /* VA: issue 1273: fix counter overflow in ISM metadata encoder */

#define NONBE_1279_COUNTER_OVERFLOW                     /* VA: issue 1279: Avoid possible overflow of counter st->Nb_ACELP_frames */

#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 





/* ##################### End NON-BE switches ########################### */

lib_enc/acelp_core_enc.c

+7 −0
Original line number Diff line number Diff line
@@ -167,7 +167,14 @@ ivas_error acelp_core_enc( 
    {

        st->Nb_ACELP_frames = 0;

    }

#ifdef NONBE_1279_COUNTER_OVERFLOW

    if ( st->Nb_ACELP_frames < MAX16B )

    {

        st->Nb_ACELP_frames++;

    }

#else

    st->Nb_ACELP_frames++;

#endif



    if ( st->L_frame == L_FRAME )

    {

lib_enc/swb_pre_proc.c

+4 −0
Original line number Diff line number Diff line
@@ -442,7 +442,11 @@ void swb_pre_proc( 
                if ( st->last_extl != SWB_BWE && st->last_extl != FB_BWE )

                {

                    /* resample 48 kHz to 32kHz */

#ifdef NONBE_1244_FIX_SWB_BWE_MEMORY

                    if ( ( st->last_bwidth == FB && st->element_mode == EVS_MONO ) || ( st->bwidth == FB && st->element_mode > EVS_MONO ) ) // note: once EVS i CR fixed, the condition will simplify to "if ( st->bwidth == FB )" only

#else

                    if ( st->last_bwidth == FB )

#endif

                    {

                        inner_frame = L_FRAME48k;

                        inner_Fs = 48000;