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

Merge branch 'main' into kiene/test-ubuntu-24_04-runner

parents a5341040 0c62f531

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ 
#define FIX_1454_FIX_STEREO_TO_FOA_JBM                  /* VA: issue 1454: fix buggy stereo to FOA in JBM */

#define FIX_1461_CNG_BW_SWITCHING                       /* Eri: issue 1461: Stereo parameters are not updated when SID/NODATA forces BW to stay the same */

#define FIX_2252_LP_CNG_STARTS_SID                      /* VA: issues 2251 and 2252: fix LP CNG uninitialized value in bitstream that starts with an SID */

#define FIX_1381_BWD                                    /* VA: issue 1381: apply no hysteresis in BWD at higher bitrates also in mono MASA and OMASA */



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

lib_enc/bw_detect.c

+8 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ 
 *-------------------------------------------------------------------*/



#define BWD_MIN_BRATE_WIDER_BW_MDCT IVAS_48k

#ifdef FIX_1381_BWD

#define BWD_MIN_BRATE_WIDER_BW_MASA IVAS_48k

#endif

#define BWD_MIN_BRATE_WIDER_BW_ISM  IVAS_32k

#define BWD_MAX_BRATE_WIDER_BW_MDCT IVAS_80k

#define BWD_MAX_BRATE_WIDER_BW_ISM  IVAS_64k
@@ -92,7 +95,12 @@ void bw_detect( 


    bwd_count_wider_bw = BWD_COUNT_WIDER_BW;

    if ( st->ini_frame > 0 && ( ( st->element_mode == IVAS_CPE_MDCT && ( st->element_brate >= BWD_MIN_BRATE_WIDER_BW_MDCT || mct_on ) ) ||

#ifdef FIX_1381_BWD

                                ( st->is_ism_format && st->element_brate >= BWD_MIN_BRATE_WIDER_BW_ISM ) ||

                                ( ivas_format == MASA_FORMAT && st->element_brate >= BWD_MIN_BRATE_WIDER_BW_MASA ) ) )

#else

                                ( ivas_format == ISM_FORMAT && st->element_brate >= BWD_MIN_BRATE_WIDER_BW_ISM ) ) )

#endif

    {

        bwd_count_wider_bw = BWD_COUNT_WIDER_BW_MDCT;

    }