Commit 491989d5 authored by vaillancour's avatar vaillancour
Browse files

test shift

parent 43e0a18c

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 
//#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

lib_enc/acelp_core_enc_fx.c

+5 −2
Original line number Diff line number Diff line
@@ -1269,6 +1269,11 @@ ivas_error acelp_core_enc_ivas_fx( 
        {

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

        }

#else

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

        {

            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

        test();

        IF( EQ_16( st->last_core, HQ_CORE ) && st->element_mode > EVS_MONO )
@@ -1335,8 +1340,6 @@ ivas_error acelp_core_enc_ivas_fx( 


            shift = sub( norm_s( max ), 3 );

            shift = s_min( shift, 0 );

            //shift = sub( norm_s( max ), 4 );

            //shift = s_min( shift, -1 );

            //shift = 0;

        }                                                           

#endif

lib_enc/enc_tran_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ Word16 encod_tran_fx( 


        Copy( &res_fx[i_subfr], &exc_fx[i_subfr], L_SUBFR ); /* Q_new */





        find_targets_fx( speech_fx, hLPDmem->mem_syn, i_subfr, &hLPDmem->mem_w0, p_Aq,

                         res_fx, L_SUBFR, p_Aw, st_fx->preemph_fac, xn, cn, h1 );

lib_enc/find_tar_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ void find_targets_fx( 
    /*---------------------------------------------------------------*

     * Compute impulse response, h1[], of weighted synthesis filter  *

     *---------------------------------------------------------------*/



    scale = norm_s( Ap[0] );

    scaleq = norm_s( p_Aq[0] );

    d = sub( scaleq, scale );
@@ -96,6 +95,7 @@ void find_targets_fx( 
        s = add( scale, 1 );

        s2 = 16384;

    }



    Overflow = 0;

    move16();

    FOR( i = 0; i < M; i++ )