Commit d5a40ced authored by vaillancour's avatar vaillancour
Browse files

ensure ~BE with base

parent 3e9d0d31

lib_com/options.h

+3 −3
Original line number Diff line number Diff line
@@ -84,19 +84,19 @@ 
//#define FORCE_GENERIC

//#define ALLOW_TM  /* To allow some transition mode */



#define REMOVE_A_SCALE

//#define REMOVE_A_SCALE





#if 1        // diminish MLD by ~1 on NO_S





#define USE_EVS_FUNC_LP        // -> BE for IVAS, but condition seems missing compared to float for rf condition

//#define USE_EVS_FUNC_LP        // -> BE for IVAS, but condition seems missing compared to float for rf condition

#ifdef USE_EVS_FUNC_LP        

    //#define USE_EVS_FUNC_LP_GAIN  /* (BE) Deactivate gain Q function as they are identical to EVS, except for a couple of lines now added */

    // Keep deactivated as they are only replaced in generic so far

#endif



//#define USE_EVS_FUNC_FT_T      // replacing the 32 bits find target with the EVS find target for transition

#if 0        // diminish MLD by ~1 on NO_S



#define TRY_SHIFT_ACELP         // Adding similar mecanism as shift for EVS, allows to use only 1 bit headroom instead of 2

#define USE_EVS_FUNC_FT_G      // replacing the 32 bits find target with the EVS find target for generic

lib_enc/acelp_core_enc_fx.c

+6 −3
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ ivas_error acelp_core_enc_ivas_fx( 


    Word16 att_fx;

    Word16 tmpF_fx;

#ifdef TRY_SHIFT_ACELP // This should be moved outside of ACELP

#if 1//def TRY_SHIFT_ACELP // This should be moved outside of ACELP

    Word16 shift;

#endif

    test();
@@ -1272,6 +1272,7 @@ ivas_error acelp_core_enc_ivas_fx( 
#else

        FOR( Word16 k = 0; k < NB_SUBFR16k; k++ )

        {

            Scale_sig( &Aq[( M + 1 ) * k], M + 1, sub( norm_s( Aq[( M + 1 ) * k] ), 2 ) );

            Scale_sig( &Aw[( M + 1 ) * k], M + 1, sub( norm_s( Aw[( M + 1 ) * k] ), 2 ) ); /* Only Aw needs to be Q12 to prevent issues in Find target*/

        }

#endif
@@ -1342,6 +1343,8 @@ ivas_error acelp_core_enc_ivas_fx( 
            shift = s_min( shift, 0 );

            //shift = 0;

        }              

#else

        shift = 0;

#endif

        IF( nb_bits > 0 )

        {
@@ -1420,7 +1423,7 @@ ivas_error acelp_core_enc_ivas_fx( 
        {

            /* GENERIC, VOICED and INACTIVE frames (coded by AVQ technology) */

#ifdef TRY_SHIFT_ACELP

#if 0

#if 1

            encod_gen_voic_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, unbits, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf_fx, shift, Q_new );

#else

            encod_gen_voic_ivas_fx( st, inp, Aw, Aq, Es_pred_fx, res_fx, syn_fx, exc_fx, exc2_fx, pitch_buf, voice_factors_fx, bwe_exc_fx, unbits, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf_fx, shift, Q_new );

lib_enc/enc_gen_voic_fx.c

+413 −19

File changed.

Preview size limit exceeded, changes collapsed.

lib_enc/enc_tran_fx.c

+417 −16

File changed.

Preview size limit exceeded, changes collapsed.