Commit ad53e4fe authored by Manuel Jander's avatar Manuel Jander
Browse files

Activate FIX_2402_REPL_EVS_ARI_CODEC_DEC and remove options2.h

parent fb740d63

lib_com/ivas_arith_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 


#include <stdint.h>

#include "options.h"

#include "options2.h"

#include "wmc_auto.h"

#include "prot_fx.h"

#include "ivas_prot_fx.h"

lib_com/ivas_prot_fx.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 


#include <stdint.h>

#include "options.h"

#include "options2.h"

#include <stdio.h>

#include "typedef.h"

#include "stat_enc.h"

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ 
#define FIX_BASOP_2530_IVAS_DECISION_MAT                /* VA: Fix ambiguous usage of extract_l() */

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

#define FIX_2402_INLINE_FCT_ARI_CODEC                   /* FhG: basop issue 2402: simplify processing in arithmetic decoding, inline mul_sbc_14bits, all BE */

#define FIX_2402_REPL_EVS_ARI_CODEC_DEC                 /* FhG: basop issue 2402: replace EVS arith decoder with IVAS arith decoder */

#define FIX_2402_REPL_IVAS_ARI_CODEC_DEC                /* FhG: basop issue 2402: replace EVS arith decoder with IVAS arith decoder */

#define FIX_2402_SIGNED_VERSION                         /* FhG: basop issue 2402: use signed operator instead of unsigned, better match for hardware */

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

#define FIX_BASOP_2546_HARMONIZE_TCX_SCALAR             /* FhG: Fix issue 2546 Harmonize function tcx_scalar_quantization_rateloop*/

#define FIX_BASOP_2532_cx_e                             /* FhG: Fix issue 2532 about additional exponent variable*/

lib_com/options2.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
// #define FIX_2402_REPL_EVS_ARI_CODEC_DEC                 /* FhG: basop issue 2402: replace EVS arith decoder with IVAS arith decoder */

// #define FIX_2402_REPL_EVS_ARI_CODEC_ENC

// #define FIX_2402_REPL_IVAS_ARI_CODEC_DEC                 /* FhG: basop issue 2402: replace EVS arith decoder with IVAS arith decoder */



#define FIX_2402_SIGNED_VERSION /* FhG: basop issue 2402:  */



// #define DEBUGGING_2402

lib_dec/ACcontextMapping_dec_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <stdint.h>

#include <assert.h>

#include "options.h"

#include "options2.h"

#include "rom_com.h"

#include "rom_dec.h"

#include "basop_util.h"