Commit 07ef3b62 authored by multrus's avatar multrus
Browse files

Merge branch 'main' into 1443-minimal-code-cleanup-in-ivas_smc_gmm_fx

parents 3c7d0686 06ecd7a7

.gitlab-ci.yml

+3 −0
Original line number Diff line number Diff line
@@ -1750,6 +1750,9 @@ voip-be-on-merge-request: 
    # delete previous jobs logfiles if present (-f flag ensures return calue of 0 even in first run where this folder is not present)

    - rm -rf COMPLEXITY/logs

    - which coan

  allow_failure:

    exit_codes:

      - 123

  artifacts:

    name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"

    when: always

lib_com/deemph.c

+4 −7
Original line number Diff line number Diff line
@@ -41,26 +41,23 @@ 




void deemph_fx_32(

    Word16 shift,    /*scaled output*/

    Word32 *signal,  /* i/o: signal            Qx*/

    const Word16 mu, /* i  : deemphasis factor Q15*/

    const Word16 L,  /* i  : vector size         */

    Word32 *mem      /* i/o: memory (y[-1])    Qx+shift*/

    Word32 *mem      /* i/o: memory (y[-1])    Qx*/

)

{

    Word16 i;



    signal[0] = L_add( signal[0], Mpy_32_16_1( ( *mem ), mu ) ); /*Qx*/

    signal[0] = Madd_32_16( signal[0], *mem, mu ); // Qx

    move32();

    FOR( i = 1; i < L; i++ )

    {

        signal[i] = L_add( signal[i], Mpy_32_16_1( signal[i - 1], mu ) ); /*Qx*/

        signal[i] = L_shl( signal[i], shift );                            /*Qx+shift*/

        move32();

        signal[i] = Madd_32_16( signal[i], signal[i - 1], mu ); // Qx

        move32();

    }



    *mem = signal[L - 1]; /*Qx+shift*/

    *mem = signal[L - 1]; // Qx

    move32();



    return;

lib_com/prot_fx.h

+0 −1
Original line number Diff line number Diff line
@@ -1651,7 +1651,6 @@ void deemph_fx( 
void E_UTIL_deemph2( Word16 shift, Word16 *x, const Word16 mu, const Word16 L, Word16 *mem );















void deemph_fx_32(













    Word16 shift,    /* i : scaled output      */















    Word32 *signal,  /* i/o: signal            */















    const Word16 mu, /* i  : deemphasis factor */















    const Word16 L,  /* i  : vector size       */

































lib_dec/ivas_stereo_icbwe_dec_fx.c



+1
−1




























Original line number
Diff line number
Diff line








@@ -611,7 +611,7 @@ void stereo_icBWE_dec_fx(













        Q_syn_shb = tmp;















        move16();





























        deemph_fx_32( 0, shb_synth_nonref_fx + L_SHB_LAHEAD, specMapping_fx, L_FRAME16k, &( hStereoICBWE->memShbSpecMapping_fx ) );













        deemph_fx_32( shb_synth_nonref_fx + L_SHB_LAHEAD, specMapping_fx, L_FRAME16k, &( hStereoICBWE->memShbSpecMapping_fx ) );















        hStereoICBWE->prev_Q_memshbspec = Q_syn_shb;















        move16();















        Copy32( shb_synth_nonref_fx + L_FRAME16k, hStereoICBWE->mem_syn_shb_nonref_fx, L_SHB_LAHEAD ); /* Q_syn_shb */

































lib_enc/enc_pit_exc_fx.c



+2
−0




























Original line number
Diff line number
Diff line








@@ -775,6 +775,8 @@ void enc_pit_exc_ivas_fx(













            push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );















        }





























        st_fx->hSpMusClas->lowrate_pitchGain = mac_r( L_mult( 29491 /* 0.9 in Q15 */, st_fx->hSpMusClas->lowrate_pitchGain ), 3277 /* 0.1 in Q15 */, gain_pit ); /* Q14 */





























        gpit_tmp = gain_pit;















        move16(); /*Q14*/















        test();