Commit 2f5925a9 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1381_BWD

parent 9c8929f9

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ 
/* any switch which is non-be wrt. TS 26.251 V3.0 */



#define FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT  /* Dolby: Issue 2250:  random vector generation in GenShapedSHBExcitation() */

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

#define FIX_2306_MISSING_UPDATE_LOWRATE_PITCH_GAIN      /* Dolby: Fix missing update of low-rate pitch gain in the S/M classifier */

#define FIX_2257_INCR_GUARD_BITS                        /* FhG: take correct rendering frame-size into account for guard-bits calculation */

lib_enc/bw_detect_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -18,9 +18,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
@@ -77,17 +75,11 @@ void bw_detect_fx( 
    test();

    test();

    test();

#ifdef FIX_1381_BWD

    test();

    test();

#endif

    if ( st->ini_frame > 0 && ( ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && ( GE_32( st->element_brate, BWD_MIN_BRATE_WIDER_BW_MDCT ) || mct_on ) ) ||

#ifdef FIX_1381_BWD

                                ( st->is_ism_format && GE_32( st->element_brate, BWD_MIN_BRATE_WIDER_BW_ISM ) ) ||

                                ( EQ_16( ivas_format, MASA_FORMAT ) && GE_32( st->element_brate, BWD_MIN_BRATE_WIDER_BW_MASA ) ) ) )

#else

                                ( EQ_16( ivas_format, ISM_FORMAT ) && GE_32( st->element_brate, BWD_MIN_BRATE_WIDER_BW_ISM ) ) ) )

#endif

    {

        bwd_count_wider_bw = BWD_COUNT_WIDER_BW_MDCT;

        move16();