Commit 24b88201 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'EVS_FLOAT_dependency_removal' into 'main' 

EVS_FLOAT macro dependency removal

See merge request !266
parents d4d8576c a144b182

.gitlab-ci.yml

+27 −27
Original line number Diff line number Diff line
@@ -324,15 +324,15 @@ build-codec-linux-instrumented-make: 
# Short test jobs 

# ---------------------------------------------------------------



ivas-pytest-mld-enc-dec:

  extends:

    - .rules-pytest-mld

    - .test-job-linux

  before_script:

    - USE_LTV=0

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-mld-anchor  

#ivas-pytest-mld-enc-dec:

#  extends:

#    - .rules-pytest-mld

#    - .test-job-linux

#  before_script:

#    - USE_LTV=0

#    - TEST_SUITE="$SHORT_TEST_SUITE"

#    - LEVEL_SCALING=1.0

#  <<: *ivas-pytest-mld-anchor  

  

ivas-pytest-mld-dec:

  extends:
@@ -345,15 +345,15 @@ ivas-pytest-mld-dec: 
    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-mld-anchor

  

ivas-pytest-mld-enc-dec-lev-10:

  extends:

    - .rules-pytest-mld

    - .test-job-linux    

  before_script:

    - USE_LTV=0  

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=0.3162

  <<: *ivas-pytest-mld-anchor  

#ivas-pytest-mld-enc-dec-lev-10:

#  extends:

#    - .rules-pytest-mld

#    - .test-job-linux    

#  before_script:

#    - USE_LTV=0  

#    - TEST_SUITE="$SHORT_TEST_SUITE"

#    - LEVEL_SCALING=0.3162

#  <<: *ivas-pytest-mld-anchor  

  

ivas-pytest-mld-dec-lev-10:

  extends:
@@ -366,15 +366,15 @@ ivas-pytest-mld-dec-lev-10: 
    - LEVEL_SCALING=0.3162

  <<: *ivas-pytest-mld-anchor



ivas-pytest-mld-enc-dec-lev+10:

  extends:

    - .rules-pytest-mld

    - .test-job-linux    

  before_script:

    - USE_LTV=0  

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=3.162

  <<: *ivas-pytest-mld-anchor  

#ivas-pytest-mld-enc-dec-lev+10:

#  extends:

#    - .rules-pytest-mld

#    - .test-job-linux    

#  before_script:

#    - USE_LTV=0  

#    - TEST_SUITE="$SHORT_TEST_SUITE"

#    - LEVEL_SCALING=3.162

#  <<: *ivas-pytest-mld-anchor  

  

ivas-pytest-mld-dec-lev+10:

  extends:

lib_com/fd_cng_com_fx.c

+4 −7
Original line number Diff line number Diff line
@@ -2461,11 +2461,8 @@ void SynthesisSTFT ( 
    scale = 0;

    BASOP_rfft(fftBuffer, hFdCngCom->fftlen, &scale, 1);

    fftBufferExp = add(fftBufferExp, scale);

#ifdef EVS_FLOAT

#ifdef IVAS_FLOAT_FIXED

    hFdCngCom->fftBuffer_exp = fftBufferExp;

#endif

#endif // EVS_FLOAT



    fftBufferExp = add(fftBufferExp, hFdCngCom->fftlenShift);



    /* Perform overlap-add */
@@ -2495,14 +2492,14 @@ void SynthesisSTFT ( 
    {

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

        {

            olapBuffer[i+1*len4] = add(olapBuffer[i+1*len4], mult_r(round_fx(L_shl(fftBuffer[i+1*len4],fftBufferExp-15)),olapWin[i].v.im));

            olapBuffer[i+1*len4] = add_sat(olapBuffer[i+1*len4], mult_r(round_fx(L_shl(fftBuffer[i+1*len4],fftBufferExp-15)),olapWin[i].v.im));

            move16();

            olapBuffer[i+2*len4] = add(olapBuffer[i+2*len4], mult_r(round_fx(L_shl(fftBuffer[i+2*len4],fftBufferExp-15)),olapWin[len4-1-i].v.re));

            olapBuffer[i+2*len4] = add_sat(olapBuffer[i+2*len4], mult_r(round_fx(L_shl(fftBuffer[i+2*len4],fftBufferExp-15)),olapWin[len4-1-i].v.re));

            move16();

        }

        FOR (i=len3; i < len; i++)

        {

            olapBuffer[i] = round_fx(L_shl(fftBuffer[i],fftBufferExp-15));

            olapBuffer[i] = round_fx_sat(L_shl_sat(fftBuffer[i],fftBufferExp-15));

        }

    }

lib_com/float_to_fix_ops.c

+4 −3
Original line number Diff line number Diff line
@@ -736,17 +736,18 @@ void stereo_tcx_dec_mode_switch_reconf_To_fixed_2( 
            //{

            //    st->hFdCngDec->hFdCngCom->periodog[p] = (Word32) ( st->hFdCngDec->hFdCngCom->periodog_flt[p] * ( 1u << ( 31 - st->hFdCngDec->hFdCngCom->periodog_exp ) ) );

            //}



            //for ( int p = 0; p < st->hFdCngDec->hFdCngCom->fftlen; p++ )

            //{

            //    st->hFdCngDec->hFdCngCom->fftBuffer[p] = (Word32) ( st->hFdCngDec->hFdCngCom->fftBuffer_flt[p] * ( 1u << ( 31 - st->hFdCngDec->hFdCngCom->fftBuffer_exp ) ) );

            //}

            st->hFdCngDec->msNoiseEst_exp = 31 - Q4;

            //st->hFdCngDec->msNoiseEst_exp = 31 - Q4;



            for ( int p = 0; p < st->hFdCngDec->npart_shaping; p++ )

            {

                st->hFdCngDec->msNoiseEst[p] = (Word32) ( st->hFdCngDec->msNoiseEst_float[p] * ( 1u << ( 31 - st->hFdCngDec->msNoiseEst_exp ) ) );

                //st->hFdCngDec->msNoiseEst[p] = (Word32) ( st->hFdCngDec->msNoiseEst_float[p] * ( 1u << ( 31 - st->hFdCngDec->msNoiseEst_exp ) ) );

                // st->hFdCngDec->msPeriodog[p] = (Word32) ( st->hFdCngDec->msPeriodog_float[p] * ( 1u << ( 31 - st->hFdCngDec->msPeriodog_exp ) ) );

                //st->hFdCngDec->msPeriodog_ST_fx[p] = (Word32) ( st->hFdCngDec->msPeriodog_ST[p] * ( 1u << ( 31 - st->hFdCngDec->msPeriodog_ST_exp ) ) );



            }



            st->hFdCngDec->hFdCngCom->cngNoiseLevelExp = 31 - Q4; // Q4

lib_com/ivas_prot_fx.h

+4 −2
Original line number Diff line number Diff line
@@ -1735,7 +1735,8 @@ void TonalMDCTConceal_Detect_ivas_fx( 
    const TonalMDCTConcealPtr hTonalMDCTConc,

    const Word32 pitchLag,

    Word16 * numIndices,

    const PsychoacousticParameters* psychParamsCurrent

    const PsychoacousticParameters* psychParamsCurrent,

    Word16 element_mode

);



Word16 GetPLCModeDecision_ivas_fx(
@@ -1758,7 +1759,8 @@ void ivas_DetectTonalComponents_fx( 
    const Word16 nSamples,

    const Word16 nSamplesCore,

    Word16 floorPowerSpectrum,        /* i: lower limit for power spectrum bins  */

    const PsychoacousticParameters* psychParamsCurrent

    const PsychoacousticParameters* psychParamsCurrent,

    Word16 element_mode

);



ivas_error stereo_dft_dec_create_fx(

lib_com/ivas_sns_com_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void sns_compute_scf_fx( 
            x[i] = 0;

            FOR( n = 0; n < bw; ( ++n, ++k ) )

            {

                x[i] = L_add( x[i], spectrum[k] );

                x[i] = L_add_sat( x[i], spectrum[k] );

            }

            x[i] /= bw;

        }
@@ -101,7 +101,7 @@ void sns_compute_scf_fx( 
            x[i] = 0;

            FOR( n = 0; n < bandLengths[i]; ( ++n, ++k ) )

            {

                x[i] = L_add( x[i], spectrum[k] );

                x[i] = L_add_sat( x[i], spectrum[k] );

            }

            x[i] /= bandLengths[i];

        }