Commit ae609fd0 authored by vaclav's avatar vaclav
Browse files

Merge branch '1925-basop-PortFlpMr1911' into 'main' 

[non-be] [allow-regression] Port MR1911 from float to BASOP

Closes #1925

See merge request !2112
parents f88b35e3 dcd67790

lib_com/options.h

+4 −4
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 
#define NONBE_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/

#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER            /* FhG: issue 1128: set output ambisonics order to input order for EXT output  */

#define FIX_1138_SBA_EXT_ERROR_PRINTOUT                 /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */

#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 */ 

#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC      /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/
@@ -120,7 +121,6 @@ 
#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */

#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */

#define FIX_1121_MASA_DESCRIPTOR                        /* VA: issue 1121: Define 'ivasmasaFormatDescriptor' at one common place */



#define NONBE_1894_OSBA_SCALING                         /* FhG: do not scale OSBA inputs by 0.5 any more */

#define NONBE_FIX_1141_OSBA_ROOM_RENDERING              /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect  */

#define NONBE_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

lib_enc/swb_pre_proc_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -583,7 +583,11 @@ void swb_pre_proc_fx( 
                IF( NE_16( st_fx->last_extl, SWB_BWE ) && NE_16( st_fx->last_extl, FB_BWE ) )

                {

                    /* resample 48 kHz to 32kHz */

#ifdef NONBE_1244_FIX_SWB_BWE_MEMORY

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

#else

                    IF( EQ_16( st_fx->last_bwidth, FB ) )

#endif

                    {

                        inner_frame = L_FRAME48k;

                        inner_Fs = 48000;
@@ -986,7 +990,11 @@ void swb_pre_proc_ivas_fx( 
                IF( NE_16( st->last_extl, SWB_BWE ) && NE_16( 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 ) || ( EQ_16( 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( EQ_16( st->last_bwidth, FB ) )

#endif

                    {

                        inner_frame = L_FRAME48k;

                        move16();