Commit b9dfa636 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 adacb91c 45f78445

.gitlab-ci.yml

+87 −40
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ variables: 
  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"

  LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"

  SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"

  ENCODER_TEST_SUITE: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"

  TEST_SUITE: ""

  DUT_ENCODER_PATH: "./IVAS_cod"

  DUT_DECODER_PATH: "./IVAS_dec"
@@ -28,6 +29,8 @@ variables: 
  CI_REGRESSION_THRESH_ODG: "-0.05"

  GIT_CLEAN_FLAGS: -ffdxq

  INSTR_DIR: "scripts/c-code_instrument"

  BUILD_WITH_DEBUG_MODE_INFO: ""

  ENCODER_TEST: ""

  MANUAL_PIPELINE_TYPE:

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

    value: 'default'
@@ -117,11 +120,18 @@ stages: 
    echo "Commit time was $CI_COMMIT_TIMESTAMP"

    date | xargs echo "System time is"



.activate-debug-mode-info-if-set: &activate-debug-mode-info-if-set

  - if [ "$BUILD_WITH_DEBUG_MODE_INFO" = "true" ]; then

  -   sed -i.bak -e "s/\/\*\ *\(#define\ *DEBUGGING\ *\)\*\//\1/g" lib_com/options.h

  -   sed -i.bak -e "s/\/\*\ *\(#define\ *DEBUG_MODE_INFO\ *\)\*\//\1/g" lib_com/options.h

  - fi



.build-reference-binaries: &build-reference-binaries

  - current_commit_sha=$(git rev-parse HEAD)

  ### build reference binaries

  - git checkout $REFERENCE_BRANCH

  - git pull

  - *activate-debug-mode-info-if-set

  - make clean

  - make -j

  - mv ./IVAS_cod ./$REF_ENCODER_PATH
@@ -136,6 +146,7 @@ stages: 
### build reference binaries

  - *build-reference-binaries

### build dut binaries

  - *activate-debug-mode-info-if-set

  - make clean

  - make -j
@@ -147,7 +158,9 @@ stages: 
  - python3 tests/create_short_testvectors.py

  # create references

  - exit_code=0

  - python3 -m pytest $TEST_SUITE -v --update_ref 1 --create_ref -n auto --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH || exit_code=$?

  - enc_stats_arg=""

  - if [ "$ENCODER_TEST" = "true" ]; then enc_stats_arg="--enc_stats"; fi

  - python3 -m pytest $TEST_SUITE -v --update_ref 1 $enc_stats_arg --create_ref -n auto --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH || exit_code=$?



.update-scripts-repo: &update-scripts-repo

  - cd $SCRIPTS_DIR
@@ -291,11 +304,17 @@ stages: 
    - if [ $LEVEL_SCALING != "1.0" ];then

    -   *apply-testv-scaling

    - fi



    - if [ "$ENCODER_TEST" = "true" ]; then BUILD_WITH_DEBUG_MODE_INFO="true"; fi

    - *build-and-create-reference-outputs



    - comp_args="--mld --ssnr --odg"

    - if [ "$ENCODER_TEST" = "true" ]; then comp_args="${comp_args} --enc_stats"; fi

    - echo "$comp_args"



    ### run pytest

    - exit_code=0

    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld --ssnr --odg -n auto --testcase_timeout $testcase_timeout --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH || exit_code=$?

    - python3 -m pytest --tb=no $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml $comp_args -n auto --testcase_timeout $testcase_timeout --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH || exit_code=$?

    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true



    - python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME
@@ -683,6 +702,24 @@ build-codec-linux-instrumented-make: 
    - bash scripts/prepare_instrumentation.sh -m MEM_ONLY -p BASOP

    - make -j -C $INSTR_DIR



build-codec-linux-debugging-make:

  rules:

    - if: $CI_PIPELINE_SOURCE == 'web'

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

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main

    - if: $CI_PIPELINE_SOURCE == 'schedule'

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

  extends:

    - .build-job-linux

  timeout: "7 minutes"

  variables:

    BUILD_WITH_DEBUG_MODE_INFO: "true"

  script:

    - *print-common-info

    - *activate-debug-mode-info-if-set

    - make -j



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

# Short test jobs that run in merge request pipelines

# ---------------------------------------------------------------
@@ -771,8 +808,9 @@ ivas-pytest-compare_to_ref-short-enc: 
    - .test-job-linux

  before_script:

    - USE_LTV=0

    - ENCODER_TEST="true"

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - TEST_SUITE="$ENCODER_TEST_SUITE"

    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-anchor
@@ -783,8 +821,9 @@ ivas-pytest-compare_to_ref-short-enc-lev-10: 
    - .test-job-linux    

  before_script:

    - USE_LTV=0

    - ENCODER_TEST="true"

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - TEST_SUITE="$ENCODER_TEST_SUITE"

    - LEVEL_SCALING=0.3162

  <<: *ivas-pytest-anchor
@@ -795,8 +834,9 @@ ivas-pytest-compare_to_ref-short-enc-lev+10: 
    - .test-job-linux    

  before_script:

    - USE_LTV=0

    - ENCODER_TEST="true"

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - TEST_SUITE="$ENCODER_TEST_SUITE"

    - LEVEL_SCALING=3.162

  <<: *ivas-pytest-anchor
@@ -858,6 +898,7 @@ ivas-pytest-compare_to_ref-short-dec-lev+10: 
    - LEVEL_SCALING=3.162

  <<: *ivas-pytest-anchor



### jobs that compare the output synthesis to the input files directly

ivas-pytest-compare-to-input-short-dec:

  extends:

    - .rules-pytest-to-input-short
@@ -1166,6 +1207,12 @@ voip-be-on-merge-request: 
  - rm artifacts.zip

  - rm -rf $public_dir



  ### 1.5.part: get the corresponding measurement from ivas-float-update-cmplx

  - job_id=$(python3 ci/get_id_of_last_job_occurence.py ivas-float-update-cmplx $CI_JOB_NAME $CI_PROJECT_ID)

  - echo $job_id

  - curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts_ref.zip

  - unzip -j artifacts_ref.zip "*latest_WMOPS.csv"



  ### 2. part: setup specific for BASOP repo

  # hack for using the reference encoder -> need to build manually to make script use ref enc and BASOP dec

  - mkdir COMPLEXITY
@@ -1180,7 +1227,7 @@ voip-be-on-merge-request: 
  &complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory

  - public_dir="$CI_JOB_NAME-public"

  - mkdir $public_dir

  - mv -f wmops/log_*_all.txt wmops/*.js ${public_dir}/

  - mv -f wmops/log_*_all.txt ./*.js ${public_dir}/

  # move logfiles for links

  - mkdir $public_dir/logs

  # first move logs
@@ -1225,7 +1272,7 @@ complexity-stereo-in-stereo-out: 
  script:

    - in_format=stereo

    - out_format=stereo

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1240,7 +1287,7 @@ complexity-ism-in-binaural-out: 
    - in_format=ISM

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1255,7 +1302,7 @@ complexity-ism-in-binaural_room_ir-out: 
    - in_format=ISM

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1270,7 +1317,7 @@ complexity-ism-in-ext-out: 
    - in_format=ISM

    - out_format=EXT

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1285,7 +1332,7 @@ complexity-sba-hoa3-in-hoa3-out: 
    - in_format=HOA3

    - out_format=HOA3

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1300,7 +1347,7 @@ complexity-sba-hoa3-in-binaural-out: 
    - in_format=HOA3

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1315,7 +1362,7 @@ complexity-sba-hoa3-in-binaural_room_ir-out: 
    - in_format=HOA3

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1330,7 +1377,7 @@ complexity-mc-in-7_1_4-out: 
    - in_format=MC

    - out_format=7_1_4

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1345,7 +1392,7 @@ complexity-mc-in-binaural-out: 
    - in_format=MC

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1360,7 +1407,7 @@ complexity-mc-in-binaural_room_ir-out: 
    - in_format=MC

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1375,7 +1422,7 @@ complexity-masa-in-ext-out: 
    - in_format=MASA

    - out_format=EXT

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1390,7 +1437,7 @@ complexity-masa-in-binaural-out: 
    - in_format=MASA

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1405,7 +1452,7 @@ complexity-masa-in-hoa3-out: 
    - in_format=MASA

    - out_format=HOA3

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1420,7 +1467,7 @@ complexity-masa-in-hoa3-out: 
#     - in_format=OMASA

#     - out_format=EXT

#     - ret_val=0

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

#     - *complexity-measurements-prepare-artifacts

#     - exit $ret_val
@@ -1435,7 +1482,7 @@ complexity-omasa-in-binaural-out: 
    - in_format=OMASA

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1450,7 +1497,7 @@ complexity-omasa-in-hoa3-out: 
    - in_format=OMASA

    - out_format=HOA3

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1465,7 +1512,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
    - in_format=StereoDmxEVS

    - out_format=mono

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1480,7 +1527,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
#     - in_format=OSBA

#     - out_format=EXT

#     - ret_val=0

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

#     - *complexity-measurements-prepare-artifacts

#     - exit $ret_val
@@ -1495,7 +1542,7 @@ complexity-osba-in-binaural-out: 
    - in_format=OSBA

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1510,7 +1557,7 @@ complexity-osba-in-binaural_room_ir-out: 
    - in_format=OSBA

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val

Workspace_msvc/lib_com.vcxproj

+0 −49
Original line number Diff line number Diff line
@@ -121,35 +121,25 @@ 
    </Lib>

  </ItemDefinitionGroup>

  <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <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_flt.c" />

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

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

    <ClCompile Include="..\lib_com\control.c" />
@@ -158,7 +148,6 @@ 
    <ClCompile Include="..\lib_com\deemph.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_com\enh1632.c" />
@@ -171,11 +160,9 @@ 
    <ClCompile Include="..\lib_com\env_adj.c" />

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_com\fft_fx.c" />
@@ -184,50 +171,36 @@ 
    <ClCompile Include="..\lib_com\fft_rel_fx.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com.c" />
@@ -244,7 +217,6 @@ 
    <ClCompile Include="..\lib_com\ivas_mc_com.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_com\ivas_omasa_com.c" />
@@ -302,53 +274,32 @@ 
    <ClCompile Include="..\lib_com\rom_basic_math.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Workspace_msvc/lib_com.vcxproj.filters

+0 −63

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ACcontextMapping.c

deleted100644 → 0
+0 −70

File deleted.

Preview size limit exceeded, changes collapsed.

lib_com/ACcontextMapping_fx.c

+28 −0
Original line number Diff line number Diff line
@@ -95,3 +95,31 @@ Word32 update_mixed_context_ivas_fx( 
    }

    return L_add( L_shl( L_and( ctx, 0xf ), 4 ), L_add( t32, 13 ) );

}



/*-------------------------------------------------------------------*

 * get_next_coeff_mapped_ivas()

 *

 *

 *-------------------------------------------------------------------*/



/*! r: index of next coefficient */

Word16 get_next_coeff_mapped_ivas_fx(

    Word16 ii[2],             /* i/o: coefficient indexes			Q0*/

    Word32 *pp,               /* o  : peak(1)/hole(0) indicator		Q0*/

    Word16 *idx,              /* o  : index in unmapped domain		Q0*/

    CONTEXT_HM_CONFIG *hm_cfg /* i  : HM configuration				  */

)

{

    UWord32 p;



    p = s_and( sub( ii[1], hm_cfg->numPeakIndices ), sub( hm_cfg->indexBuffer[ii[1]], hm_cfg->indexBuffer[ii[0]] ) ); /* Q0 */

    p = UL_lshr( p, sub( sizeof( p ) * 8, 1 ) );                                                                      /* Q0 */

    *pp = p;                                                                                                          /* Q0 */

    move32();

    *idx = ii[p]; /* Q0 */

    move16();

    ii[p] = add( ii[p], 1 ); /* Q0 */

    move16();



    return hm_cfg->indexBuffer[*idx];

}