Commit a2447603 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1381_BWD

parent cc06931e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ 
/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.258 V3.0 */



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

#define FIX_2285_CODE_DECODER_INIT_BW                   /* VA: basop issue 2285: fix core-decoder initialization bandwidth */



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

lib_enc/bw_detect.c

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



#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
@@ -95,12 +93,8 @@ 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;

    }