Commit 8eabd960 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2530_IVAS_DECISION_MAT

parent 45ee94db

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_BASOP_2530_IVAS_DECISION_MAT                /* VA: Fix ambiguous usage of extract_l() */

#define SIMPLIFY_CORE_ENC                               /* VA: basop issue 2430: Simplify ivas_core_enc_fx() */

#define FIX_2402_SIMPLIFY_ARI_CODEC                     /* FhG: basop issue 2402: simplified arithmetic in TCX arithmetic coder */

#define FIX_2402_REPL_EVS_ARI_CODEC_ENC                 /* FhG: basop issue 2402: replace EVS arith encoder with IVAS arith encoder */

lib_enc/ivas_decision_matrix_enc_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -336,11 +336,7 @@ void ivas_decision_matrix_enc_fx( 
                st->extl = WB_BWE;

                move16();

            }

#ifdef FIX_BASOP_2530_IVAS_DECISION_MAT

            ELSE IF( GE_32( st->total_brate, MIN_BRATE_WB_BWE ) && !st->flag_ACELP16k )

#else

            ELSE IF( GE_16( extract_l( st->total_brate ), MIN_BRATE_WB_BWE ) && !st->flag_ACELP16k )

#endif

            {

                test();

                test();