Commit ca0e92ff authored by thomas dettbarn's avatar thomas dettbarn
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 1255-improve-wmops-performance-of-rcontextmapping_encode2_estimate_bandwise_fx
parents d8081a4d e499d56a

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ variables: 
  PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"

  TESTCASE_TIMEOUT_STV: 900

  TESTCASE_TIMEOUT_LTV: 2400

  TESTCASE_TIMEOUT_LTV_SANITIZERS: 6000

  TESTCASE_TIMEOUT_LTV_SANITIZERS: 7200

  CI_REGRESSION_THRESH_MLD: "0.1"

  CI_REGRESSION_THRESH_MAX_ABS_DIFF: "50"

  CI_REGRESSION_THRESH_SSNR: "-1"
@@ -32,6 +32,7 @@ variables: 
  INSTR_DIR: "scripts/c-code_instrument"

  BUILD_WITH_DEBUG_MODE_INFO: ""

  ENCODER_TEST: ""

  SKIP_REGRESSION_CHECK: ""

  MANUAL_PIPELINE_TYPE:

    description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."

    value: 'default'

Workspace_msvc/lib_enc.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -379,8 +379,6 @@ 
    <ClCompile Include="..\lib_enc\multi_harm.c" />

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

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

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

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

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

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

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

Workspace_msvc/lib_enc.vcxproj.filters

+0 −4
Original line number Diff line number Diff line
@@ -216,10 +216,6 @@ 
    <ClCompile Include="..\lib_enc\multi_harm.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

lib_com/basop_util.c

+0 −6
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ 
#include "basop_settings.h"

#include "cnst.h"





#define WMC_TOOL_SKIP



extern const Word32 SqrtTable[32];     // Q31

extern const Word16 SqrtDiffTable[32]; /* Q15 */
@@ -2660,6 +2657,3 @@ cmplx CL_mult_32x16( cmplx input, cmplx_s coeff ) 
#endif

    return result;

}
 




#undef WMC_TOOL_SKIP

lib_com/ivas_rom_com_fx.c

+10 −0
Original line number Diff line number Diff line
@@ -1356,6 +1356,16 @@ const UWord32 tdm_ratio_tabl_fx[TDM_NQ + 1] = { 
    2147483647, 2147483647, 2147483647

};



// Q30

const Word32 tdm_ratio_tabl_fx_Q30[] = {

    0, 0, 11703786, 26306674, 46385648, 71940704, 102542344, 137868448,

    177596896, 221298192, 268435456, 318471840, 370977792, 425201760, 480714208,

    536870912, 593027584, 648540032, 702764032, 755270016, 805306368, 852443648,

    896144896, 935873344, 971199488, 1001801152, 1027356160, 1047435136,

    1062038016, 1073741824, 1073741824, 1073741824

};





// Q24

const Word32 tdm_ratio_tabl_fx_Q24[TDM_NQ + 1] = {

    0, 0, 182871, 411041, 724775, 1124073, 1602224, 2154194,