Merge branch 'main' into update_crend (4a1c6396) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+29 −23

Original line number	Diff line number	Diff line
		@@ -268,7 +268,7 @@ stages:
		.ivas-pytest-anchor: &ivas-pytest-anchor
		stage: test
		needs: ["build-codec-linux-make"]
		timeout: "240 minutes"
		timeout: "360 minutes"
		variables:
		# keep "mld" in artifact name for backwards compatibility reasons
		CSV_ARTIFACT_NAME: "mld--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.csv"
		@@ -506,7 +506,7 @@ stages:
		.ivas-pytest-compare-to-input-anchor: &ivas-pytest-compare-to-input-anchor
		stage: test
		needs: ["build-codec-linux-make"]
		timeout: "240 minutes"
		timeout: "360 minutes"
		variables:
		SUMMARY_HTML_ARTIFACT_NAME: "summary_$CI_JOB_NAME.html"
		IMAGES_ARTIFACT_NAME: "images_$CI_JOB_NAME"
		@@ -1166,6 +1166,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 +1186,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 +1231,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 +1246,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 +1261,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 +1276,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 +1291,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 +1306,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 +1321,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 +1336,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 +1351,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 +1366,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 +1381,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 +1396,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 +1411,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 +1426,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 +1441,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 +1456,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 +1471,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 +1486,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 +1501,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 +1516,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 −44

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" />
		@@ -175,7 +164,6 @@
		<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" />
		@@ -195,39 +183,28 @@
		<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 +221,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" />
		@@ -305,50 +281,30 @@
		<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 −56

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
		<ItemGroup>
		<ClCompile Include="..\lib_com\wi.c">
		<Filter>common_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\swb_bwe_com_lr.c">
		<Filter>common_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_qmetadata_com.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		@@ -76,12 +70,6 @@
		<ClCompile Include="..\lib_com\ivas_spar_com.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_agc_com.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_mdct_imdct.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_ism_com.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		@@ -210,9 +198,6 @@
		<ClCompile Include="..\lib_com\tns_base.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\codec_tcx_common_flt.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\codec_tcx_common.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		@@ -349,9 +334,6 @@
		<ClCompile Include="..\lib_com\tcx_utils_fx.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\tec_com_flt.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\trans_direct_fx.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		@@ -387,28 +369,18 @@
		</ClCompile>
		<ClCompile Include="..\lib_com\float_to_fix_ops.c" />
		<ClCompile Include="..\lib_com\parameter_bitmaping_fx.c" />
		<ClCompile Include="..\lib_com\ACcontextMapping.c" />
		<ClCompile Include="..\lib_com\ari.c" />
		<ClCompile Include="..\lib_com\arith_coder.c" />
		<ClCompile Include="..\lib_com\ari_hm.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\bitstream.c" />
		<ClCompile Include="..\lib_com\bits_alloc.c" />
		<ClCompile Include="..\lib_com\calc_st_com.c" />
		<ClCompile Include="..\lib_com\cb_shape.c" />
		<ClCompile Include="..\lib_com\cldfb.c" />
		<ClCompile Include="..\lib_com\cng_exc.c" />
		<ClCompile Include="..\lib_com\core_com_config.c" />
		<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\enh1632.c" />
		<ClCompile Include="..\lib_com\enh40.c" />
		<ClCompile Include="..\lib_com\enr_1_az.c" />
		@@ -416,30 +388,19 @@
		<ClCompile Include="..\lib_com\env_stab.c" />
		<ClCompile Include="..\lib_com\est_tilt.c" />
		<ClCompile Include="..\lib_com\fft.c" />
		<ClCompile Include="..\lib_com\fft_cldfb.c" />
		<ClCompile Include="..\lib_com\fft_rel.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\gs_bitallocation.c" />
		<ClCompile Include="..\lib_com\gs_gains.c" />
		<ClCompile Include="..\lib_com\gs_inact_switching.c" />
		<ClCompile Include="..\lib_com\gs_noisefill.c" />
		<ClCompile Include="..\lib_com\guided_plc_util.c" />
		<ClCompile Include="..\lib_com\hq2_bit_alloc.c" />
		<ClCompile Include="..\lib_com\hq2_core_com.c" />
		<ClCompile Include="..\lib_com\hq2_noise_inject.c" />
		<ClCompile Include="..\lib_com\hq_bit_allocation.c" />
		<ClCompile Include="..\lib_com\hq_conf.c" />
		<ClCompile Include="..\lib_com\hq_tools.c" />
		<ClCompile Include="..\lib_com\hvq_pvq_bitalloc.c" />
		<ClCompile Include="..\lib_com\ifft_rel.c" />
		<ClCompile Include="..\lib_com\igf_base.c" />
		<ClCompile Include="..\lib_com\index_pvq_opt.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\ivas_agc_com_fx.c" />
		<ClCompile Include="..\lib_com\ivas_dirac_com.c" />
		<ClCompile Include="..\lib_com\ivas_masa_com.c" />
		@@ -457,27 +418,10 @@
		<ClCompile Include="..\lib_com\mslvq_com.c" />
		<ClCompile Include="..\lib_com\preemph.c" />
		<ClCompile Include="..\lib_com\rom_com.c" />
		<ClCompile Include="..\lib_com\stab_est.c" />
		<ClCompile Include="..\lib_com\stat_noise_uv_mod.c" />
		<ClCompile Include="..\lib_com\swb_bwe_com.c" />
		<ClCompile Include="..\lib_com\swb_bwe_com_hr.c" />
		<ClCompile Include="..\lib_com\swb_tbe_com.c" />
		<ClCompile Include="..\lib_com\syn_12k8.c" />
		<ClCompile Include="..\lib_com\syn_filt.c" />
		<ClCompile Include="..\lib_com\tcq_position_arith.c" />
		<ClCompile Include="..\lib_com\tcx_ltp.c" />
		<ClCompile Include="..\lib_com\tcx_mdct.c" />
		<ClCompile Include="..\lib_com\tcx_mdct_window.c" />
		<ClCompile Include="..\lib_com\tcx_utils.c" />
		<ClCompile Include="..\lib_com\tec_com.c" />
		<ClCompile Include="..\lib_com\tools.c" />
		<ClCompile Include="..\lib_com\trans_direct.c" />
		<ClCompile Include="..\lib_com\trans_inv.c" />
		<ClCompile Include="..\lib_com\vlpc_2st_com.c" />
		<ClCompile Include="..\lib_com\weight.c" />
		<ClCompile Include="..\lib_com\weight_a.c" />
		<ClCompile Include="..\lib_com\window.c" />
		<ClCompile Include="..\lib_com\window_ola.c" />
		<ClCompile Include="..\lib_com\wtda.c" />
		<ClCompile Include="..\lib_com\gs_bitallocation_ivas_fx.c" />
		<ClCompile Include="..\lib_com\count.c" />

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];
		}