Commit 42cfa92c authored by Manuel Jander's avatar Manuel Jander
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1010-complexity-high-complexity-overhead-for-parammc-decoding
parents 894ec608 cd453935

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ stages: 


    ### compare the two csv files for regressions

    - regressions_found=0

    - python3 scripts/basop_check_for_changes_in_testcases.py $CSV_BRANCH $CSV_MAIN || regressions_found=$?

    - python3 scripts/basop_check_for_changes_in_testcases.py --xml_report $XML_REPORT_BRANCH $CSV_MAIN $CSV_BRANCH || regressions_found=$?



    - if [ $exit_code -eq 1 ]; then echo "Differences encountered"; exit_code=$EXIT_CODE_NON_BE; fi

    - if [ $zero_errors_branch != 1 ]; then echo "Run errors encountered!"; exit_code=$EXIT_CODE_NON_BE; fi

Workspace_msvc/lib_enc.vcxproj

+1 −11
Original line number Diff line number Diff line
@@ -396,17 +396,7 @@ 
    <ClCompile Include="..\lib_enc\rom_enc.c" />

    <ClCompile Include="..\lib_enc\setmodeindex.c" />

    <ClCompile Include="..\lib_enc\ivas_sns_enc.c" />

    <ClCompile Include="..\lib_enc\spec_center.c" />

    <ClCompile Include="..\lib_enc\spec_flatness.c" />

    <ClCompile Include="..\lib_enc\speech_music_classif.c" />

    <ClCompile Include="..\lib_enc\stat_noise_uv_enc.c" />

    <ClCompile Include="..\lib_enc\subband_fft.c" />

    <ClCompile Include="..\lib_enc\swb_bwe_enc.c" />

    <ClCompile Include="..\lib_enc\swb_bwe_enc_hr.c" />

    <ClCompile Include="..\lib_enc\swb_bwe_enc_lr.c" />

    <ClCompile Include="..\lib_enc\swb_pre_proc.c" />

    <ClCompile Include="..\lib_enc\swb_pre_proc_fx.c" />

    <ClCompile Include="..\lib_enc\swb_tbe_enc.c" />

    <ClCompile Include="..\lib_enc\swb_tbe_enc_fx.c" />

    <ClCompile Include="..\lib_enc\tcq_core_enc_fx.c" />

    <ClCompile Include="..\lib_enc\tcx_ltp_enc_fx.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+1 −28
Original line number Diff line number Diff line
@@ -76,12 +76,6 @@ 
    <ClCompile Include="..\lib_enc\pre_proc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\swb_bwe_enc_hr.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\swb_bwe_enc_lr.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vbr_average_rate.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>
@@ -274,30 +268,9 @@ 
    <ClCompile Include="..\lib_enc\setmodeindex.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\spec_center.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\spec_flatness.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\speech_music_classif.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\stat_noise_uv_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\subband_fft.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\swb_bwe_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\swb_pre_proc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\swb_tbe_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\vad.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

lib_com/ivas_cnst.h

+1 −0
Original line number Diff line number Diff line
@@ -765,6 +765,7 @@ enum 


#define UNCLR_L_ETOT                            3

#define UNCLR_L_RELE                            10

#define ONE_BY_UNCLR_L_RELE_Q31                 214748365

#define UNCLR_RC_ORDER                          20

#define MAX_UV_CNT                              100

lib_com/ivas_prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -1868,7 +1868,7 @@ void ivas_wb_tbe_dec_fx( 
    Word16 *synth,                /* o  : WB synthesis/final synthesis    */

    Word16 *Q_synth );



void ivas_GenShapedWBExcitation_fx(

void GenShapedWBExcitation_ivas_fx(

    Word16 *excSHB,                   /* o : synthesized shaped shb exctiation Q_bwe_exc*/

    const Word16 *lpc_shb,            /* i : lpc coefficients Q12*/

    Word16 *exc4kWhtnd,               /* o : whitened synthesized shb excitation Q_bwe_exc*/