update with main branch (merge) (6f8bd46b) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+71 −36

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"
		@@ -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

.gitlab/issue_templates/float-update-porting.md

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		# Basic Info

		<!--- Remember to add issue and MR links to the status page in wiki here https://forge.3gpp.org/rep/sa4/audio/ivas-basop/-/wikis/IVAS-PC-MR-conversion-status -->
		- Original merge request in float repo:
		- Branch for float ref update:
		- Branch for BASOP update:

		/label ~Type:FloatUpdatePorting ~Status::ToDo

.gitlab/merge_request_templates/float-update-porting.md

0 → 100644

+6 −0

Original line number	Diff line number	Diff line

		- Link to issue in BASOP repo:
		- Link to original issue in float repo:
		- Requested reviewers:

		/label Type:FloatUpdatePorting

Workspace_msvc/lib_enc.vcxproj

+0 −36

Original line number	Diff line number	Diff line
		@@ -381,69 +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\q_gain2p.c" />
		<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.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

+0 −113

Original line number	Diff line number	Diff line
		@@ -67,36 +67,14 @@
		<ClCompile Include="..\lib_enc\nelp_enc.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ppp_enc.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\plc_enc_ext.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<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>
		<ClCompile Include="..\lib_enc\voiced_enc.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\q_gain2p.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ltd_stable.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\vad_proc.c">
		<Filter>enc_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\ari_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		@@ -160,15 +138,6 @@
		<ClCompile Include="..\lib_enc\enc_gen_voic.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\enc_uv.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\energy.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\eval_pit_contr.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\fd_cng_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		@@ -253,12 +222,6 @@
		<ClCompile Include="..\lib_enc\noise_adjust.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\normalizecoefs.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\peak_vq_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\pit_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		@@ -268,88 +231,12 @@
		<ClCompile Include="..\lib_enc\pitch_ol2.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\pvq_core_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\pvq_encode.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\qlpc_avq.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\rom_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<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\tcq_core_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\tcx_ltp_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\tcx_utils_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\tfa_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\tns_base_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\transient_detection.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\transition_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\update_decision.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\updt_enc.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\updt_tar.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\vad.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\vad_param_updt.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\vlpc_1st_cod.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\vlpc_2st_cod.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\waveadjust_fec_cod.c">
		<Filter>enc_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\comvad_decision.c">