Commit e974de8e authored by Stefan Doehla's avatar Stefan Doehla
Browse files

Merge branch 'main' into 1111-complexity-lower-complexity-32-bit-by-32-bit-division

parents 4629746e 7b212b76

.gitlab-ci.yml

+73 −38
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_STV_SANITIZERS: 1800

  TESTCASE_TIMEOUT_LTV_SANITIZERS: 6000

  CI_REGRESSION_THRESH_MLD: "0.1"

  CI_REGRESSION_THRESH_MAX_ABS_DIFF: "50"

  CI_REGRESSION_THRESH_SSNR: "-1"
@@ -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
@@ -505,12 +505,13 @@ stages: 
  script:

    - *print-common-info

    - *update-scripts-repo

    - *copy-ltv-files-to-testv-dir

    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *build-reference-and-dut-binaries

    - make clean

    - make -j CLANG=$CLANG_NUM

    - if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan.supp,report_error_type=1"; fi

    - testcase_timeout=$TESTCASE_TIMEOUT_STV_SANITIZERS

    - testcase_timeout=$TESTCASE_TIMEOUT_LTV_SANITIZERS

    - python3 -m pytest $TEST_SUITE -v --tb=no --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout $testcase_timeout --ref_encoder_path $DUT_ENCODER_PATH --ref_decoder_path $DUT_DECODER_PATH

  artifacts:

    name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
@@ -931,7 +932,7 @@ ivas-pytest-dec-msan: 
  before_script:

    - CLANG_NUM=1

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE=$LONG_TEST_SUITE_SELF_TEST

    - TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER

  <<: *ivas-pytest-sanitizers-anchor



ivas-pytest-dec-asan:
@@ -940,7 +941,7 @@ ivas-pytest-dec-asan: 
  before_script:

    - CLANG_NUM=2

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE=$LONG_TEST_SUITE_SELF_TEST

    - TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER

  <<: *ivas-pytest-sanitizers-anchor



ivas-pytest-dec-usan:
@@ -1204,6 +1205,9 @@ voip-be-on-merge-request: 


  - job_id=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_REF_NAME $CI_JOB_NAME $CI_PROJECT_ID)

  - echo $job_id

  # this is a testing/maintenance mechanism to force getting the log history from a specific job id

  # see below in the concrete complexity jobs

  - if [ "$JOB_ID_INJECT" != "" ]; then job_id=$JOB_ID_INJECT; fi

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

  - unzip artifacts.zip || true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html

  - ls
@@ -1214,21 +1218,13 @@ 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)

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

  - job_id=$(python3 ci/get_id_of_last_job_occurence.py ivas-float-update $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

  - cp IVAS_cod_ref COMPLEXITY/IVAS_cod

  # build branch code aain with instrumentation

  - make clean

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

  - make -j -C $INSTR_DIR

  - cp $INSTR_DIR/IVAS_dec COMPLEXITY/IVAS_dec

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

  # add file to arguments only if the artifact could be retrieved to prevent error later.

  - if [ -f latest_WMOPS.csv ]; then GET_WMOPS_ARGS="$GET_WMOPS_ARGS latest_WMOPS.csv"; fi



.complexity-measurements-prepare-artifacts:

  &complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory
@@ -1256,6 +1252,7 @@ voip-be-on-merge-request: 
  stage: test

  variables:

    ret_val: 0

    GET_WMOPS_ARGS: "mem_only basop"

  timeout: 3 hours 30 minutes

  before_script:

    - *print-common-info
@@ -1276,10 +1273,12 @@ complexity-stereo-in-stereo-out: 
    - .complexity-template

  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=stereo

    - out_format=stereo

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1290,11 +1289,13 @@ complexity-ism-in-binaural-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 1 hour

  variables:

    JOB_ID_INJECT: ""

  script:

    - 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" mem_only basop latest_WMOPS.csv || ret_val=$?

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1305,11 +1306,13 @@ complexity-ism-in-binaural_room_ir-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 2 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - 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" mem_only basop latest_WMOPS.csv || ret_val=$?

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1320,11 +1323,13 @@ complexity-ism-in-ext-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 3 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - 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" mem_only basop latest_WMOPS.csv || ret_val=$?

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1335,11 +1340,13 @@ complexity-sba-hoa3-in-hoa3-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 4 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=HOA3

    - out_format=HOA3

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1350,11 +1357,13 @@ complexity-sba-hoa3-in-binaural-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 5 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=HOA3

    - out_format=BINAURAL

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1365,11 +1374,13 @@ complexity-sba-hoa3-in-binaural_room_ir-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 6 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=HOA3

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1380,11 +1391,13 @@ complexity-mc-in-7_1_4-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 7 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=MC

    - out_format=7_1_4

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1395,11 +1408,13 @@ complexity-mc-in-binaural-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 10 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=MC

    - out_format=BINAURAL

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1410,11 +1425,13 @@ complexity-mc-in-binaural_room_ir-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 12 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=MC

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1425,11 +1442,13 @@ complexity-masa-in-ext-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 15 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=MASA

    - out_format=EXT

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1440,11 +1459,13 @@ complexity-masa-in-binaural-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 16 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=MASA

    - out_format=BINAURAL

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1455,11 +1476,13 @@ complexity-masa-in-hoa3-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 17 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=MASA

    - out_format=HOA3

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1470,11 +1493,13 @@ complexity-masa-in-hoa3-out: 
#     - if: $MEASURE_COMPLEXITY_LINUX

#       when: delayed

#       start_in: 13 hours

  # variables:

  #   JOB_ID_INJECT: ""

#   script:

#     - in_format=OMASA

#     - out_format=EXT

#     - ret_val=0

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

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

#     - *complexity-measurements-prepare-artifacts

#     - exit $ret_val
@@ -1485,11 +1510,13 @@ complexity-omasa-in-binaural-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 18 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=OMASA

    - out_format=BINAURAL

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1500,11 +1527,13 @@ complexity-omasa-in-hoa3-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 20 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=OMASA

    - out_format=HOA3

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1515,11 +1544,13 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 22 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=StereoDmxEVS

    - out_format=mono

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1534,7 +1565,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" mem_only basop latest_WMOPS.csv || ret_val=$?

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

#     - *complexity-measurements-prepare-artifacts

#     - exit $ret_val
@@ -1545,11 +1576,13 @@ complexity-osba-in-binaural-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 22 hours 30 minutes

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=OSBA

    - out_format=BINAURAL

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1560,11 +1593,13 @@ complexity-osba-in-binaural_room_ir-out: 
    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 25 hours

  variables:

    JOB_ID_INJECT: ""

  script:

    - in_format=OSBA

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

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

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

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val

Workspace_msvc/lib_enc.vcxproj

+1 −67
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ 
    <ClCompile Include="..\lib_enc\ivas_omasa_enc.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_enc\ivas_stereo_adapt_GR_enc.c" />
@@ -238,13 +239,6 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_itd.c" />

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

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_enc\ari_hm_enc.c" />
@@ -278,28 +272,13 @@ 
    <ClCompile Include="..\lib_enc\enc_amr_wb.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_enc\hf_cod_amrwb.c" />
@@ -331,7 +310,6 @@ 
    <ClCompile Include="..\lib_enc\ivas_mdct_core_enc.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_enc\ivas_stereo_eclvq_enc.c" />
@@ -403,77 +381,33 @@ 
    <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\normalizecoefs.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_enc\SNR_calc.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.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  </ItemGroup>

  <ItemGroup>

Workspace_msvc/lib_enc.vcxproj.filters

+3 −200

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+41 −1
Original line number Diff line number Diff line
@@ -353,6 +353,15 @@ int main( 
        goto cleanup;

    }



#ifdef SUPPORT_FORCE_TCX10_TCX20

#ifdef DEBUGGING

    if ( arg.forcedMode == IVAS_ENC_FORCE_TCX10 && totalBitrate < 48000 )

    {

        fprintf( stderr, "Warning: Enforcing the TCX10 mode is only supported for bitrates higher or equal than 48 kbps!\n\n" );

    }

#endif

#endif



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

     * Configure and initialize (allocate memory for static variables) the encoder

     *------------------------------------------------------------------------------------------*/
@@ -998,7 +1007,24 @@ static bool parseCmdlIVAS_enc( 
            }

            else

            {

#ifdef SUPPORT_FORCE_TCX10_TCX20

                if ( arg->forcedMode == IVAS_ENC_FORCE_TCX10 )

                {

                    strcpy( stmp, "TCX10" );

                }

                else if ( arg->forcedMode == IVAS_ENC_FORCE_TCX20 )

                {

                    strcpy( stmp, "TCX20" );

                }

                else

                {

                    strncpy( stmp, argv[i + 1], sizeof( stmp ) );

                }



                fprintf( stdout, "Forcing codec to:       %s\n", stmp );

#else

                fprintf( stdout, "Forcing codec to:       %s\n", argv[i + 1] );

#endif

            }



            i += 2;
@@ -1919,10 +1945,24 @@ static IVAS_ENC_FORCED_MODE parseForcedMode( 
    {

        return IVAS_ENC_FORCE_GSC;

    }

    if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX'" ) == 0 ) )

    if ( ( strcmp( forcedModeChar, "TCX" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX'" ) == 0 )

#ifdef SUPPORT_FORCE_TCX10_TCX20

         || ( strcmp( forcedModeChar, "TCX20" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX20'" ) == 0 )

#endif

    )

    {

#ifdef SUPPORT_FORCE_TCX10_TCX20

        return IVAS_ENC_FORCE_TCX20;

#else

        return IVAS_ENC_FORCE_TCX;

#endif

    }

#ifdef SUPPORT_FORCE_TCX10_TCX20

    if ( ( strcmp( forcedModeChar, "TCX10" ) == 0 ) || ( strcmp( forcedModeChar, "'TCX10'" ) == 0 ) )

    {

        return IVAS_ENC_FORCE_TCX10;

    }

#endif

    if ( ( strcmp( forcedModeChar, "HQ" ) == 0 ) || ( strcmp( forcedModeChar, "'HQ'" ) == 0 ) )

    {

        return IVAS_ENC_FORCE_HQ;

apps/renderer.c

+48 −0

File changed.

Preview size limit exceeded, changes collapsed.