Commit 69945722 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' into 1326-complexity-issue-ism-4-32-kbps-fb-to-binaural-basop

parents 67ff77aa 54186be9

.gitlab-ci.yml

+3 −4
Original line number Diff line number Diff line
@@ -274,12 +274,11 @@ stages: 


.rules-pytest-to-ref-short:

  rules:

    - if: $PYTEST_MLD_SHORT # Set by scheduled pipeline

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare"

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

    - if: $CI_PIPELINE_SOURCE == 'schedule'

      when: never



.rules-pytest-to-input-short:

  rules:
@@ -978,7 +977,7 @@ build-codec-linux-instrumented-make: 
  script:

    - *print-common-info

    - *update-scripts-repo

    - bash scripts/prepare_instrumentation.sh -m MEM_ONLY -p BASOP

    - bash scripts/prepare_instrumentation.sh -m MEM_ONLY

    - make -j -C $INSTR_DIR



build-codec-linux-debugging-make:
@@ -1731,7 +1730,7 @@ voip-be-on-merge-request: 
  stage: test

  variables:

    ret_val: 0

    GET_WMOPS_ARGS: "mem_only basop"

    GET_WMOPS_ARGS: "mem_only"

  timeout: 3 hours 30 minutes

  before_script:

    - *print-common-info

Workspace_msvc/lib_com.vcxproj

+0 −3
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ 
    <ClCompile Include="..\lib_com\cb_shape_fx.c" />

    <ClCompile Include="..\lib_com\cldfb.c" />

    <ClCompile Include="..\lib_com\cldfb_evs.c" />

    <ClCompile Include="..\lib_com\cng_exc.c" />

    <ClCompile Include="..\lib_com\cng_exc_fx.c" />

    <ClCompile Include="..\lib_com\codec_tcx_common.c" />

    <ClCompile Include="..\lib_com\complex_basop.c" />
@@ -238,7 +237,6 @@ 
    <ClCompile Include="..\lib_com\ivas_transient_det_fx.c" />

    <ClCompile Include="..\lib_com\lag_wind.c" />

    <ClCompile Include="..\lib_com\lerp.c" />

    <ClCompile Include="..\lib_com\limit_t0.c" />

    <ClCompile Include="..\lib_com\limit_t0_fx.c" />

    <ClCompile Include="..\lib_com\log2.c" />

    <ClCompile Include="..\lib_com\logqnorm_fx.c" />
@@ -324,7 +322,6 @@ 
    <ClInclude Include="..\lib_com\ivas_stat_com.h" />

    <ClInclude Include="..\lib_com\move.h" />

    <ClInclude Include="..\lib_com\options.h" />

    <ClInclude Include="..\lib_com\prot.h" />

    <ClInclude Include="..\lib_com\prot_fx.h" />

    <ClInclude Include="..\lib_com\rom_basop_util.h" />

    <ClInclude Include="..\lib_com\rom_com.h" />

Workspace_msvc/lib_com.vcxproj.filters

+0 −9
Original line number Diff line number Diff line
@@ -304,9 +304,6 @@ 
    <ClCompile Include="..\lib_com\cldfb.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\cng_exc.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\complex_basop.c">

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -412,9 +409,6 @@ 
    <ClCompile Include="..\lib_com\lerp.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\limit_t0.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\longarith.c">

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -588,9 +582,6 @@ 
    <ClInclude Include="..\lib_com\move.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\prot.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\rom_com.h">

      <Filter>common_h</Filter>

    </ClInclude>

lib_com/ari_hm_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include "basop_util.h"

#include "rom_com.h"

#include "prot_fx.h"

#include "prot.h"



#define GET_ADJ2( T, L, F ) ( ( ( L ) << ( F ) ) - ( T ) )

void UnmapIndex(

lib_com/arith_coder_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <assert.h>

#include "options.h"

#include "prot_fx.h"

#include "prot.h"

#include "basop_util.h"

#include "basop_proto_func.h"

#include "cnst.h"