Commit 3fd21166 authored by JÜRGEN Gerstacker's avatar JÜRGEN Gerstacker
Browse files

Merge branch 'basop-2402-simplification-of-arithmetic-codec-subfunctions-2' of... 

Merge branch 'basop-2402-simplification-of-arithmetic-codec-subfunctions-2' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into basop-2402-simplification-of-arithmetic-codec-subfunctions-2
parents c4f6e9bc 27f9e45b

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 in core coder */

#define FIX_2402_REPL_EVS_ARI_CODEC_DEC2                /* FhG: basop issue 2402: replace EVS arith decoder with IVAS arith decoder in IGF SCF coder */

#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 −17
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"
@@ -140,14 +139,8 @@ Word16 ACcontextMapping_decode2_no_mem_s17_LC( 
#ifdef FIX_2402_REPL_EVS_ARI_CODEC_DEC

    Word16 extra_bits_read = 0;

    ivas_ari_start_decoding_14bits_ext_1_lfe( st, &as, &extra_bits_read );

#ifdef DEBUGGING_2402

    printf( "ivas_ari_start\n" );

#endif

#else

    ari_start_decoding_14bits_fx( st, &as );

#ifdef DEBUGGING_2402

    printf( "ari_start\n" );

#endif

#endif



    overflow_bit_pos = st->next_bit_pos;
@@ -199,15 +192,8 @@ Word16 ACcontextMapping_decode2_no_mem_s17_LC( 
            move16();

#ifdef FIX_2402_REPL_EVS_ARI_CODEC_DEC

            r = ivas_ari_decode_14bits_bit_ext_1_lfe( st, &as, ari_pk_s17_LC_ext[pki], &extra_bits_read );

#ifdef DEBUGGING_2402

            printf( "r=%d, nbp=%d, ebr=%d\n", r, st->next_bit_pos, extra_bits_read );

#endif

#else

            r = ari_decode_14bits_s17_ext_fx( st, &as, ari_pk_s17_LC_ext[pki] );



#ifdef DEBUGGING_2402

            printf( "r=%d, nbp=%d, ebr=0\n", r, st->next_bit_pos );

#endif

#endif

            IF( LT_16( r, VAL_ESC ) )

            {
@@ -320,9 +306,6 @@ Word16 ACcontextMapping_decode2_no_mem_s17_LC( 
        /* Set bitstream position to (start_bit_pos+nbbits-rest_bits) */

        get_next_indice_tmp_fx( st, sub( ( sub( add( start_bit_pos, nbbits ), rest_bits ) ), st->next_bit_pos ) );

    }

#ifdef DEBUGGING_2402

    printf( "loop exit, nbp=%d\n", st->next_bit_pos );

#endif



    /*Decode signs*/

    if ( hm_cfg )