Commit 03fee5fa authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 1902-basop-PortFlpMr1832

parents bf06f727 ae609fd0

lib_com/options.h

+5 −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*/
@@ -129,6 +129,7 @@ 
#define FIX_1209_SID_SIGNALING                          /* VA: issue 1209: remove dead code in IVAS SID signaling */

#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_1131_ACELP_OOB                            /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */

#define NONBE_1240_FIX_CORE_SELECTION_ISM_SW            /* VA: issue 1240: Remove the forcing of the TCX core in ISM when switching from a high bitarte to a low one */

#define FIX_1101_CLEANING_JBM_CALL                      /* VA: issue 1101: remove obsolete call of ivas_jbm_dec_tc_buffer_open() */

lib_enc/ivas_decision_matrix_enc_fx.c

+12 −8
Original line number Diff line number Diff line
@@ -197,14 +197,6 @@ void ivas_decision_matrix_enc_fx( 
            move16();

        }

    }



    test();

    test();

    test();

    test();

    test();

    test();



#ifdef DEBUG_FORCE_DIR

    if ( st->force_dir[0] != '\0' )

    {
@@ -217,14 +209,26 @@ void ivas_decision_matrix_enc_fx( 
#endif



    /* do not allow TD stereo ACELP core -> DFT stereo TCX core switching as it is on the WC complexity path */

    test();

    test();

    test();

    test();

    test();

    test();

    if ( ( ( st->last_core == ACELP_CORE && EQ_16( last_element_mode, IVAS_CPE_TD ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) ) || ( EQ_16( st->tdm_LRTD_flag, 1 ) && LE_32( st->total_brate, IVAS_16k4 ) ) ) && EQ_16( st->core, TCX_20_CORE ) && LE_32( st->total_brate, MAX_ACELP_BRATE ) ) /* Override TCX in case of LRTD && primary channel has low bitrate*/

    {

        st->core = ACELP_CORE;

        move16();

    }



    /* sanity check: highest bitrates in ISM */

    test();

#ifdef NONBE_1240_FIX_CORE_SELECTION_ISM_SW

    test();

    if ( st->is_ism_format && st->tcxonly && GT_32( st->total_brate, MAX_ACELP_BRATE_ISM ) )

#else

    if ( st->is_ism_format && st->tcxonly )

#endif

    {

        st->core = TCX_20_CORE;

        move16();

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